diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-05-20 07:44:01 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-05-20 07:44:01 +0000 |
| commit | 85df35fd5773908d04e4241ed645bf17660bd7d1 (patch) | |
| tree | 71dcb47ba5c7a281b97520354863f5baae33cae9 /net-im | |
| parent | bup (diff) | |
| download | gentoo-2-85df35fd5773908d04e4241ed645bf17660bd7d1.tar.gz gentoo-2-85df35fd5773908d04e4241ed645bf17660bd7d1.tar.bz2 gentoo-2-85df35fd5773908d04e4241ed645bf17660bd7d1.zip | |
Fix patch, bug #549742
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gajim/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch | 38 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.16.1-r2.ebuild (renamed from net-im/gajim/gajim-0.16.1-r1.ebuild) | 2 |
3 files changed, 46 insertions, 2 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 144361bb60a6..cd02da495608 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/gajim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.225 2015/05/18 06:42:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.226 2015/05/20 07:44:01 jlec Exp $ + +*gajim-0.16.1-r2 (20 May 2015) + + 20 May 2015; Justin Lecher <jlec@gentoo.org> +gajim-0.16.1-r2.ebuild, + -gajim-0.16.1-r1.ebuild, files/gajim-0.16.1-gnupg-2.1-backport.patch: + Fix patch, bug #549742 *gajim-0.16.1-r1 (18 May 2015) diff --git a/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch b/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch index e69de29bb2d1..0eabc3000c53 100644 --- a/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch +++ b/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch @@ -0,0 +1,38 @@ +Index: src/common/gnupg.py +=================================================================== +--- a/src/common/gnupg.py ++++ b/src/common/gnupg.py +@@ -230,5 +230,5 @@ + "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", + "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", +- "PROGRESS"): ++ "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"): + pass + elif key == "BADSIG": +@@ -510,5 +510,6 @@ + if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION", + "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS", +- "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS"): ++ "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS", ++ "PINENTRY_LAUNCHED"): + # in the case of ERROR, this is because a more specific error + # message will have come first +@@ -558,5 +559,6 @@ + + def handle_status(self, key, value): +- if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED"): ++ if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED", ++ "PINENTRY_LAUNCHED"): + pass + elif key == "KEY_CREATED": +@@ -1203,8 +1205,6 @@ + parms.setdefault('Key-Length',2048) + parms.setdefault('Name-Real', "Autogenerated Key") +- try: +- logname = os.environ['LOGNAME'] +- except KeyError: +- logname = os.environ['USERNAME'] ++ logname = (os.environ.get('LOGNAME') or os.environ.get('USERNAME') or ++ 'unspecified') + hostname = socket.gethostname() + parms.setdefault('Name-Email', "%s@%s" % (logname.replace(' ', '_'), diff --git a/net-im/gajim/gajim-0.16.1-r1.ebuild b/net-im/gajim/gajim-0.16.1-r2.ebuild index ff1a21850eab..50aee2c2d4e2 100644 --- a/net-im/gajim/gajim-0.16.1-r1.ebuild +++ b/net-im/gajim/gajim-0.16.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.1-r1.ebuild,v 1.1 2015/05/18 06:42:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.1-r2.ebuild,v 1.1 2015/05/20 07:44:01 jlec Exp $ EAPI=5 |