Update gnupg to 2.2.24

3 files changed, 21 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a5ddb26937f..21df830c1865 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnupg-large-secmem
 	pkgdesc = Complete and free implementation of the OpenPGP standard - with extra large secure memory for many parallel decryption actions
-	pkgver = 2.2.23
+	pkgver = 2.2.24
 	pkgrel = 1
 	url = https://www.gnupg.org/
 	install = install
@@ -17,6 +17,7 @@ pkgbase = gnupg-large-secmem
 	depends = libassuan
 	depends = pinentry
 	depends = bzip2
+	depends = libbz2.so
 	depends = readline
 	depends = libreadline.so
 	depends = gnutls
@@ -27,30 +28,28 @@ pkgbase = gnupg-large-secmem
 	optdepends = libusb-compat: scdaemon
 	optdepends = pcsclite: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.2.23
-	provides = gnupg=2.2.23
+	provides = gnupg2=2.2.24
+	provides = gnupg=2.2.24
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2.sig
+	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 = gnupg_large_secmem.patch
 	source = drop-import-clean.patch
 	source = avoid-beta-warning.patch
-	source = do-not-rebuild-defsincdate.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28
-	sha256sums = 10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c
+	validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA
+	sha256sums = 9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46
 	sha256sums = SKIP
 	sha256sums = 63108d8fcbcfddf7ba6eee699ade0f79f98558c8ba1f07d86c7a55dce603355d
 	sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc
 	sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
-	sha256sums = bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee
 
 pkgname = gnupg-large-secmem
 
diff --git a/PKGBUILD b/PKGBUILD
index 117bcc9b4adb..6aa046873b7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=gnupg-large-secmem
 _pkgname=gnupg
-pkgver=2.2.23
+pkgver=2.2.24
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard - with extra large secure memory for many parallel decryption actions'
 url='https://www.gnupg.org/'
@@ -16,27 +16,27 @@ license=('GPL')
 arch=('x86_64')
 checkdepends=('openssh')
 makedepends=('libldap' 'libusb-compat' 'pcsclite')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
-         'pinentry' 'bzip2' 'readline' 'libreadline.so' 'gnutls'
-         'sqlite' 'zlib' 'glibc')
+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'
-              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-              '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
+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)
+)
 source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig}
         "gnupg_large_secmem.patch"
         'drop-import-clean.patch'
-        'avoid-beta-warning.patch'
-        'do-not-rebuild-defsincdate.patch')
-sha256sums=('10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c'
+        'avoid-beta-warning.patch')
+sha256sums=('9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46'
             'SKIP'
             '63108d8fcbcfddf7ba6eee699ade0f79f98558c8ba1f07d86c7a55dce603355d'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
-            '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-            'bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee')
+            '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
 install=install
 
@@ -50,7 +50,6 @@ prepare() {
 	patch -p1 -i ../drop-import-clean.patch
 
 	# improve reproducibility
-	patch -p1 -i ../do-not-rebuild-defsincdate.patch
 	rm doc/gnupg.info*
 
 	# See: https://lists.gnupg.org/pipermail/gnupg-devel/2017-June/032905.html
diff --git a/do-not-rebuild-defsincdate.patch b/do-not-rebuild-defsincdate.patch
deleted file mode 100644
index cf465942d944..000000000000
--- a/do-not-rebuild-defsincdate.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3e8ff68502bf5de333db7213d9e27e0b9e8cc36e Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Mon, 29 Aug 2016 12:34:42 -0400
-Subject: [PATCH 7/7] avoid regenerating defsincdate (use shipped file)
-
-upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
-tries to rewrite doc/defsincdate if it notices that any of the files
-have been modified more recently, and it does so assuming that we're
-running from a git repo.
-
-However, we'd rather ship the documents cleanly without regenerating
-defsincdate -- we don't have a git repo available (debian builds from
-upstream tarballs) and any changes to the texinfo files (e.g. from
-debian/patches/) might result in different dates on the files than we
-expect after they're applied by dpkg or quilt or whatever, which makes
-the datestamp unreproducible.
----
- doc/Makefile.am | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index d47d83ede..c0a81b0b9 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -177,15 +177,6 @@
- 
- dist-hook: defsincdate
- 
--defsincdate: $(gnupg_TEXINFOS)
--	: >defsincdate ; \
--	if test -e $(top_srcdir)/.git; then \
--	  (cd $(srcdir) && git log -1 --format='%ct' \
--               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
--        elif test x"$SOURCE_DATE_EPOCH" != x; then   \
--	   echo "$SOURCE_DATE_EPOCH" >>defsincdate ; \
--	fi
--
- defs.inc : defsincdate Makefile mkdefsinc
- 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
- 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
--- 
-2.27.0
-