From 488d3f95d8c5b1bd1049a95c382ccac67a66020d Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Tue, 24 Nov 2020 16:11:05 +0200 Subject: [PATCH] Sync with ABS and bump version --- .SRCINFO | 18 +++++++++++------- PKGBUILD | 26 ++++++++++++++------------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index da3ac5f..ab4e6df 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gnupg-scdaemon-shared-access pkgdesc = This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access - pkgver = 2.2.24 + pkgver = 2.2.25 pkgrel = 1 url = https://www.gnupg.org/ install = install @@ -17,29 +17,33 @@ pkgbase = gnupg-scdaemon-shared-access depends = libassuan depends = pinentry depends = bzip2 + depends = libbz2.so depends = readline + depends = libreadline.so depends = gnutls depends = sqlite + depends = zlib + depends = glibc optdepends = libldap: gpg2keys_ldap optdepends = libusb-compat: scdaemon optdepends = pcsclite: scdaemon provides = gnupg provides = dirmngr - provides = gnupg=2.2.24 - provides = gnupg2=2.2.24 + provides = gnupg=2.2.25 + provides = gnupg2=2.2.25 conflicts = gnupg conflicts = dirmngr conflicts = gnupg2 - source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.24.tar.bz2 - source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.24.tar.bz2.sig + source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.25.tar.bz2 + source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.25.tar.bz2.sig source = drop-import-clean.patch source = avoid-beta-warning.patch source = scdaemon_shared-access.patch validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 - validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959 + validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06 validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28 validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA - sha256sums = 9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46 + sha256sums = c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a sha256sums = SKIP sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d diff --git a/PKGBUILD b/PKGBUILD index 28e6461..35a3f84 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,6 @@ # Maintainer: Arti Zirk +# Contributor: Levente Polyak +# Contributor: Lukas Fleischer # Contributor: Gaetan Bisson # Contributor: Tobias Powalowski # Contributor: Andreas Radke @@ -6,7 +8,7 @@ _pkgname=gnupg pkgname=gnupg-scdaemon-shared-access -pkgver=2.2.24 +pkgver=2.2.25 pkgrel=1 pkgdesc='This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access' url='https://www.gnupg.org/' @@ -14,20 +16,23 @@ license=('GPL') arch=('x86_64') checkdepends=('openssh') makedepends=('libldap' 'libusb-compat' 'pcsclite') -depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' - 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite') +depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry' + 'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite' + 'zlib' 'glibc') optdepends=('libldap: gpg2keys_ldap' 'libusb-compat: scdaemon' 'pcsclite: scdaemon') -validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' - '46CC730865BB5C78EBABADCF04376F3EE0856959' - '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' - '6DAA6E64A76D2840571B4902528897B826403ADA') +validpgpkeys=( + 'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig) + '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) + '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key) + '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020) +) source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 'drop-import-clean.patch' 'avoid-beta-warning.patch' "scdaemon_shared-access.patch") -sha256sums=('9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46' +sha256sums=('c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a' 'SKIP' '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc' '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d' @@ -74,8 +79,5 @@ package() { ln -s gpg "${pkgdir}"/usr/bin/gpg2 ln -s gpgv "${pkgdir}"/usr/bin/gpgv2 - cd doc/examples/systemd-user - for i in *.*; do - install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i" - done + install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user" }