[arch-commits] Commit in gnupg/trunk (PKGBUILD)

[Levente Polyak]

    Date: Tuesday, April 26, 2022 @ 18:20:32
  Author: anthraxx
Revision: 444042

upgpkg: gnupg 2.2.35-1

- backport patch for FS#74423

Modified:
  gnupg/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-26 18:18:59 UTC (rev 444041)
+++ PKGBUILD	2022-04-26 18:20:32 UTC (rev 444042)
@@ -6,8 +6,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.2.32
-pkgrel=2
+pkgver=2.2.35
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -20,6 +20,7 @@
 optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon'
             'pcsclite: scdaemon')
+options=('debug')
 validpgpkeys=(
 	'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
 	'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe at fsij.org>
@@ -27,10 +28,12 @@
 	'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
 )
 source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+				'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'
         'drop-import-clean.patch'
 				'avoid-beta-warning.patch')
-sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
+sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
             'SKIP'
+            '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
@@ -41,6 +44,10 @@
 	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
+
 	# improve reproducibility
 	rm doc/gnupg.info*