[gentoo-commits] gentoo-x86 commit in net-im/gajim/files: gajim-0.16.1-gnupg-2.1-backport.patch

[gentoo-commits] gentoo-x86 commit in net-im/gajim/files: gajim-0.16.1-gnupg-2.1-backport.patch

[Justin Lecher (jlec)]

jlec        15/05/18 06:42:06

  Added:                gajim-0.16.1-gnupg-2.1-backport.patch
  Log:
  Backport fix for gnupg 2.1, bug #549742; Drop old
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

Revision  Changes    Path
1.1                  net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch

	<<Binary file>>

[gentoo-commits] gentoo-x86 commit in net-im/gajim/files: gajim-0.16.1-gnupg-2.1-backport.patch

[Justin Lecher (jlec)]

jlec        15/05/20 07:44:01

  Modified:             gajim-0.16.1-gnupg-2.1-backport.patch
  Log:
  Fix patch, bug #549742
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

Revision  Changes    Path
1.2                  net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch?r1=1.1&r2=1.2

Index: gajim-0.16.1-gnupg-2.1-backport.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gajim/files/gajim-0.16.1-gnupg-2.1-backport.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gajim-0.16.1-gnupg-2.1-backport.patch	18 May 2015 06:42:06 -0000	1.1
+++ gajim-0.16.1-gnupg-2.1-backport.patch	20 May 2015 07:44:01 -0000	1.2
@@ -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(' ', '_'),