From 2b8698db4c8fcbb5f94f8b617b08886d3f732af8 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Mon, 2 May 2022 00:30:47 +0300 Subject: [PATCH] upg tor tor-alphaa libx11 cyrus-sasl --- cyrus-sasl/PKGBUILD | 196 ++++++++++++----------------------- cyrus-sasl/PKGBUILD-arch | 217 +++++++++++++++------------------------ cyrus-sasl/deps | 1 + cyrus-sasl/key | 3 +- libx11/PKGBUILD | 10 +- libx11/PKGBUILD-arch | 8 +- libx11/deps | 1 + libx11/key | 1 + libx11/time | 4 - tor-alpha/PKGBUILD | 5 +- tor/PKGBUILD | 12 +-- tor/deps | 1 + 12 files changed, 173 insertions(+), 286 deletions(-) diff --git a/cyrus-sasl/PKGBUILD b/cyrus-sasl/PKGBUILD index 1d447e6..001bb86 100644 --- a/cyrus-sasl/PKGBUILD +++ b/cyrus-sasl/PKGBUILD @@ -1,193 +1,131 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- - # This package spans multiple repositories. # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. -pkgbase='cyrus-sasl' -pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') -#pkgname=libsasl -pkgver=2.1.27 -pkgrel=06 +# NOTE: upgrade cyrus-sasl in tandem with core/libsasl +# As one PKGBUILD can (currently) not provide packages for several +# repositories, libsasl and the rest of cyrus-sasl are provided separately +# (else this would require mariadb and postgresql in [core]) +pkgbase=cyrus-sasl +pkgname=(cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-ldap cyrus-sasl-sql) +pkgver=2.1.28 +pkgrel=01 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('x86_64') url="https://www.cyrusimap.org/sasl/" options=('!makeflags') makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 'sqlite') -source=(https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${pkgver}/cyrus-sasl-${pkgver}.tar.gz{,.sig} - 0003-Update-saslauthd.conf-location-in-documentation.patch - 0006-Enable-autoconf-maintainer-mode.patch - 0010-Update-required-libraries-when-ld-as-needed-is-used.patch - 0013-Don-t-use-la-files-for-opening-plugins.patch - 0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch - 0022-Fix-keytab-option-for-MIT-Kerberos.patch - 0032-Add-with_pgsql-include-postgresql-to-include-path.patch - gdbm-errno.patch - autoconf-2.70.patch -# saslauthd.service +source=(https://github.com/cyrusimap/$pkgbase/releases/download/$pkgbase-$pkgver/$pkgbase-$pkgver.tar.gz{,.sig} saslauthd.conf.d tmpfiles.conf) prepare() { - cd cyrus-sasl-$pkgver - patch -Np1 -i ../0003-Update-saslauthd.conf-location-in-documentation.patch - patch -Np1 -i ../0006-Enable-autoconf-maintainer-mode.patch - patch -Np1 -i ../0010-Update-required-libraries-when-ld-as-needed-is-used.patch - patch -Np1 -i ../0013-Don-t-use-la-files-for-opening-plugins.patch - patch -Np1 -i ../0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch - patch -Np1 -i ../0022-Fix-keytab-option-for-MIT-Kerberos.patch - patch -Np1 -i ../0032-Add-with_pgsql-include-postgresql-to-include-path.patch - patch -Np1 -i ../gdbm-errno.patch - patch -p1 -i ../autoconf-2.70.patch # Fix GCC-SPNEGO build with recent autoconf - cp -a saslauthd/saslauthd.mdoc saslauthd/saslauthd.8 + cd $pkgbase-$pkgver + autoreconf -fiv } build() { - export CFLAGS="$CFLAGS -fPIC" - cd cyrus-sasl-$pkgver - - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config - automake -a -c - autoheader - autoconf - + cd $pkgbase-$pkgver ./configure --prefix=/usr \ - --sbin=/usr/bin \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ + --disable-krb4 \ + --disable-macos-framework \ + --disable-otp \ + --disable-passdss \ + --disable-srp \ + --disable-srp-setpass \ --disable-static \ - --enable-shared \ --enable-alwaystrue \ + --enable-anon \ + --enable-auth-sasldb \ --enable-checkapop \ --enable-cram \ --enable-digest \ - --disable-otp \ - --disable-srp \ - --disable-srp-setpass \ - --disable-krb4 \ --enable-gssapi \ - --enable-auth-sasldb \ - --enable-plain \ - --enable-anon \ + --enable-ldapdb \ --enable-login \ --enable-ntlm \ - --disable-passdss \ + --enable-plain \ + --enable-shared \ --enable-sql \ - --with-mysql=/usr \ - --with-pgsql=/usr/lib \ - --with-sqlite3=/usr/lib \ - --enable-ldapdb \ - --disable-macos-framework \ - --with-pam \ - --with-saslauthd=/var/run/saslauthd \ - --with-ldap \ - --with-dblib=gdbm \ - --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --sbin=/usr/bin \ --sysconfdir=/etc \ - --with-devrandom=/dev/urandom + --with-dblib=gdbm \ + --with-devrandom=/dev/urandom \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --with-ldap \ + --with-mysql=/usr \ + --with-pam \ + --with-pgsql=/usr/lib \ + --with-saslauthd=/var/run/saslauthd \ + --with-sqlite3=/usr/lib + # prevent excessive overlinking by libtool sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } -package_libsasl() { - pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl') - conflicts=('cyrus-sasl-plugins') - - cd cyrus-sasl-$pkgver - make DESTDIR="$pkgdir" install-pkgconfigDATA - for dir in include lib sasldb plugins utils; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* - install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" - install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +check() { + make -k check -C $pkgbase-$pkgver } package_cyrus-sasl() { - depends=("libsasl=${pkgver}" 'krb5' 'pam' 'gdbm') + depends=(gdbm libgdbm.so glibc krb5 libkrb5.so libldap libsasl=$pkgver openssl pam libpam.so) pkgdesc="Cyrus saslauthd SASL authentication daemon" - backup=('etc/conf.d/saslauthd') + backup=(etc/conf.d/saslauthd) - cd cyrus-sasl-$pkgver/saslauthd - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" -## install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" - install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" + make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver/saslauthd + make DESTDIR="$pkgdir" install-data-local -C $pkgbase-$pkgver/saslauthd + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" + install -vDm 644 saslauthd.conf.d "$pkgdir/etc/conf.d/saslauthd" +# install -vDm 644 saslauthd.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/saslauthd.conf" } package_cyrus-sasl-gssapi() { pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}" 'krb5') + depends=(glibc krb5 libgssapi_krb5.so libsasl=$pkgver) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" - cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libgs{,sapiv}2.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } package_cyrus-sasl-ldap() { pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'libldap') + depends=(glibc libldap libsasl=$pkgver) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libldapdb.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'mariadb-libs' 'sqlite') + depends=(libsasl=$pkgver mariadb-libs libmariadb.so postgresql-libs libpq.so sqlite) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libsql.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } #---- license gpg-key sha256sums ---- + license=('custom') -validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A') -sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5' - 'SKIP' - '9919c81196701d11a3a77e2573a541489ad9ab42a4c50eb7d19edfb37713c604' - '7bd2b2af36c061e92f69944a18e2c122aea0d2b21773f5ea47bb6209f13d0812' - '8e22cb6ac58208f191b1eb19aac602c1bf49708f2a3b2e3de5f5b2c1e2467906' - 'bbee401c01dc6942710e0c1285091fcd98588bf636b52f24ed0e3b04039b748b' - 'a953c79c585d579f25135de0fe807d6da1fddccbd5b66a9606fb6390c12c7e31' - '1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f' - '3c375f8755fdbd98a21c4ee195bebbd2a146901fee327e4dd6cfde7a4dcba7c3' - '03a57cbcec85602fb8e39b7c8a3ff1a22d2c20a28e771b8b326a570d733bf432' - '91cb2026e7f41374ec181809c862bbfaf4e4b3346dc8294285718d2dd17101a5' -# '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a' - 'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640' - '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024') +validpgpkeys=(829F339F8C296FE80F409D93E3D7C118C7B9F46A # Partha Susarla + DEA1999F0CDB1AAEBA001E0DBEE3E3B4D2F06546) # Quanah Gibson-Mount -#sha256sums=(a) +sha256sums=(7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c # cyrus-sasl-2.1.28.tar.gz + e6169548f42234eb2b1af9719415016a57116835b8ea494596f52743b49971fd # cyrus-sasl-2.1.28.tar.gz.sig + fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640 # saslauthd.conf.d + 16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024) # tmpfiles.conf diff --git a/cyrus-sasl/PKGBUILD-arch b/cyrus-sasl/PKGBUILD-arch index 9b58d40..6015c37 100644 --- a/cyrus-sasl/PKGBUILD-arch +++ b/cyrus-sasl/PKGBUILD-arch @@ -1,184 +1,131 @@ -# Maintainer: Jan de Groot +# Maintainer: David Runge +# Contributor: Jan de Groot -# This package spans multiple repositories. -# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. - -pkgbase='cyrus-sasl' -pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') -#pkgname=libsasl -pkgver=2.1.27 -pkgrel=6 +# NOTE: upgrade cyrus-sasl in tandem with core/libsasl +# As one PKGBUILD can (currently) not provide packages for several +# repositories, libsasl and the rest of cyrus-sasl are provided separately +# (else this would require mariadb and postgresql in [core]) +pkgbase=cyrus-sasl +pkgname=(cyrus-sasl cyrus-sasl-gssapi cyrus-sasl-ldap cyrus-sasl-sql) +pkgver=2.1.28 +pkgrel=1 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" -arch=('x86_64') +arch=(x86_64) url="https://www.cyrusimap.org/sasl/" -license=('custom') -options=('!makeflags') -makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 'sqlite') -source=(https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${pkgver}/cyrus-sasl-${pkgver}.tar.gz{,.sig} - 0003-Update-saslauthd.conf-location-in-documentation.patch - 0006-Enable-autoconf-maintainer-mode.patch - 0010-Update-required-libraries-when-ld-as-needed-is-used.patch - 0013-Don-t-use-la-files-for-opening-plugins.patch - 0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch - 0022-Fix-keytab-option-for-MIT-Kerberos.patch - 0032-Add-with_pgsql-include-postgresql-to-include-path.patch - gdbm-errno.patch - autoconf-2.70.patch - saslauthd.service - saslauthd.conf.d - tmpfiles.conf) -sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5' +license=(custom) +makedepends=(gdbm glibc krb5 libldap libsasl=$pkgver mariadb-libs openssl pam postgresql-libs sqlite) +options=(debug) +source=( + https://github.com/cyrusimap/$pkgbase/releases/download/$pkgbase-$pkgver/$pkgbase-$pkgver.tar.gz{,.sig} + saslauthd.service + saslauthd.conf.d + tmpfiles.conf +) +sha512sums=('db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78' 'SKIP' - '9919c81196701d11a3a77e2573a541489ad9ab42a4c50eb7d19edfb37713c604' - '7bd2b2af36c061e92f69944a18e2c122aea0d2b21773f5ea47bb6209f13d0812' - '8e22cb6ac58208f191b1eb19aac602c1bf49708f2a3b2e3de5f5b2c1e2467906' - 'bbee401c01dc6942710e0c1285091fcd98588bf636b52f24ed0e3b04039b748b' - 'a953c79c585d579f25135de0fe807d6da1fddccbd5b66a9606fb6390c12c7e31' - '1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f' - '3c375f8755fdbd98a21c4ee195bebbd2a146901fee327e4dd6cfde7a4dcba7c3' - '03a57cbcec85602fb8e39b7c8a3ff1a22d2c20a28e771b8b326a570d733bf432' - '91cb2026e7f41374ec181809c862bbfaf4e4b3346dc8294285718d2dd17101a5' - '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a' - 'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640' - '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024') -validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A') + '99573a52c0558d34548cc14e2fc3d95c4b7dc11e0b85f6aba31b1a98d2937d559fed7bb268b88f7ebf929c70e987901b9fe7d406eb74c088628b403a45013197' + 'e99e2da452d2d5b9c0fc7ef10a844f5aa80f20fe5d5778666e450b5e6eb183876322592ae075d55c7e24d93d8a39bf7d47864697faf398cc40fd589808dd0282' + '2cee9d6626aa16b6b51a5f48ad2c162564ce97dabc367738b4d6af654fcd5845e0d2cd78e5c9fb2378dfba2fd67f32fdbfd42321dc59c9a1222369860312d0a7') +b2sums=('6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823' + 'SKIP' + 'a63fb542a7eb93bb119d655e068ca7a9be71e760298c37f220beae5331ae73c1478fb3d1455e5431a6487bcf0ce7a612e9cdc923e2da5834fc1ae58d810f8e8d' + 'fd9c1f0a1dd3b812c483e1b119782994b556b997583d75fc905a35ba4d4aae94326b24d0313a3b396fef69d4eb6c7dcbd397144b72fd1b729c590cfba432a275' + 'e7f38d8c42d48a08b5ca810e237899111856d57635260a5c440cbe8d01ed3dc89541fe7e4d8b84b9d54b1328f17f2c1ea9cf7b6a4a1f37b962bbb6e3cc916da8') +validpgpkeys=( + '829F339F8C296FE80F409D93E3D7C118C7B9F46A' # Partha Susarla + 'DEA1999F0CDB1AAEBA001E0DBEE3E3B4D2F06546' # Quanah Gibson-Mount +) prepare() { - cd cyrus-sasl-$pkgver - patch -Np1 -i ../0003-Update-saslauthd.conf-location-in-documentation.patch - patch -Np1 -i ../0006-Enable-autoconf-maintainer-mode.patch - patch -Np1 -i ../0010-Update-required-libraries-when-ld-as-needed-is-used.patch - patch -Np1 -i ../0013-Don-t-use-la-files-for-opening-plugins.patch - patch -Np1 -i ../0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch - patch -Np1 -i ../0022-Fix-keytab-option-for-MIT-Kerberos.patch - patch -Np1 -i ../0032-Add-with_pgsql-include-postgresql-to-include-path.patch - patch -Np1 -i ../gdbm-errno.patch - patch -p1 -i ../autoconf-2.70.patch # Fix GCC-SPNEGO build with recent autoconf - cp -a saslauthd/saslauthd.mdoc saslauthd/saslauthd.8 + cd $pkgbase-$pkgver + autoreconf -fiv } build() { - export CFLAGS="$CFLAGS -fPIC" - cd cyrus-sasl-$pkgver - - rm -f config/config.guess config/config.sub - rm -f config/ltconfig config/ltmain.sh config/libtool.m4 - rm -fr autom4te.cache - libtoolize -c - aclocal -I config - automake -a -c - autoheader - autoconf - + cd $pkgbase-$pkgver ./configure --prefix=/usr \ - --sbin=/usr/bin \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ + --disable-krb4 \ + --disable-macos-framework \ + --disable-otp \ + --disable-passdss \ + --disable-srp \ + --disable-srp-setpass \ --disable-static \ - --enable-shared \ --enable-alwaystrue \ + --enable-anon \ + --enable-auth-sasldb \ --enable-checkapop \ --enable-cram \ --enable-digest \ - --disable-otp \ - --disable-srp \ - --disable-srp-setpass \ - --disable-krb4 \ --enable-gssapi \ - --enable-auth-sasldb \ - --enable-plain \ - --enable-anon \ + --enable-ldapdb \ --enable-login \ --enable-ntlm \ - --disable-passdss \ + --enable-plain \ + --enable-shared \ --enable-sql \ - --with-mysql=/usr \ - --with-pgsql=/usr/lib \ - --with-sqlite3=/usr/lib \ - --enable-ldapdb \ - --disable-macos-framework \ - --with-pam \ - --with-saslauthd=/var/run/saslauthd \ - --with-ldap \ - --with-dblib=gdbm \ - --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --sbin=/usr/bin \ --sysconfdir=/etc \ - --with-devrandom=/dev/urandom + --with-dblib=gdbm \ + --with-devrandom=/dev/urandom \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --with-ldap \ + --with-mysql=/usr \ + --with-pam \ + --with-pgsql=/usr/lib \ + --with-saslauthd=/var/run/saslauthd \ + --with-sqlite3=/usr/lib + # prevent excessive overlinking by libtool sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } -package_libsasl() { - pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl') - conflicts=('cyrus-sasl-plugins') - - cd cyrus-sasl-$pkgver - make DESTDIR="$pkgdir" install-pkgconfigDATA - for dir in include lib sasldb plugins utils; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* - rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* - install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" - install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +check() { + make -k check -C $pkgbase-$pkgver } package_cyrus-sasl() { - depends=("libsasl=${pkgver}" 'krb5' 'pam' 'gdbm') + depends=(gdbm libgdbm.so glibc krb5 libkrb5.so libldap libsasl=$pkgver openssl pam libpam.so) pkgdesc="Cyrus saslauthd SASL authentication daemon" - backup=('etc/conf.d/saslauthd') + backup=(etc/conf.d/saslauthd) - cd cyrus-sasl-$pkgver/saslauthd - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" - install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" + make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver/saslauthd + make DESTDIR="$pkgdir" install-data-local -C $pkgbase-$pkgver/saslauthd + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" + install -vDm 644 saslauthd.conf.d "$pkgdir/etc/conf.d/saslauthd" + install -vDm 644 saslauthd.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/saslauthd.conf" } package_cyrus-sasl-gssapi() { pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}" 'krb5') + depends=(glibc krb5 libgssapi_krb5.so libsasl=$pkgver) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" - cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libgs{,sapiv}2.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } package_cyrus-sasl-ldap() { pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'libldap') + depends=(glibc libldap libsasl=$pkgver) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libldapdb.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'mariadb-libs' 'sqlite') + depends=(libsasl=$pkgver mariadb-libs libmariadb.so postgresql-libs libpq.so sqlite) replaces=('cyrus-sasl-plugins') - cd cyrus-sasl-$pkgver/plugins - install -m755 -d "${pkgdir}/usr/lib/sasl2" - cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" + install -vdm 755 "$pkgdir/usr/lib/sasl2" + cp -av $pkgbase-$pkgver/plugins/.libs/libsql.so* "$pkgdir/usr/lib/sasl2/" + install -vDm 644 $pkgbase-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" } diff --git a/cyrus-sasl/deps b/cyrus-sasl/deps index 66dac9d..d94c97a 100644 --- a/cyrus-sasl/deps +++ b/cyrus-sasl/deps @@ -2,3 +2,4 @@ postgresql-libs mariadb-libs automake autoconf +gettext diff --git a/cyrus-sasl/key b/cyrus-sasl/key index 704a36b..84a6c10 100644 --- a/cyrus-sasl/key +++ b/cyrus-sasl/key @@ -1 +1,2 @@ -gpg -v --recv-key E3D7C118C7B9F46A +gpg --recv-keys E3D7C118C7B9F46A +gpg --recv-keys BEE3E3B4D2F06546 diff --git a/libx11/PKGBUILD b/libx11/PKGBUILD index 5e74153..55e2c2a 100644 --- a/libx11/PKGBUILD +++ b/libx11/PKGBUILD @@ -7,7 +7,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libx11 -pkgver=1.7.5 +pkgver=1.8 pkgrel=01 pkgdesc="X11 client-side library w/o ipv6" arch=(x86_64) @@ -44,9 +44,9 @@ license=('custom') #validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith #validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb -validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner -#validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson +#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner +validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson #validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard " -sha256sums=(5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151 # libX11-1.7.5.tar.xz - 6efa69cb2317ef33ccd58531a871ba41bab240a47581b1428ffce673a528303c) # libX11-1.7.5.tar.xz.sig +sha256sums=(081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4 # libX11-1.8.tar.xz + 89cd4fcc039776671e8c21b91f1cddd38d9980eda80313724d5315dc32a67be0) # libX11-1.8.tar.xz.sig diff --git a/libx11/PKGBUILD-arch b/libx11/PKGBUILD-arch index 48eda0b..1ef1ef5 100644 --- a/libx11/PKGBUILD-arch +++ b/libx11/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Andreas Radke pkgname=libx11 -pkgver=1.7.5 +pkgver=1.8 pkgrel=1 pkgdesc="X11 client-side library" arch=(x86_64) @@ -12,12 +12,12 @@ depends=('libxcb' 'xorgproto') makedepends=('xorg-util-macros' 'xtrans') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}) -sha512sums=('ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347' +sha512sums=('64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b' 'SKIP') #validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith #validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb -validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner -#validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson +#validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner +validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson #validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard " build() { diff --git a/libx11/deps b/libx11/deps index d2faec6..8cff211 100644 --- a/libx11/deps +++ b/libx11/deps @@ -2,3 +2,4 @@ xtrans libxcb xorgproto xorg-util-macros + diff --git a/libx11/key b/libx11/key index 03fe4c8..e6b6c96 100644 --- a/libx11/key +++ b/libx11/key @@ -1 +1,2 @@ gpg --recv-keys ACEB29740C9A4E97 +gpg --recv-keys 4C09DD83CAAA50B2 diff --git a/libx11/time b/libx11/time index eaa3fe7..8b13789 100644 --- a/libx11/time +++ b/libx11/time @@ -1,5 +1 @@ -real 1m52.330s -user 1m34.826s -sys 0m9.397s - diff --git a/tor-alpha/PKGBUILD b/tor-alpha/PKGBUILD index 8e84e34..cd04e17 100644 --- a/tor-alpha/PKGBUILD +++ b/tor-alpha/PKGBUILD @@ -1,11 +1,12 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=tor-alpha -pkgver=0.4.7.5.alpha.r1.g84fc754 +pkgver=0.4.8.0.alpha.dev.r1.g4259bc3 pkgrel=01 pkgdesc="An anonymizing overlay network (development version) no-zstd no-systemd" arch=('x86_64') diff --git a/tor/PKGBUILD b/tor/PKGBUILD index c3c0e36..9d45ac6 100644 --- a/tor/PKGBUILD +++ b/tor/PKGBUILD @@ -7,15 +7,15 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=tor -pkgver=0.4.6.10 -pkgrel=02 +pkgver=0.4.7.7 +pkgrel=01 pkgdesc='Anonymizing overlay network. w/o zstd and systemd' arch=('x86_64') url='https://www.torproject.org/dist' source=("$url/$pkgname-$pkgver.tar.gz" #source=("$url/$pkgname-$pkgver.tar.gz"{,.sha256sum,.sha256sum.asc} -#https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum + https://dist.torproject.org/tor-0.4.7.7.tar.gz.sha256sum # 'tor-0.4.6.10.tar.gz.sha256sum' 'torrc.patch' 'tor.sysusers' @@ -80,9 +80,9 @@ validpgpkeys=(2133BC600AB133E1D826D173FE43009C4607B1FB # Nick Mathewson F65CE37F04BA5B360AE6EE17C218525819F78451 # Roger Dingledine 1C1BC007A9F607AA8152C040BEA7B180B1491921) # Alexander Færøy -sha256sums=(94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c # tor-0.4.6.10.tar.gz -# 0e18423d89d06da583c0f70ab6fec73a4d53622c140d8d77634dbbd7b4152dda # tor-0.4.6.10.tar.gz.sha256sum.asc -# 7fd27d2c84b1b124e0195c931ca80b5c2bc0ea9383231e9b345c3614686b4e11 # tor-0.4.6.10.tar.gz.sha256sum +sha256sums=(3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44 # tor-0.4.7.7.tar.gz + 02081f62d8588694626c6857111645892acde5bac947119ee502f551186a92ba # tor-0.4.7.7.tar.gz.sha256sum c9632d05816d7a1ccfe1e258518c130808decaee7f3544494f9d53ab828cf22c # torrc.patch 04eec05b4e61efccc58c5da657363f0c1059d7f122cb15c32331a201af2d7f94 # tor.sysusers 07bedb17660a3673b31b0005b6505065c90b32f2c6b28b969241da675560f926) # tor.tmpfiles + diff --git a/tor/deps b/tor/deps index dd6fade..fd8b103 100644 --- a/tor/deps +++ b/tor/deps @@ -1 +1,2 @@ libevent +