From 12d48814f57be4e5ed0c721133964f3b0c29b025 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Mon, 2 May 2022 00:31:49 +0300 Subject: [PATCH] upg libsasl pacman-mirrorlist --- libsasl/PKGBUILD | 213 +++++++++---------------------- libsasl/PKGBUILD-arch | 215 ++++++++++---------------------- libsasl/deps | 1 + libsasl/key | 3 +- pacman-mirrorlist/PKGBUILD | 9 +- pacman-mirrorlist/PKGBUILD-arch | 6 +- pacman-mirrorlist/deps | 2 + 7 files changed, 134 insertions(+), 315 deletions(-) diff --git a/libsasl/PKGBUILD b/libsasl/PKGBUILD index 792b5e6..469bd74 100644 --- a/libsasl/PKGBUILD +++ b/libsasl/PKGBUILD @@ -5,193 +5,94 @@ # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -# This package spans multiple repositories. -# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. +# NOTE: upgrade libsasl in tandem with extra/cyrus-sasl +# 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') +_name=cyrus-sasl pkgname=libsasl -pkgver=2.1.27 -pkgrel=03 +pkgver=2.1.28 +pkgrel=01 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library w/o systemd" 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 -# saslauthd.service - saslauthd.conf.d - tmpfiles.conf) +depends=(gdbm libgdbm.so glibc openssl) +makedepends=(krb5 libldap mariadb-libs postgresql-libs sqlite) +provides=(libsasl2.so) +# options=(debug) ## uncomment this to produce the debug package +source=(https://github.com/cyrusimap/$_name/releases/download/$_name-$pkgver/$_name-$pkgver.tar.gz{,.sig}) 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 - cp -a saslauthd/saslauthd.mdoc saslauthd/saslauthd.8 + cd $_name-$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 $_name-$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-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 \ --without-systemd + + # 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') +check() { + make -k check -C $_name-$pkgver +} - 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 +package() { + local _target + make DESTDIR="$pkgdir" install-pkgconfigDATA -C $_name-$pkgver + for _target in include lib sasldb plugins utils; do + make DESTDIR="$pkgdir" install -C $_name-$pkgver/$_target 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/" + install -vDm 644 $_name-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + # remove files provided by extra/cyrus-sasl + rm -fv "$pkgdir"/usr/lib/sasl2/lib{gs2,gssapiv2,ldapdb,sql}.so* } -package_cyrus-sasl() { - depends=("libsasl=${pkgver}" 'krb5' 'pam') - pkgdesc="Cyrus saslauthd SASL authentication daemon" - 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" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" -} - -package_cyrus-sasl-gssapi() { - pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}" 'krb5') - 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/" -} - -package_cyrus-sasl-ldap() { - pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'libldap') - 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/" -} - -package_cyrus-sasl-sql() { - pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'mariadb-libs' '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 -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" -# saslauthd.service -# install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" -# - #---- license gpg-key sha256sums ---- -license=('custom') -validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A') -sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5' - 'SKIP' - '9919c81196701d11a3a77e2573a541489ad9ab42a4c50eb7d19edfb37713c604' - '7bd2b2af36c061e92f69944a18e2c122aea0d2b21773f5ea47bb6209f13d0812' - '8e22cb6ac58208f191b1eb19aac602c1bf49708f2a3b2e3de5f5b2c1e2467906' - 'bbee401c01dc6942710e0c1285091fcd98588bf636b52f24ed0e3b04039b748b' - 'a953c79c585d579f25135de0fe807d6da1fddccbd5b66a9606fb6390c12c7e31' - '1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f' - '3c375f8755fdbd98a21c4ee195bebbd2a146901fee327e4dd6cfde7a4dcba7c3' - '03a57cbcec85602fb8e39b7c8a3ff1a22d2c20a28e771b8b326a570d733bf432' -# '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a' - 'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640' - '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024') -# sha256sums=(a) +license=('custom') + +validpgpkeys=(829F339F8C296FE80F409D93E3D7C118C7B9F46A # Partha Susarla + DEA1999F0CDB1AAEBA001E0DBEE3E3B4D2F06546) # Quanah Gibson-Mount + +sha256sums=(7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c # cyrus-sasl-2.1.28.tar.gz + e6169548f42234eb2b1af9719415016a57116835b8ea494596f52743b49971fd) # cyrus-sasl-2.1.28.tar.gz.sig diff --git a/libsasl/PKGBUILD-arch b/libsasl/PKGBUILD-arch index 778afc4..dc5945e 100644 --- a/libsasl/PKGBUILD-arch +++ b/libsasl/PKGBUILD-arch @@ -1,181 +1,92 @@ -# 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. +# NOTE: upgrade libsasl in tandem with extra/cyrus-sasl +# 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') +_name=cyrus-sasl pkgname=libsasl -pkgver=2.1.27 -pkgrel=3 +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 - saslauthd.service - saslauthd.conf.d - tmpfiles.conf) -sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5' - 'SKIP' - '9919c81196701d11a3a77e2573a541489ad9ab42a4c50eb7d19edfb37713c604' - '7bd2b2af36c061e92f69944a18e2c122aea0d2b21773f5ea47bb6209f13d0812' - '8e22cb6ac58208f191b1eb19aac602c1bf49708f2a3b2e3de5f5b2c1e2467906' - 'bbee401c01dc6942710e0c1285091fcd98588bf636b52f24ed0e3b04039b748b' - 'a953c79c585d579f25135de0fe807d6da1fddccbd5b66a9606fb6390c12c7e31' - '1a0ae7bd722d57feb6fab12c05eb1922982c68bd9be1c165d405954012e6634f' - '3c375f8755fdbd98a21c4ee195bebbd2a146901fee327e4dd6cfde7a4dcba7c3' - '03a57cbcec85602fb8e39b7c8a3ff1a22d2c20a28e771b8b326a570d733bf432' - '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a' - 'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640' - '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024') -validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A') +license=(custom) +depends=(gdbm libgdbm.so glibc openssl) +makedepends=(krb5 libldap mariadb-libs postgresql-libs sqlite) +provides=(libsasl2.so) +options=(debug) +source=(https://github.com/cyrusimap/$_name/releases/download/$_name-$pkgver/$_name-$pkgver.tar.gz{,.sig}) +sha512sums=('db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78' + 'SKIP') +b2sums=('6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823' + 'SKIP') +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 - cp -a saslauthd/saslauthd.mdoc saslauthd/saslauthd.8 + cd $_name-$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 $_name-$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') +check() { + make -k check -C $_name-$pkgver +} - 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 +package() { + local _target + make DESTDIR="$pkgdir" install-pkgconfigDATA -C $_name-$pkgver + for _target in include lib sasldb plugins utils; do + make DESTDIR="$pkgdir" install -C $_name-$pkgver/$_target 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/" -} - -package_cyrus-sasl() { - depends=("libsasl=${pkgver}" 'krb5' 'pam') - pkgdesc="Cyrus saslauthd SASL authentication daemon" - 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" - - install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" - ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" -} - -package_cyrus-sasl-gssapi() { - pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}" 'krb5') - 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/" -} - -package_cyrus-sasl-ldap() { - pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'libldap') - 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/" -} - -package_cyrus-sasl-sql() { - pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'mariadb-libs' '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 644 $_name-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + # remove files provided by extra/cyrus-sasl + rm -fv "$pkgdir"/usr/lib/sasl2/lib{gs2,gssapiv2,ldapdb,sql}.so* } diff --git a/libsasl/deps b/libsasl/deps index 66dac9d..d94c97a 100644 --- a/libsasl/deps +++ b/libsasl/deps @@ -2,3 +2,4 @@ postgresql-libs mariadb-libs automake autoconf +gettext diff --git a/libsasl/key b/libsasl/key index 704a36b..84a6c10 100644 --- a/libsasl/key +++ b/libsasl/key @@ -1 +1,2 @@ -gpg -v --recv-key E3D7C118C7B9F46A +gpg --recv-keys E3D7C118C7B9F46A +gpg --recv-keys BEE3E3B4D2F06546 diff --git a/pacman-mirrorlist/PKGBUILD b/pacman-mirrorlist/PKGBUILD index b0ef417..8d68076 100644 --- a/pacman-mirrorlist/PKGBUILD +++ b/pacman-mirrorlist/PKGBUILD @@ -6,12 +6,11 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=pacman-mirrorlist -pkgver=20220410 +pkgver=20220501 pkgrel=01 pkgdesc="Arch Linux mirror list for use by pacman HTTPS ONLY" arch=('any') url="https://www.archlinux.org/mirrorlist/" -license=('GPL') backup=(etc/pacman.d/mirrorlist) #source=(mirrorlist) source=(https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/pacman-mirrorlist/trunk/mirrorlist) @@ -34,4 +33,8 @@ package() { install -m644 "$srcdir/mirrorlist-https" "$pkgdir/etc/pacman.d/mirrorlist" } -sha256sums=(fc135ab26f2a227b9599b66a2f1ba325c445acb914d60e7ecf6e5997a87abe1e) # mirrorlist +#---- license gpg-key sha256sums ---- + +license=('GPL') + +sha256sums=(26b9e7f40cc77020e71f70ac64878ff71bb707d4c0ed30d1a362961f837a5dda) # mirrorlist diff --git a/pacman-mirrorlist/PKGBUILD-arch b/pacman-mirrorlist/PKGBUILD-arch index f980db6..a4f6501 100644 --- a/pacman-mirrorlist/PKGBUILD-arch +++ b/pacman-mirrorlist/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Dan McGee pkgname=pacman-mirrorlist -pkgver=20220410 +pkgver=20220501 pkgrel=1 pkgdesc="Arch Linux mirror list for use by pacman" arch=('any') @@ -27,5 +27,5 @@ package() { install -m644 "$srcdir/mirrorlist" "$pkgdir/etc/pacman.d/" } -md5sums=('81c39827e38c759d7e847f05db62c233') -sha256sums=('fc135ab26f2a227b9599b66a2f1ba325c445acb914d60e7ecf6e5997a87abe1e') +md5sums=('e66d0f9a492639ab343fd534b1aba534') +sha256sums=('26b9e7f40cc77020e71f70ac64878ff71bb707d4c0ed30d1a362961f837a5dda') diff --git a/pacman-mirrorlist/deps b/pacman-mirrorlist/deps index 8d1c8b6..92371a0 100644 --- a/pacman-mirrorlist/deps +++ b/pacman-mirrorlist/deps @@ -1 +1,3 @@ + +