pushed to 2.1.16

4 files changed, 18 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56550dc83d5f..a412b05bff7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnupg-large-rsa
 	pkgdesc = Complete and free implementation of the OpenPGP standard - with fixes to make large RSA keys really work (and even bigger keys)
-	pkgver = 2.1.11
+	pkgver = 2.1.16
 	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = install
@@ -18,27 +18,28 @@ pkgbase = gnupg-large-rsa
 	depends = bzip2
 	depends = readline
 	depends = gnutls
+	depends = sqlite
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.1.11
-	provides = gnupg=2.1.11
+	provides = gnupg2=2.1.16
+	provides = gnupg=2.1.16
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.11.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.11.tar.bz2.sig
-	source = gnupg-large-rsa-2.1.11.patch
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.16.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.16.tar.bz2.sig
+	source = gnupg-large-rsa-2.1.16.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
-	sha1sums = 4af2032a60ff22e322b1c5b270d6d2228f59a3a
+	sha1sums = 67540161c9fe289153c4a5ea60f7cdce0ef48897
 	sha1sums = SKIP
-	sha1sums = be64ecc1d3ff9c6ef4e58cf82825f39e23816b9
+	sha1sums = 5811fa8b0cde32f24ce8360a5d02874a86acb578
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index 28e2237a5f8c..633308deb455 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.1.11
+pkgver=2.1.16
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard - with fixes to make large RSA keys really work (and even bigger keys)'
 url='http://www.gnupg.org/'
@@ -16,16 +16,13 @@ optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
-         'pinentry' 'bzip2' 'readline' 'gnutls')
+         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} "${pkgname}-${pkgver}.patch")
-sha1sums=('4af2032a60ff22e322b1c5b270d6d2228f59a3a'
-          'SKIP'
-          'be64ecc1d3ff9c6ef4e58cf82825f39e23816b9'
-         )
+sha1sums=('67540161c9fe289153c4a5ea60f7cdce0ef48897' 'SKIP' '5811fa8b0cde32f24ce8360a5d02874a86acb578')
 
 install=install
 
@@ -62,6 +59,4 @@ package() {
 	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
 	ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
 	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-	rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
 }
-
diff --git a/gnupg-large-rsa-2.1.11.patch b/gnupg-large-rsa-2.1.16.patch
index ae2f472ff979..9bf74a29dfc5 100644
--- a/gnupg-large-rsa-2.1.11.patch
+++ b/gnupg-large-rsa-2.1.16.patch
@@ -50,7 +50,7 @@ diff -ru gnupg-2.1.11/g10/keygen.c gnupg-2.1.11-patched/g10/keygen.c
        break;
 +
 +    case PUBKEY_ALGO_RSA:
-+      max=(opt.flags.large_rsa?14336:4096);
++      *max=(opt.flags.large_rsa?14336:4096);
 +      break;
      }
  
diff --git a/install b/install
index 67bbe1b85ca9..5b2169f0e384 100644
--- a/install
+++ b/install
@@ -1,25 +1,10 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
 post_install() {
-	[ -x usr/bin/install-info ] || return 0
-	for f in ${info_files[@]}; do
-		usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-	done
-}
-
-pre_remove() {
-	[ -x usr/bin/install-info ] || return 0
-	for f in ${info_files[@]}; do
-		usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-	done
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null || true
 }
 
 post_upgrade() {
-	post_install
-
-	# Fix upgrade to 2.1; see FS#42798
-	[ $(vercmp $2 2.1.0-4) = -1 ] &&
-	dirmngr </dev/null &>/dev/null ||
-	return 0
+	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+	fi
 }