From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16AF71396D1 for ; Fri, 18 Aug 2017 17:34:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5128F1FC03B; Fri, 18 Aug 2017 17:34:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B1371FC03B for ; Fri, 18 Aug 2017 17:34:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DACA43419A7 for ; Fri, 18 Aug 2017 17:34:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8816F7A44 for ; Fri, 18 Aug 2017 17:34:48 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1503052179.8b5e22fc4f417c9e25abefc2a65819059970920f.alonbl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch app-crypt/gnupg/files/gnupg-2.1.19-have_strlwr.patch app-crypt/gnupg/files/gnupg-2.1.19-solaris-ucred.patch app-crypt/gnupg/files/gnupg-2.1.19-ssh-no-scdaemon.patch X-VCS-Directories: app-crypt/gnupg/files/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 8b5e22fc4f417c9e25abefc2a65819059970920f X-VCS-Branch: master Date: Fri, 18 Aug 2017 17:34:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6c5b4d26-a96c-4624-b3b4-ba4d60a86fb6 X-Archives-Hash: 434f5ceee360ae980ad1d0cf4e842717 commit: 8b5e22fc4f417c9e25abefc2a65819059970920f Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Aug 10 08:23:23 2017 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Fri Aug 18 10:29:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5e22fc app-crypt/gnupg: remove unused patches ...shorter-socket-path-lengts-to-improve-tes.patch | 33 --------- .../gnupg/files/gnupg-2.1.19-have_strlwr.patch | 56 -------------- .../gnupg/files/gnupg-2.1.19-solaris-ucred.patch | 19 ----- .../gnupg/files/gnupg-2.1.19-ssh-no-scdaemon.patch | 85 ---------------------- 4 files changed, 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 7c790462491..00000000000 --- 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 -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 eae8d9ea3f9..00000000000 --- 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 -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 ---- - 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 -+#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 aefce5e8256..00000000000 --- 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 - #include - #include -+#ifdef HAVE_UCRED_H -+#include -+#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 14d5444f3a0..00000000000 --- 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 -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 ---- - 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 -