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 04D0D139085 for ; Tue, 24 Jan 2017 17:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D92572241A1; Tue, 24 Jan 2017 17:44:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4E3E2241A1 for ; Tue, 24 Jan 2017 17:44:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9569D3416B8 for ; Tue, 24 Jan 2017 17:44:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4AFE2DEA for ; Tue, 24 Jan 2017 17:44:15 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1485279774.1b8602a8659f24d7f2fd463d9fd08a7f4c606fc1.k_f@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.0.17-gpgsm-gencert.patch X-VCS-Directories: app-crypt/gnupg/files/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 1b8602a8659f24d7f2fd463d9fd08a7f4c606fc1 X-VCS-Branch: master Date: Tue, 24 Jan 2017 17:44:15 +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: 95050e4b-a7b0-4eb2-a3bd-682b3d19e1cb X-Archives-Hash: 13cc4a3b0d68d71e8c025bcc49154bcb commit: 1b8602a8659f24d7f2fd463d9fd08a7f4c606fc1 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Tue Jan 24 17:42:54 2017 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Tue Jan 24 17:42:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8602a8 app-crypt/gnupg: Restore missing patch for gnupg 2.0 branch Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch new file mode 100644 index 00000000..9506f81 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch @@ -0,0 +1,34 @@ +From c34486a64c223bcbfbb57d9abcf107d684b815b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= +Date: Sun, 17 Apr 2011 01:34:39 +0200 +Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp + file. + +https://bugs.g10code.com/gnupg/issue1466 + +--- + tools/gpgsm-gencert.sh | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh +index b209c8e..e7c812f 100755 +--- a/tools/gpgsm-gencert.sh ++++ b/tools/gpgsm-gencert.sh +@@ -178,10 +178,10 @@ Key-Length: $KEY_LENGTH + Key-Usage: $KEY_USAGE + Name-DN: $NAME + EOF +-[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" +-[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" +-[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" +-[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" ++[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true ++[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true ++[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true ++[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true + ) > "$file_parameter" + + +-- +1.7.5.rc1 +