pushed to 2.1.19; note make check fails for gpg < 2.1.19

4 files changed, 22 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2ce555ada3a..60bd1cbe3ca7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Mar  3 19:12:42 UTC 2017
+# Thu Mar 16 14:57:58 UTC 2017
 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.18
-	pkgrel = 2
+	pkgver = 2.1.19
+	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = install
 	arch = i686
@@ -24,22 +24,20 @@ pkgbase = gnupg-large-rsa
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	provides = dirmngr
-	provides = gnupg2=2.1.18
-	provides = gnupg=2.1.18
+	provides = gnupg2=2.1.19
+	provides = gnupg=2.1.19
 	conflicts = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	replaces = dirmngr
 	replaces = gnupg2
 	replaces = gnupg
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.18.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.18.tar.bz2.sig
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.19.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.1.19.tar.bz2.sig
 	source = gnupg-large-rsa.patch
-	source = scd.patch
-	sha256sums = d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994
+	sha256sums = 46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0
 	sha256sums = SKIP
-	sha256sums = e943ba54f7ac510b633624ad84cd93a3ab54cb13e7547ac0d54abe3bf3aa3a0a
-	sha256sums = e1c5c9bf78231518339792195be52df8f8f65638196611726a7e053dbac0ccb6
+	sha256sums = 293e56dfd71ba2b51d9a2eeef20c4641bd15af7c384807466f385b87119b999c
 
 pkgname = gnupg-large-rsa
 
diff --git a/PKGBUILD b/PKGBUILD
index d20ecb7f8f9c..df8abd14e9e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=gnupg-large-rsa
 _pkgname=gnupg
-pkgver=2.1.18
-pkgrel=2
+pkgver=2.1.19
+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/'
 license=('GPL')
@@ -23,12 +23,10 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} 
         "${pkgname}.patch"
-        "scd.patch")
-sha256sums=('d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994'
+       )
+sha256sums=('46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0'
             'SKIP'
-            'e943ba54f7ac510b633624ad84cd93a3ab54cb13e7547ac0d54abe3bf3aa3a0a'
-            'e1c5c9bf78231518339792195be52df8f8f65638196611726a7e053dbac0ccb6'
-           ) 
+            '293e56dfd71ba2b51d9a2eeef20c4641bd15af7c384807466f385b87119b999c')
 
 install=install
 
@@ -40,7 +38,6 @@ prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
     patch -p1 -i ${srcdir}/${pkgname}.patch	
     sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-    patch -p1 -i ${srcdir}/scd.patch 
 }
 
 build() {
@@ -50,9 +47,9 @@ build() {
 		--sysconfdir=/etc \
 		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/gnupg \
-        --enable-maintainer-mode \
         --enable-symcryptrun \
-        --enable-large-secmem
+        --enable-large-secmem \
+        --enable-maintainer-mode \
 
     make
 }
diff --git a/gnupg-large-rsa.patch b/gnupg-large-rsa.patch
index 53c806029d67..22297090bbaa 100644
--- a/gnupg-large-rsa.patch
+++ b/gnupg-large-rsa.patch
@@ -1,7 +1,7 @@
 diff -ru a/configure b/configure
 --- a/configure	2016-01-26 13:54:50.000000000 +0100
 +++ b/configure	2016-03-06 18:34:29.190228228 +0100
-@@ -2861,7 +2861,7 @@
+@@ -2866,7 +2866,7 @@
  
  ac_config_headers="$ac_config_headers config.h"
  
@@ -10,31 +10,10 @@ diff -ru a/configure b/configure
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-diff -ru a/configure.ac b/configure.ac
---- a/configure.ac	2016-01-26 10:36:37.000000000 +0100
-+++ b/configure.ac	2017-03-01 15:00:00.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--min_automake_version="1.14"
-+min_automake_version="1.15"
- 
- # To build a release you need to create a tag with the version number
- # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
-@@ -242,7 +242,7 @@
-               large_secmem=$enableval, large_secmem=no)
- AC_MSG_RESULT($large_secmem)
- if test "$large_secmem" = yes ; then
--   SECMEM_BUFFER_SIZE=65536
-+   SECMEM_BUFFER_SIZE=67108864
- else
-    SECMEM_BUFFER_SIZE=32768
- fi
 diff -ru a/g10/keygen.c b/g10/keygen.c
 --- a/g10/keygen.c	2016-01-26 10:36:37.000000000 +0100
 +++ b/g10/keygen.c	2017-03-01 15:00:00.000000000 +0100
-@@ -1611,7 +1611,7 @@
+@@ -1612,7 +1612,7 @@
    int err;
    char *keyparms;
    char nbitsstr[35];
@@ -43,7 +22,7 @@ diff -ru a/g10/keygen.c b/g10/keygen.c
  
    log_assert (is_RSA(algo));
  
-@@ -2101,6 +2101,12 @@
+@@ -2086,6 +2086,12 @@
        *max=441;
        def=255;
        break;
@@ -53,6 +32,6 @@ diff -ru a/g10/keygen.c b/g10/keygen.c
 +      *max = (opt.flags.large_rsa?16384:4096);
 +      def = 2048;
 +      break;
-     }
- 
-   tty_printf(_("%s keys may be between %u and %u bits long.\n"),
+
+    default:
+      *min = opt.compliance == CO_DE_VS ? 2048 : 1024;
diff --git a/scd.patch b/scd.patch
deleted file mode 100644
index 6b07afe3d493..000000000000
--- a/scd.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From da4c132cca2c6df81243c9660b7348268a848f88 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 13 Feb 2017 11:09:13 +0900
-Subject: [PATCH 1/1] scd: Fix use case of PC/SC.
-
-* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
-When CCID driver fails to open, try PC/SC if APP is nothing.
-* scd/app.c (select_application): Supply arg if APP is nothing.
-
---
-
-After scanning available card readers by CCID driver, scdaemon should
-try PC/SC service if no APP is registered yet.  Also, when the slot
-is allocated for PC/SC (ccid.handle==NULL), it should not call
-ccid_compare_BAI, otherwise scdaemon crashes.
-
-Debian-bug-id: 852702, 854005, 854595, 854616
-
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- scd/apdu.c | 14 +++++++++++---
- scd/apdu.h |  2 +-
- scd/app.c  |  2 +-
- 3 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/scd/apdu.c b/scd/apdu.c
-index 6fc62aa..82d53b1 100644
---- a/scd/apdu.c
-+++ b/scd/apdu.c
-@@ -3127,7 +3127,7 @@ apdu_open_one_reader (const char *portstr)
- }
- 
- int
--apdu_open_reader (struct dev_list *dl)
-+apdu_open_reader (struct dev_list *dl, int app_empty)
- {
-   int slot;
- 
-@@ -3177,6 +3177,7 @@ apdu_open_reader (struct dev_list *dl)
-           /* Check identity by BAI against already opened HANDLEs.  */
-           for (slot = 0; slot < MAX_READER; slot++)
-             if (reader_table[slot].used
-+                && reader_table[slot].ccid.handle
-                 && ccid_compare_BAI (reader_table[slot].ccid.handle, bai))
-               break;
- 
-@@ -3201,12 +3202,19 @@ apdu_open_reader (struct dev_list *dl)
-             dl->idx++;
-         }
- 
--      slot = -1;
-+      /* Not found.  Try one for PC/SC, only when it's the initial scan.  */
-+      if (app_empty && dl->idx == dl->idx_max)
-+        {
-+          dl->idx++;
-+          slot = apdu_open_one_reader (dl->portstr);
-+        }
-+      else
-+        slot = -1;
-     }
-   else
- #endif
-     { /* PC/SC readers.  */
--      if (dl->idx == 0)
-+      if (app_empty && dl->idx == 0)
-         {
-           dl->idx++;
-           slot = apdu_open_one_reader (dl->portstr);
-diff --git a/scd/apdu.h b/scd/apdu.h
-index 473def5..6751e8c 100644
---- a/scd/apdu.h
-+++ b/scd/apdu.h
-@@ -91,7 +91,7 @@ gpg_error_t apdu_dev_list_start (const char *portstr, struct dev_list **l_p);
- void apdu_dev_list_finish (struct dev_list *l);
- 
- /* Note, that apdu_open_reader returns no status word but -1 on error. */
--int apdu_open_reader (struct dev_list *l);
-+int apdu_open_reader (struct dev_list *l, int app_empty);
- int apdu_open_remote_reader (const char *portstr,
-                              const unsigned char *cookie, size_t length,
-                              int (*readfnc) (void *opaque,
-diff --git a/scd/app.c b/scd/app.c
-index 5b8da1c..7e72870 100644
---- a/scd/app.c
-+++ b/scd/app.c
-@@ -343,7 +343,7 @@ select_application (ctrl_t ctrl, const char *name, app_t *r_app,
-           int slot;
-           int periodical_check_needed_this;
- 
--          slot = apdu_open_reader (l);
-+          slot = apdu_open_reader (l, !app_top);
-           if (slot < 0)
-             break;
- 
--- 
-2.8.0.rc3
-