Update to 2.2.35

2 files changed, 39 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c1a18220a0e..d8a7956a5945 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,18 @@
 pkgbase = gnupg-nouid-patch
 	pkgdesc = GnuPG (OpenPGP) with patches to allow using keys.openpgp.org
-	pkgver = 2.2.32
+	pkgver = 2.2.35
 	pkgrel = 1
 	url = https://keys.openpgp.org/about/faq#older-gnupg
 	install = install
 	arch = x86_64
-	license = GPL
+	license = BSD
+	license = custom
+	license = CC0
+	license = GPL2
+	license = GPL3
+	license = LGPL3
+	license = LGPL2.1
+	license = MIT
 	checkdepends = openssh
 	makedepends = libldap
 	makedepends = libusb-compat
@@ -27,10 +34,13 @@ pkgbase = gnupg-nouid-patch
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	optdepends = pcsclite: scdaemon
-	provides = gnupg=2.2.32
+	provides = gnupg=2.2.35
 	conflicts = gnupg
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.32.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.32.tar.bz2.sig
+	options = debug
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.35.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.35.tar.bz2.sig
+	source = gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da
+	source = gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d
 	source = drop-import-clean.patch
 	source = avoid-beta-warning.patch
 	source = tests-add-test-cases-for-import-without-uid.patch
@@ -40,8 +50,11 @@ pkgbase = gnupg-nouid-patch
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28
 	validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA
-	sha256sums = b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614
+	validpgpkeys = AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD
+	sha256sums = 340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690
 	sha256sums = SKIP
+	sha256sums = 1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5
+	sha256sums = 00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7
 	sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc
 	sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
 	sha256sums = 9f54178400bbc78629e67d4949909187c4840e41b030920f3152cb9f1e37eecf
diff --git a/PKGBUILD b/PKGBUILD
index 3ef104f99458..748263362c97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,11 @@
 
 pkgname=gnupg-nouid-patch
 _pkgname=gnupg
-pkgver=2.2.32
+pkgver=2.2.35
 pkgrel=1
 pkgdesc='GnuPG (OpenPGP) with patches to allow using keys.openpgp.org'
 url='https://keys.openpgp.org/about/faq#older-gnupg'
-license=('GPL')
+license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT)
 arch=('x86_64')
 provides=("$_pkgname=${pkgver}")
 conflicts=("$_pkgname")
@@ -24,20 +24,26 @@ depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
 optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon'
             'pcsclite: scdaemon')
+options=('debug')
 validpgpkeys=(
 	'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
 	'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
 	'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
 	'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
-) 
+	'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG Release Key)
+)
 source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'drop-import-clean.patch'
+				'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
+				'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d'
+				'drop-import-clean.patch'
 				'avoid-beta-warning.patch'
 				'tests-add-test-cases-for-import-without-uid.patch'
 				'gpg-allow-import-of-previously-known-keys-even-without-UI.patch'
 				'gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch')
-sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
+sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
             'SKIP'
+            '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
+            '00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
             '9f54178400bbc78629e67d4949909187c4840e41b030920f3152cb9f1e37eecf'
@@ -50,6 +56,14 @@ prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	patch -p1 -i ../avoid-beta-warning.patch
 	patch -p1 -i ../drop-import-clean.patch
+
+	# https://bugs.archlinux.org/task/74423
+	# https://dev.gnupg.org/T5935
+	patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
+	# fix issues with signatures in an automated environment (e.g. archlinux-keyring):
+	# https://dev.gnupg.org/T5953
+	patch -Np1 -i ../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
+
 	patch -p1 -i ../tests-add-test-cases-for-import-without-uid.patch
 	patch -p1 -i ../gpg-allow-import-of-previously-known-keys-even-without-UI.patch
 	patch -p1 -i ../gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
@@ -84,6 +98,7 @@ package() {
 	ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
 	install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
+	install -Dm 644 COPYING.{CC0,other} -t "${pkgdir}/usr/share/licenses/$pkgname/"
 }
 
 # vim: ts=2 sw=2 noet: