bump version

3 files changed, 21 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69164165e1c4..e3c096f9a6db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnupg-scdaemon-shared-access
 	pkgdesc = This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access
-	pkgver = 2.2.16
+	pkgver = 2.2.17
 	pkgrel = 1
 	url = https://www.gnupg.org/
 	install = install
@@ -25,21 +25,21 @@ pkgbase = gnupg-scdaemon-shared-access
 	optdepends = pcsclite: scdaemon
 	provides = gnupg
 	provides = dirmngr
-	provides = gnupg=2.2.16
-	provides = gnupg2=2.2.16
+	provides = gnupg=2.2.17
+	provides = gnupg2=2.2.17
 	conflicts = gnupg
 	conflicts = dirmngr
 	conflicts = gnupg2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.16.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.16.tar.bz2.sig
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2.sig
 	source = scdaemon_shared-access.patch
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
 	validpgpkeys = D238EA65D64C67ED4C3073F28A861B1C7EFD60D9
-	sha256sums = 6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb
+	sha256sums = afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514
 	sha256sums = SKIP
-	sha256sums = 877ca0b8abcb6d1263bf40f3e9aa66b754a9957943ae2de591dfa42a1b21b7cf
+	sha256sums = aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc
 
 pkgname = gnupg-scdaemon-shared-access
 
diff --git a/PKGBUILD b/PKGBUILD
index 4452ad4e9617..115b8425c0a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=gnupg
 pkgname=gnupg-scdaemon-shared-access
-pkgver=2.2.16
+pkgver=2.2.17
 pkgrel=1
 pkgdesc='This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access'
 url='https://www.gnupg.org/'
@@ -25,9 +25,9 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig}
         "scdaemon_shared-access.patch")
-sha256sums=('6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb'
+sha256sums=('afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514'
             'SKIP'
-            '877ca0b8abcb6d1263bf40f3e9aa66b754a9957943ae2de591dfa42a1b21b7cf')
+            'aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc')
 
 install=install
 
@@ -37,7 +37,7 @@ provides=('gnupg' 'dirmngr' "gnupg=${pkgver}" "gnupg2=${pkgver}")
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-	patch -F3 -p1 -t -N < "${srcdir}/scdaemon_shared-access.patch"
+	patch -p1 -t -N < "${srcdir}/scdaemon_shared-access.patch"
 }
 
 build() {
diff --git a/scdaemon_shared-access.patch b/scdaemon_shared-access.patch
index 36e772b874be..95a89d224356 100644
--- a/scdaemon_shared-access.patch
+++ b/scdaemon_shared-access.patch
@@ -6,7 +6,7 @@
 
 --- a/scd/apdu.c
 +++ b/scd/apdu.c
-@@ -793,7 +793,7 @@ connect_pcsc_card (int slot)
+@@ -816,7 +816,7 @@ connect_pcsc_card (int slot)
 
    err = pcsc_connect (reader_table[slot].pcsc.context,
                        reader_table[slot].rdrname,
@@ -22,28 +22,28 @@
    oDisableApplication,
    oEnablePinpadVarlen,
 +  oSharedAccess,
-   oListenBacklog
- };
+   oListenBacklog,
 
-@@ -157,6 +158,8 @@ static ARGPARSE_OPTS opts[] = {
-                 N_("use variable length input for pinpad")),
-   ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
+   oNoop
+@@ -164,6 +165,8 @@ static ARGPARSE_OPTS opts[] = {
+   /* Stubs for options which are implemented by 2.3 or later.  */
+   ARGPARSE_s_s (oNoop, "application-priority", "@"),
 
 +  ARGPARSE_s_n (oSharedAccess, "shared-access", N_("use PCSC_SHARE_SHARED for pcsc_connect")),
 +
    ARGPARSE_end ()
  };
 
-@@ -597,6 +598,8 @@ main (int argc, char **argv )
+@@ -629,6 +632,8 @@ main (int argc, char **argv )
 
-         case oEnablePinpadVarlen: opt.enable_pinpad_varlen = 1; break;
+         case oNoop: break;
 
 +        case oSharedAccess: opt.shared_access = 1; break;
 +
          default:
            pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
            break;
-@@ -695,6 +695,7 @@ main (int argc, char **argv )
+@@ -727,6 +732,7 @@ main (int argc, char **argv )
        es_printf ("disable-pinpad:%lu:\n", GC_OPT_FLAG_NONE );
        es_printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0);
        es_printf ("enable-pinpad-varlen:%lu:\n", GC_OPT_FLAG_NONE );
@@ -64,7 +64,7 @@
 
 --- a/tools/gpgconf-comp.c
 +++ b/tools/gpgconf-comp.c
-@@ -648,6 +648,9 @@ static gc_option_t gc_options_scdaemon[] =
+@@ -653,6 +653,9 @@ static gc_option_t gc_options_scdaemon[] =
     { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
       "gnupg", "|N|disconnect the card after N seconds of inactivity",
       GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },