app-crypt/gnupg: remove unused patches

4 files changed, 0 insertions, 193 deletions

diff --git a/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch b/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
deleted file mode 100644
index 7c7904624916..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cf3778631f87ad03274ac94dcae7c7fbbd036913 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Tue, 22 Nov 2016 10:07:33 +0100
-Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test
- reliability
-
---
-As socket lengths are normally restricted to 108 characters
-(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters
-by default easily results in errors.
----
- tests/gpgscm/tests.scm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
-index 72afa99..039ea86 100644
---- a/tests/gpgscm/tests.scm
-+++ b/tests/gpgscm/tests.scm
-@@ -268,9 +268,9 @@
- (define (mkdtemp . components)
-   (_mkdtemp (if (null? components)
- 		(path-join (getenv "TMP")
--			   (string-append "gpgscm-" (get-isotime) "-"
-+			   (string-append "gscm"
- 					  (basename-suffix *scriptname* ".scm")
--					  "-XXXXXX"))
-+					  "XXXXXX"))
- 		(apply path-join components))))
- 
- (macro (with-temporary-working-directory form)
--- 
-2.7.3
-
diff --git a/app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch b/app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch
deleted file mode 100644
index eae8d9ea3f9a..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032668.html
-
-From c22a2a89d3bd3d08b3abb8e4e33df32b480338ec Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Tue, 7 Mar 2017 13:54:49 +0100
-Subject: [PATCH] gpgscm: Use system strlwr if available.
-
-* tests/gpgscm/scheme.c: Define local strlwr only when HAVE_STRLWR is
-not defined in config.h.
-* tests/gpgscm/scheme-config.h: Remove hack.
-
-Signed-off-by: Justus Winter <justus@g10code.com>
----
- tests/gpgscm/scheme-config.h | 4 ----
- tests/gpgscm/scheme.c        | 6 +++++-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/gpgscm/scheme-config.h b/tests/gpgscm/scheme-config.h
-index 2003498..15ca969 100644
---- a/tests/gpgscm/scheme-config.h
-+++ b/tests/gpgscm/scheme-config.h
-@@ -30,7 +30,3 @@
- #define USE_PLIST		0
- #define USE_INTERFACE		1
- #define SHOW_ERROR_LINE		1
--
--#if __MINGW32__
--# define USE_STRLWR 0
--#endif /* __MINGW32__ */
-diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
-index b2ff721..af97c27 100644
---- a/tests/gpgscm/scheme.c
-+++ b/tests/gpgscm/scheme.c
-@@ -12,6 +12,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #define _SCHEME_SOURCE
- #include "scheme-private.h"
- #ifndef WIN32
-@@ -88,7 +92,7 @@ static int stricmp(const char *s1, const char *s2)
- }
- #endif /* __APPLE__ */
- 
--#if USE_STRLWR
-+#if USE_STRLWR && !defined(HAVE_STRLWR)
- static const char *strlwr(char *s) {
-   const char *p=s;
-   while(*s) {
--- 
-2.10.2
-
diff --git a/app-crypt/gnupg/files/gnupg-2.1.19-solaris-ucred.patch b/app-crypt/gnupg/files/gnupg-2.1.19-solaris-ucred.patch
deleted file mode 100644
index aefce5e82566..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.19-solaris-ucred.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-command-ssh: include ucred.h
-
-In order to use ucred() when HAVE_SO_PEERCRED is defined, ucred.h needs
-to be included on Solaris.
-
-https://bugs.gnupg.org/gnupg/issue2981
-
---- a/agent/command-ssh.c
-+++ b/agent/command-ssh.c
-@@ -40,6 +40,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
-+#ifdef HAVE_UCRED_H
-+#include <ucred.h>
-+#endif
- 
- #include "agent.h"
- 
diff --git a/app-crypt/gnupg/files/gnupg-2.1.19-ssh-no-scdaemon.patch b/app-crypt/gnupg/files/gnupg-2.1.19-ssh-no-scdaemon.patch
deleted file mode 100644
index 14d5444f3a06..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.1.19-ssh-no-scdaemon.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 4ce4f2f683a17be3ddb93729f3f25014a97934ad Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 6 Mar 2017 10:26:11 +0900
-Subject: [PATCH 1/1] agent: For SSH, robustly handling scdaemon's errors.
-
-* agent/command-ssh.c (card_key_list): Return 0 when
-agent_card_serialno returns an error.
-(ssh_handler_request_identities): Handle errors for card listing
-and proceed to other cases.
---
-
-GnuPG-bug-id: 2980
-
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- agent/command-ssh.c | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/agent/command-ssh.c b/agent/command-ssh.c
-index 79b8f85..3ab41cf 100644
---- a/agent/command-ssh.c
-+++ b/agent/command-ssh.c
-@@ -2393,13 +2393,12 @@ card_key_list (ctrl_t ctrl, char **r_serialno, strlist_t *result)
-   err = agent_card_serialno (ctrl, r_serialno, NULL);
-   if (err)
-     {
--      if (gpg_err_code (err) == GPG_ERR_ENODEV)
--        return 0;               /* Nothing available.  */
--
--      if (opt.verbose)
-+      if (gpg_err_code (err) != GPG_ERR_ENODEV && opt.verbose)
-         log_info (_("error getting serial number of card: %s\n"),
-                   gpg_strerror (err));
--      return err;
-+
-+      /* Nothing available.  */
-+      return 0;
-     }
- 
-   err = agent_card_cardlist (ctrl, result);
-@@ -2568,7 +2567,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
-   gpg_error_t err;
-   int ret;
-   ssh_control_file_t cf = NULL;
--  char *cardsn;
-   gpg_error_t ret_err;
- 
-   (void)request;
-@@ -2601,21 +2599,21 @@ ssh_handler_request_identities (ctrl_t ctrl,
-           if (opt.verbose)
-             log_info (_("error getting list of cards: %s\n"),
-                       gpg_strerror (err));
--          goto out;
-+          goto scd_out;
-         }
- 
-       for (sl = card_list; sl; sl = sl->next)
-         {
-           char *serialno0;
-+          char *cardsn;
-+
-           err = agent_card_serialno (ctrl, &serialno0, sl->d);
-           if (err)
-             {
-               if (opt.verbose)
-                 log_info (_("error getting serial number of card: %s\n"),
-                           gpg_strerror (err));
--              xfree (serialno);
--              free_strlist (card_list);
--              goto out;
-+              continue;
-             }
- 
-           xfree (serialno0);
-@@ -2640,6 +2638,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
-       free_strlist (card_list);
-     }
- 
-+ scd_out:
-   /* Then look at all the registered and non-disabled keys. */
-   err = open_control_file (&cf, 0);
-   if (err)
--- 
-2.8.0.rc3
-