diff --git a/libgcrypt/PKGBUILD b/libgcrypt/PKGBUILD index 63f1d41392..bb98646df4 100644 --- a/libgcrypt/PKGBUILD +++ b/libgcrypt/PKGBUILD @@ -6,20 +6,29 @@ # then cp /usr/lib/libgcrypt.so.11 /var/lib/archbuild/staging-x86_64/root/usr/lib/ and do staging-x86_64-build pkgname=libgcrypt -pkgver=1.10.3 -pkgrel=1 +pkgver=1.11.0 +pkgrel=2 pkgdesc="General purpose cryptographic library based on the code from GnuPG" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.gnupg.org" -license=('LGPL') -depends=('libgpg-error') +license=( + 'BSD-3-Clause' + 'BSD-3-Clause OR GPL-2.0-only' + 'GPL-2.0-or-later' + 'LGPL-2.0-or-later' + 'LGPL-2.1-or-later' + 'X11' + 'LicenseRef-scancode-public-domain' + 'LicenseRef-OCB1' +) +depends=('libgpg-error' 'glibc') options=('!emptydirs') # https://www.gnupg.org/download/integrity_check.html source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha256sums=('8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa' +sha256sums=('09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c' 'SKIP') -#validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)" -validpgpkeys=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) +validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)" +# validpgpkeys=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) prepare() { cd "${pkgname}"-${pkgver} @@ -36,16 +45,16 @@ prepare() { build() { cd "${pkgname}"-${pkgver} - case "${CARCH}" in - powerpc) - # prevent AltiVec and VSX to slip in to not break - # older PowerPC CPUs - local -x gcry_cv_cc_ppc_altivec=no - local -x gcry_cv_cc_ppc_altivec_cflags=no - local -x cry_cv_gcc_inline_asm_ppc_altivec=no - local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no - ;; - esac + case "${CARCH}" in + powerpc|powerpc64) + # prevent AltiVec and VSX to slip in to not break + # older PowerPC CPUs + local -x gcry_cv_cc_ppc_altivec=no + local -x gcry_cv_cc_ppc_altivec_cflags=no + local -x cry_cv_gcc_inline_asm_ppc_altivec=no + local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no + ;; + esac ./configure --prefix=/usr \ --disable-static \ @@ -61,4 +70,6 @@ check() { package() { cd "${pkgname}"-${pkgver} make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 {COPYING.LIB,LICENSES} "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/libgcrypt/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc b/libgcrypt/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc new file mode 100644 index 0000000000..90716dc69d --- /dev/null +++ b/libgcrypt/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEX0PliRYJKwYBBAHaRw8BAQdAz75Hlekc16JhhfI0MKdEVxLdkxhcMCO0ZG6W +MBAmNpe0H1dlcm5lciBLb2NoIChkaXN0IHNpZ25pbmcgMjAyMCmImgQTFgoAQhYh +BG2qbmSnbShAVxtJAlKIl7gmQDraBQJfQ+w1AhsDBQkShccRBQsJCAcCAyICAQYV +CgkICwIEFgIDAQIeBwIXgAAKCRBSiJe4JkA62nmuAP9uL/HOdB0gvwWrH+FpURJL +s4bnaZaPIk9ARrU0EXRgJgD/YCGfHQXpIPT0ZaXuwJexK04Z+qMFR/bM1q1Leo5C +jgY= +=ukul +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libgcrypt/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc b/libgcrypt/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc new file mode 100644 index 0000000000..4cc3b046e4 --- /dev/null +++ b/libgcrypt/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEYKSChxYJKwYBBAHaRw8BAQdAmZ1/CnyMQ3k/d4SOFCJaTrNCLy62+A69gPnt +eYT4fz60IE5paWJlIFl1dGFrYSAoR251UEcgUmVsZWFzZSBLZXkpiJoEExYKAEIW +IQSsjhFb9z4tjUf6mQjpjpstGcbIvQUCYKSChwIbAwUJCw0GmQULCQgHAgMiAgEG +FQoJCAsCBBYCAwECHgcCF4AACgkQ6Y6bLRnGyL3/ggD/Wu9KvcxT5K/iOE0PMP4J +4LeCYeQ97DqmL1UcSwTB2CYBAPYG2JfvDWwkv8IHKUZa/mPGPjfjmY/1h9mbRGyD +M+MM +=nU8p +-----END PGP PUBLIC KEY BLOCK-----