Fix patch, bug #549742

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 64 insertions, 20 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/Manifest b/net-im/gajim/Manifest
index fb0b040fa79e..f1d7845fe3da 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -12,32 +12,32 @@ AUX gajim-0.15.2-CVE-2012-5524.patch 2607 SHA256 9641f4497008fc965522d9114712fe4
 AUX gajim-0.15.3-roster.patch 1450 SHA256 ffbbbfbc6198fff03a566d69f2e6872898dd87df6598dea380e1642e34aba768 SHA512 4b229b8ee655856b24205cd2a23f86ff32212d869abef07abf6b410f30ad11fc84f9d6d4222cde6c58e761cc11f1cbf2787f088198e8310683334543723d944a WHIRLPOOL a00d5abf54a86543c2e2af35d441dc3aa0c38e0e569677128cd20da1f778aa445f487668d2f9bdfe0f558190cf27786bbc7fa2c807b10273c38975ebd6e8a293
 AUX gajim-0.15.3-starttls.patch 502 SHA256 24a7d4c15be003daa8a10f26730eec27ce75c0e8d0d727c5f5d8c1b7f7305be6 SHA512 5ac3b926d971eb37898a241af7e2b77189ed7874a144d3bb9955ed09f7c1e6f5373e04f94dbaac337903622ebc5825428018e3c2843cafd3e8ba9e50c0bba0f5 WHIRLPOOL 3e84c618d56e19750062e752f67ada26c260b51cc4f2bb749ec5516b5e53be18b1d4627c174ad35ac084f19bc1bad6b2d4bbec6124b40d4fc24d87398770fd7d
 AUX gajim-0.16-desktop.patch 522 SHA256 5bffb1182a6d80a7b0b360492364361f6613a11bc50039dcd12527b2d9f0cb2b SHA512 38a1d39931f31fe38aa4c981e5fb7cbec031c595303a29995b29c912edf263447ee653092702bc407482d667eaea9ac9e0181a2de262fd1530d223a6ec610fa2 WHIRLPOOL 1617889fbf54fc397bd1152ec3b0bfcdc30d459490ca70f23f0cc6cc5ca10d9a7d9df17fc57c5737f052097e87c57b5ea672b71a689d0e78a829fd4621d3bc71
-AUX gajim-0.16.1-gnupg-2.1-backport.patch 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
+AUX gajim-0.16.1-gnupg-2.1-backport.patch 1776 SHA256 b2d37bccf9674772c1514013c6eb751bbebd1a79a45ac3504f40254746f0949a SHA512 10fc2444de422ee343840f8809877d24c905a58bf2da910d9c19c0d05a9617284b148f8416dda76a9556407c2b13e3e5371b3fdcaca9be5a214f47f2f97529f0 WHIRLPOOL e6ad1594b97cdf58916ce434f932cde6ff0b8ae3b4df6264a5e15529b80085496df58430175ae690fc3c828eff72e947d6286e09466f696490709095a41fae11
 AUX gajim-0.16_beta2-pyopenssl-backport-1.patch 1623 SHA256 47991437de8e6f105533360a6bba8c1f35b5175e811941ff83b956e5c8970eae SHA512 771087b9eb695d07d89d5f9f6a80fa576ffbbacdd11d5b480c77e6f4a619c1e59d32ef5f5b99c69bdc45b748689d2ad0b73b21675df4b0728f60fabda5cbcb8f WHIRLPOOL 6285da2a8cdc7dc38e902fc3bf4445ab5cfc68afdc2e8a51ea2be9771ad24763f9a31a1a6212dcd3faf1b690c644829c0801526509e05b9a88920ee07efdf7e3
 AUX gajim-0.16_beta2-pyopenssl-backport-2.patch 1758 SHA256 f0cf25a15a908e28eacbd569a5198d2994d20bc5642bc519c17dc04efc8158fb SHA512 29980e307b969e717bfdc2b1263fec6c4a56fef947bc70a36ebdf21e229d7ae85a043f1499fcdcde7bff1050cc33938613b1a4fa4c694605c651413ffa3cffcf WHIRLPOOL 03e5359ca4f47c09f89c07eb6d7b5ad0b7af4651391a217c5220bb8b0de12eed27042c20ffb713c8c7e2b59a155d2a1de3676c60e3360aaaed9e589fc01cb05c
 DIST gajim-0.16.1.tar.bz2 4593988 SHA256 26ae32706d167f97d423c84fa7276e14a5bffe30c5e91c8b9e577c6d6cabe8be SHA512 04a2cce1e755e8c4c1fe3fa950b228f768bec703b7f46d763f2aa023798bf8e38795ccb8f9b74a56ddd9e7fad502b63f447cfb77fe11c5e4a55e818760c74f40 WHIRLPOOL 34141b49481885589ca3d6a2da9bf3618f13772ba78218d988b627fef53c42c345868b254edbdf305b93ae34acfe3fed0896b8e38114aa7fc0abdf9209c66d49
 DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
-EBUILD gajim-0.16.1-r1.ebuild 3089 SHA256 cf5abefbd5008e1c71ae5ab1790e7df6fe6b64485ff44457f3673f55240609d5 SHA512 dac57db9af4cfab26c1a686a27ea0ae8aa72ea86ad9558fcdb8d0e4ec3ca2e65bb076667ca9ddad86f4e2e76e20a6c553e3f6f4c7e924631f00784b6e6249e61 WHIRLPOOL 4f99b54e197de43b514832a2e72fbbea1c28fc08e48a75565ddc6a5dc7ee67ce06807d58ec6b97bcbb9fb49034b2619a5d09ec0cf61c22215fa8b50c9763cd47
+EBUILD gajim-0.16.1-r2.ebuild 3089 SHA256 7d96c592f5b365d938d2c0a3914fca7310044d7fe85e10c245ffe9d58f2f3f53 SHA512 921342a5df66bf4d77b1fd48d3e559b7fb12d82d2ac8c1c24b3d77462fb25353a4b890642dcf494dc6d79844995e8296ee75a19702c03e2708fc7ac282a22453 WHIRLPOOL b2b51fb853901292a894c882728fd6f8ef6a4f7816c2995f0fa1a24d5caf674c7b22466c071151e7bb8c334bbdc2ae65eebe1a43706622d0518d47b7bf6a9d1c
 EBUILD gajim-0.16.1.ebuild 3039 SHA256 6f84e09b2eeb0beab292d2af08ad34178efabaf227fef0deeb49c61238570aa5 SHA512 352da08d3c553890082fde4b43e0b13ca501058637aa5854f78d9277fc97dea511b08ceaf590a41befea2f9c16e750bceacece43b572f57b3180c8d1d2ac3033 WHIRLPOOL 6b4e0cd103f9d9c75679713f81ecea9c2bb52e2548c9109fb7f0e542af50d5c282c52162bede6d103ea5e53f6041f270ec715da61782e844daf33ff8967f4cb3
 EBUILD gajim-0.16.ebuild 3024 SHA256 8dcf2f5bfa2a9230e770c0562a2de11d70cc673fafc605e96045b252c87c613a SHA512 de11d0382fb1f03b617975b951453b6746c8989b89a79ef7aa1e9a9d2f0206e179fbf2b218cd5f64f55de4c780f7a53afa8f008d2dbdf2b9c8b75bbe78960b2f WHIRLPOOL 062bfe19b1236c44976fbc0bc6bc381c2634912416a2aaea16f32ec122724a28e04d30ebf6205577b19a33ee830d80a38cda109e016172dfba0cdf3e9409f1b2
-MISC ChangeLog 31972 SHA256 8c4d683577501a694bfd74a8d3044691f3e342c5fab6849b485a8f8815c00405 SHA512 b39bb0caf75b4f53dfc6488691916670c7ef0724d25e562454046f9c2b57b963ef9461e0ba7f1232e8544f6114e0f4b387dd9cf98714507b53200ad4d44cb037 WHIRLPOOL b9223e934906968d1dc59d0d7b3897b3702dda257cfbd3d5f295276c2d09d57a0a92c4f2afe72fea2d6f21efb3c3fdd75e8a8b547f74b6ab6f87b1e6a6d1097c
+MISC ChangeLog 32174 SHA256 7f16812661a8ca1e3bb4615be665f4b00325497e6068e87fb75f9c2eb2ad558a SHA512 48188acf80d6c4a49e6b62e6288fc88c9f2be2cbfebaab0108e6a7738eef7b96edf655f4c2fc018f3e75c3b79676afcd08446f2d1379041a7e763e77f52f44a0 WHIRLPOOL f7c69a2775ac6a02b8e72bdad38e0045b69eec51c39f8ac6944d776523525e8fbad4dd187fabab3dd2a732dcc843a7bf1ac78c42196cf862247e0d192b9ac7ac
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVWYm6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVXDtCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijyEP/R0i9w881cNTuWBFr+4PNu3X
-qkwshReq67Vd4HXqn+rn8b0eLYHKpQtN4vFlBCYe2FaEdiC02zHIklA1rDa01QA0
-1N81CFKfdK2Gmo7TZCGde+NPg6oJCNWFpeQxkI5lvwleJJyxgwDLRSMlsQKC8jPB
-1GLgGFrTjJxApHJfgn4MeuKjbgnOWdJtfWT0VvnqJ8csrjtAU3ECFtMYdTLzEAEs
-+0jeJ9nSKmvbKV3sOy2DkXSUabM743V9g3L5QATtMKoZ6qX9uPoiTNwaMFc6LsoG
-ISZ02pH1dHH7H2kqTYVAH09utEE+hH/Hy3EpLFZ8oAveRNCOLAwos/7m+hMSitZ9
-SiH4HOu+HyrzsQogv+hO3AKrrqkIDZZ+h0qPV3o1wfCJGdds59Hvh7FoRVf/Zjir
-wEUaxlyckkSZDZGL6iCZz/AEAJNM8YlYVMoT+97Vnq5pXZZERIGgFenuJe+RWF9w
-nHdslq3XBwLHsiPpZK+9YXb8GLy7d9KQZeStYjqDInW/FA8F7JdiYNF5id47MvWp
-LyNpK3uHAYRKJzTQUaQXb09EPG31ZsywJIIDCpGnyd1yZozPUcfZeSa4BpH+hUIX
-QLQGrl+n9oZV6WpY9sgVTm3sSnafX5voHXOTG1gnuds2XCroSniajJ+S262ywf92
-kO+HGm0kGupdNqE6PIJV
-=VfqE
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmia3UP/3MyKI7titpRaUtyi9oQSXEu
+xPDdzemtL0wAS7zb9XYrJBK0brCiS08xJnBxHK/ItaBZTDEFvGwOWuyFD5Xy5Pqh
+POY2N26+6DXGn+ztMbrICgf5UTCNgwyi5L6uJg+DFpPP6/fP3GFLWysfAw0OW9gn
+u4F/oYZxJ/mcoF7/wmYfz/CCnBi3r6qnsxB54a9ZblkTCmDQOKVC9rTplyuMquqA
+Eife8ni3V0R4l9udD5oYElymbrmD3W7tcSu9GG4Pmwt1gO+SGF5PLw0XJIZhoHag
+yVjwHa7WqqhhctS/QA0fIhbiXlYZEzeVaRiI1wi/xvTSC7Hsp0138hT8MZXtnpcv
+yMQFM9ygg5JxctUBQw4DHY0n4Mh+BziCav8v+ipqBkKk3al+cV3fFyQJ8933Qtik
+rUxxhd/kV4vCPkFy+BnavEU9sML1bsqmH0gU39lIfTfQ8uPKnIBz00Hj0GtZSs3J
+5NXW21IhF0NUQnwZBav+iKJiCgdbAPhIiV7a2zP7zpLxcY/lLDMd4zP6Di4ZuM9q
+0ftzQ41KgottFJLMZ3void/ynpg+lZd6Aaq9VuAPb/sxmnARKUkJ6KO32DCBRpxa
+pFi/KMXGchIpywltaGkpT+RrXdXnxjRv5bhEP+e//Wl1AJ6hwKnZgOnZaO29p8LP
+71AGXozuyITCujGyR+QF
+=fdAZ
 -----END PGP SIGNATURE-----
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