diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2013-01-19 21:16:55 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2013-01-19 21:16:55 +0000 |
| commit | 6c90002d75e93a47d55473ce4f0c8a03d6fc020d (patch) | |
| tree | ad8777df65525e7171b0e92c1ab851cadb7e8812 /app-crypt/gnupg | |
| parent | cleanup files (diff) | |
| download | gentoo-2-6c90002d75e93a47d55473ce4f0c8a03d6fc020d.tar.gz gentoo-2-6c90002d75e93a47d55473ce4f0c8a03d6fc020d.tar.bz2 gentoo-2-6c90002d75e93a47d55473ce4f0c8a03d6fc020d.zip | |
cleanup files
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-crypt/gnupg')
| -rw-r--r-- | app-crypt/gnupg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch | 32 |
2 files changed, 29 insertions, 9 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 70ec9fb84405..924feb163bf4 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.456 2013/01/19 21:10:57 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.457 2013/01/19 21:16:55 alonbl Exp $ + + 19 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> + files/gnupg-2.0.17-gpgsm-gencert.patch: + cleanup files 19 Jan 2013; Alon Bar-Lev <alonbl@gentoo.org> -files/gnupg-2.0.17-libgrcrypt150-bugfix.patch, 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 index 1684097f4ea2..9506f814378d 100644 --- a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch +++ b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch @@ -4,15 +4,31 @@ Date: Sun, 17 Apr 2011 01:34:39 +0200 Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp file. -Bug-Url: https://bugs.g10code.com/gnupg/issue1466 +https://bugs.g10code.com/gnupg/issue1466 ---- tools/gpgsm-gencert.sh.old 2013-01-19 23:00:25.719408353 +0200 -+++ tools/gpgsm-gencert.sh 2013-01-19 23:00:31.636418255 +0200 -@@ -182,6 +182,7 @@ EOF - [ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" - [ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" - [ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" -+true +--- + 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 + |