[arch-commits] Commit in gnupg/trunk (PKGBUILD scdaemon.patch)

[Gaëtan Bisson]

    Date: Saturday, July 29, 2017 @ 05:07:51
  Author: bisson
Revision: 301352

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/scdaemon.patch

----------------+
 PKGBUILD       |   13 +++-----
 scdaemon.patch |   87 -------------------------------------------------------
 2 files changed, 5 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-29 04:31:44 UTC (rev 301351)
+++ PKGBUILD	2017-07-29 05:07:51 UTC (rev 301352)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.1.21
-pkgrel=3
+pkgver=2.1.22
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,11 +21,9 @@
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'scdaemon.patch')
-sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
-            'SKIP'
-            'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7'
+            'SKIP')
 
 install=install
 
@@ -36,7 +34,6 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-	patch -p1 -i ../scdaemon.patch # FS#54271
 }
 
 build() {

Deleted: scdaemon.patch
===================================================================
--- scdaemon.patch	2017-07-29 04:31:44 UTC (rev 301351)
+++ scdaemon.patch	2017-07-29 05:07:51 UTC (rev 301352)
@@ -1,87 +0,0 @@
-From a8dd96826f8484c0ae93c954035b95c2a75c80f2 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe at fsij.org>
-Date: Wed, 17 May 2017 09:46:06 +0900
-Subject: [PATCH] g10: Suppress error for card availability check.
-
-* g10/call-agent.c (start_agent): Add semantics for card; Suppress
-error for card check.
-(warn_version_mismatch): Ignore an error for scdaemon.
-(agent_scd_serialno): Call start_agent with
-FLAG_FOR_CARD_SUPPRESS_ERRORS.
-
---
-
-GnuPG-bug-id: 3165
-Fixes-commit: 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
-Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
----
- g10/call-agent.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/g10/call-agent.c b/g10/call-agent.c
-index be8c33d..4698a25 100644
---- a/g10/call-agent.c
-+++ b/g10/call-agent.c
-@@ -184,7 +184,8 @@ default_inq_cb (void *opaque, const char *line)
- 
- 
- /* Print a warning if the server's version number is less than our
--   version number.  Returns an error code on a connection problem.  */
-+   version number.  Returns an error code on a connection problem.
-+   Ignore an error for scdaemon (MODE==2).  */
- static gpg_error_t
- warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
- {
-@@ -193,7 +194,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
-   const char *myversion = strusage (13);
- 
-   err = get_assuan_server_version (ctx, mode, &serverversion);
--  if (err)
-+  if (err && mode != 2)
-     log_error (_("error getting version from '%s': %s\n"),
-                servername, gpg_strerror (err));
-   else if (compare_version_strings (serverversion, myversion) < 0)
-@@ -217,10 +218,12 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
- }
- 
- 
-+#define FLAG_FOR_CARD_SUPPRESS_ERRORS 2
-+
- /* Try to connect to the agent via socket or fork it off and work by
-    pipes.  Handle the server's initial greeting */
- static int
--start_agent (ctrl_t ctrl, int for_card)
-+start_agent (ctrl_t ctrl, int flag_for_card)
- {
-   int rc;
- 
-@@ -280,7 +283,7 @@ start_agent (ctrl_t ctrl, int for_card)
-         }
-     }
- 
--  if (!rc && for_card && !did_early_card_test)
-+  if (!rc && flag_for_card && !did_early_card_test)
-     {
-       /* Request the serial number of the card for an early test.  */
-       struct agent_card_info_s info;
-@@ -292,7 +295,7 @@ start_agent (ctrl_t ctrl, int for_card)
-         rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",
-                               NULL, NULL, NULL, NULL,
-                               learn_status_cb, &info);
--      if (rc)
-+      if (rc && !(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS))
-         {
-           switch (gpg_err_code (rc))
-             {
-@@ -1023,7 +1026,7 @@ agent_scd_serialno (char **r_serialno, const char *demand)
-   char *serialno = NULL;
-   char line[ASSUAN_LINELENGTH];
- 
--  err = start_agent (NULL, 1);
-+  err = start_agent (NULL, 1 | FLAG_FOR_CARD_SUPPRESS_ERRORS);
-   if (err)
-     return err;
- 
--- 
-2.8.0.rc3
-