Update gnupg to 2.2.21

3 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02439404c68a..fd900a4c58e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.20
-	pkgrel = 4
+	pkgver = 2.2.21
+	pkgrel = 1
 	url = https://www.gnupg.org/
 	install = install
 	arch = x86_64
@@ -24,16 +24,16 @@ pkgbase = gnupg-large-secmem
 	optdepends = libusb-compat: scdaemon
 	optdepends = pcsclite: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.2.20
-	provides = gnupg=2.2.20
+	provides = gnupg2=2.2.21
+	provides = gnupg=2.2.21
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.20.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.20.tar.bz2.sig
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.21.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.21.tar.bz2.sig
 	source = gnupg_large_secmem.patch
 	source = drop-import-clean.patch
 	source = avoid-beta-warning.patch
@@ -42,12 +42,12 @@ pkgbase = gnupg-large-secmem
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28
-	sha256sums = 04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30
+	sha256sums = 61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec
 	sha256sums = SKIP
 	sha256sums = 63108d8fcbcfddf7ba6eee699ade0f79f98558c8ba1f07d86c7a55dce603355d
 	sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc
 	sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
-	sha256sums = 01fee1b04358e5dce76894214bb263e9a75cf408eb1277fad5b751ab3d45b87a
+	sha256sums = bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee
 
 pkgname = gnupg-large-secmem
 
diff --git a/PKGBUILD b/PKGBUILD
index a41d35412639..86cde65ae792 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=gnupg-large-secmem
 _pkgname=gnupg
-pkgver=2.2.20
-pkgrel=4
+pkgver=2.2.21
+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/'
 license=('GPL')
@@ -28,12 +28,12 @@ source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"
         'drop-import-clean.patch'
         'avoid-beta-warning.patch'
         'do-not-rebuild-defsincdate.patch')
-sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
+sha256sums=('61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec'
             'SKIP'
             '63108d8fcbcfddf7ba6eee699ade0f79f98558c8ba1f07d86c7a55dce603355d'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-            '01fee1b04358e5dce76894214bb263e9a75cf408eb1277fad5b751ab3d45b87a')
+            'bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee')
 
 install=install
 
diff --git a/do-not-rebuild-defsincdate.patch b/do-not-rebuild-defsincdate.patch
index d5dca6a8b3f6..cf465942d944 100644
--- a/do-not-rebuild-defsincdate.patch
+++ b/do-not-rebuild-defsincdate.patch
@@ -22,7 +22,7 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am
 index d47d83ede..c0a81b0b9 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -177,13 +177,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+@@ -177,15 +177,6 @@
  
  dist-hook: defsincdate
  
@@ -31,6 +31,8 @@ index d47d83ede..c0a81b0b9 100644
 -	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