Attempt to fix gpg-agent bug with enigmail (bug #374549).

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 213 insertions, 30 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 4cc0eab5292b..61ab93b52d41 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.319 2011/07/09 23:09:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.320 2011/07/10 21:51:41 polynomial-c Exp $
+
+*seamonkey-2.2-r1 (10 Jul 2011)
+
+  10 Jul 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch,
+  -seamonkey-2.2.ebuild, +seamonkey-2.2-r1.ebuild,
+  +files/enigmail/enigmail-updates.patch:
+  Attempt to fix gpg-agent bug with enigmail (bug #374549).
 
   09 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.2.ebuild:
   Added missing hu language.
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 79961389ff47..021bfe264e1b 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -4,7 +4,7 @@ Hash: SHA512
 AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b
 AUX enigmail/70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 AUX enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch 508 RMD160 54052743ab45504b96a7489ce296ae1cad24b4e4 SHA1 635dbca4f0b64491c4d9eb648bb673b0074caa96 SHA256 914633dca68d383d2d85cbba8b24973ee0c9f89e71eb79d3e7ee0a15aa168b3a
-AUX enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch 392 RMD160 77802eeb8849aa996ce6c27fc6f32ab7b55f8744 SHA1 cc7a8758e4efdd8556a2c8e2812de89fceaa3242 SHA256 37cca51c4f7b05644576ee758c1fa34e36708e4117520f5744f8b94e719d5cf7
+AUX enigmail/enigmail-updates.patch 8587 RMD160 b2641d4058ab609c60a8e425497732334099f5a4 SHA1 ee95dc6a3dd4f8cc4957af20634eb8ef2d13cf51 SHA256 edc27e1739a597c42127b8d684fc2e3c7a6ff919c83500f57bc77eac112a4db8
 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 AUX seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4
@@ -84,23 +84,23 @@ DIST seamonkey-2.2-tr.xpi 805151 RMD160 5accabd955766af2f6a95ec6a162fe7e9fc50790
 DIST seamonkey-2.2.source.tar.bz2 87478968 RMD160 cfad0460357c357df7a5936c0bd10374c18eac04 SHA1 bb2181fbbb4aa16e51899b483acadb31f7e0cbbc SHA256 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a
 EBUILD seamonkey-2.0.14-r1.ebuild 10004 RMD160 b2c7c104521879191e20e96949ad5c7f099e6f27 SHA1 4526a824c43500f4949c509914df49bb0a177840 SHA256 ed952957062934a3f564506a6fc73858147597f84be95b9e9c52f358fb8d00e8
 EBUILD seamonkey-2.1.ebuild 8652 RMD160 f2b30f546157d680e2e4bb691c1ec97b64d42189 SHA1 063c964ff1a2265eb82621acbbe9feb69b790d8f SHA256 e25b921dc2bf1728f835573a3d237c11de5f83e9c393c564c50ab00785e6ef09
-EBUILD seamonkey-2.2.ebuild 9290 RMD160 9848bd260ebb09a9879551dcac8e1fda42d98533 SHA1 e13855d99cd445cf1e601255a89875bc53475e05 SHA256 2810355074816681f71f8ed08653d135fac6ad14348b723fe363a546d63d57a2
-MISC ChangeLog 41926 RMD160 93f898aba697ee48dd98808e12ee5b02519ccbb9 SHA1 6e5316caa9e815c911942eccd26977c346356cad SHA256 9dcb97f720a7768885bc020935a14f0cba775c4e20a0c4cd3d3e964e74a01c7c
+EBUILD seamonkey-2.2-r1.ebuild 9271 RMD160 c9c8072599c88df2beaf81ac27da8ae0fa3c3756 SHA1 7e21754653caeb5c8e59b55bf82019a9cf0a0830 SHA256 1d8093cfe950fc1116e00e2160ad8f343f6285c4cdf451a4bed792246155d582
+MISC ChangeLog 42230 RMD160 073e6406f26be7bd4c08f419848c574056c45256 SHA1 06b0ffbb2edb33ba21ef5ffd514ac59dc23998d6 SHA256 b72a30d6e9622a46efc838783b0f81817af12cb5265fe57828428d4319e766e0
 MISC metadata.xml 1201 RMD160 db4a19472bbc6e9586bdebc804c1845e4a9cf062 SHA1 cdd2acd56566f2014682735db36922d7660afd12 SHA256 a8ad3bb4d1d4643e9ad5f280b46016801d7da73e5d319870e3d91ef780825208
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOGN/GAAoJEPiazRVxLXTFG8cP/iL6l/+0y6LwvG9kOO8JO9VB
-CPhsawtKrJmlc2QtYDS2/8Qualnh97sINn0KT53X32ZrfpJN/AJlfWPhYZtk7gvL
-saK4hYG7/cI2g2fbFMtdOPGYS8ifEW2/THQjoTvqnz+d+Vpg0l4vKzRMqRYKVy6v
-fqcrlhvaW6D2xujeFCNt6cdRC7lny6f3G1SlqATDoNf1Aa8x0xx+s4LBe4/PX0jp
-R88GTMOfEupom1WncuSS6ykFUD8CEt17ZRQczp8pVQvmZQSm7pR6URE4rAYPVrX9
-EOFeOTNCEH+ghgrJFrw0gw+Qrhe6luRpqarK562Az6kwsQXIyl/8CyApc0fC7AbB
-trJss4pz7vcxa+vh1m0n+tvRbxJrqn3mv1lg3Y1YY0yBW1IyFi69bxm109y9aWi6
-lEm3pFVu0uZF1GNhfxl2uDOshN7ZLRcpkH9gn7seD3Hp8JqkfKVaPURBkx0ol2Nb
-nI0K6JA6WUkDlIoDEdP3eZAtb+M8hiIgnStZMoY5B4we9M2nMMs3f1RW0P+F+PNB
-iQlCKuLQGP1OESmrwNOOIx9LVaxoel86SAqN7b3NQmaLTEWoltNOZJiy9hVSqtUS
-7ii++z9WzbJoNKpRjn+b1tZioU17N4zFCcLIguKAUrfCsk3lD88KxnyjL9TEUWpd
-ML9M45VU9uZl+3Iszau0
-=B/Cl
+iQIcBAEBCgAGBQJOGh7zAAoJEPiazRVxLXTFRM8P/i+k96QJXyaOn/2p8fpAQ+2y
+EzrhdELxmQx8lJBeipd93hM0FLfLoC376zyXjMsw0QT02C4EKTjQpSnx4Pgyw8rK
+Tdy4lht7mxjJFEzLEFT08//9SYDyjq6PKUa8EvYNnynNGDsps+AvcTTa5p+kp7zv
+yqHIa3RdHmNHhIhFYfUu+GGNA0RnT7QmS/kpMinGv2iit0mxiGLMnk9uvGyK4j7V
+tQkbthvund2HYniPJ2BF+irQ7VChQUR4U7pz8MAl99pQa05LaYUaMXpbqn4d55dW
+itr85QPDV4v0+V0as01+UhNcVMDbLzeWXGTlXWYnKIRrIHVh8pHh8hyxAQQ7BgQg
+uNci+8jRB7ArTgfeSkC0sLYjev1NRtBTRZRx0SF7W4cdfBsovReyrRgy5yZvhCf+
+RomnDgBPaskfGKGVsYUVKkqOCj3JH5Km1QnD/8K7Xyc86pidLr6awACpbs+EvRNn
+axDn8ErKdWtHSNAujYj6DdYyxlG2NulRHiLjjs3hmN0goSDChK4ZDLhDubP0/o2k
+++FdZVYLLP0r77em/e5+eqA87DsUuTD2fYBDDW8y5Uhsl42izKkeedg+oBQ9fS3f
+C6e6PHKxGwbxbvEzkIsgptiCaxBPS6+dWmm87AnllXt3puzg7ByGv23tuQ4zHd/H
+jp9vdjDkSWCXuBHqsLfv
+=emvL
 -----END PGP SIGNATURE-----
diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
deleted file mode 100644
index 91524aa9146a..000000000000
--- a/www-client/seamonkey/files/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigmail/package/install.rdf
-+++ enigmail/package/install.rdf
-@@ -24,7 +24,7 @@
-       <Description>
-         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-         <em:minVersion>2.1a1pre</em:minVersion>
--        <em:maxVersion>2.1.*</em:maxVersion>
-+        <em:maxVersion>2.2.*</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     <!-- em:targetApplication>
diff --git a/www-client/seamonkey/files/enigmail/enigmail-updates.patch b/www-client/seamonkey/files/enigmail/enigmail-updates.patch
new file mode 100644
index 000000000000..d49ffb437d29
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-updates.patch
@@ -0,0 +1,186 @@
+diff -urN enigmail/package/enigmail.js enigmail-new/package/enigmail.js
+--- enigmail/package/enigmail.js	2011-06-25 10:54:32.000000000 -0500
++++ enigmail-new/package/enigmail.js	2011-07-06 10:22:33.000000000 -0500
+@@ -922,10 +922,14 @@
+     if (this.gpgAgentProcess != null) {
+       Ec.DEBUG_LOG("enigmail.js: Enigmail.finalize: stopping gpg-agent PID="+this.gpgAgentProcess+"\n");
+       try {
+-        var installLoc = Components.classes[NS_EXTENSION_MANAGER_CONTRACTID]
+-                 .getService(Components.interfaces.nsIExtensionManager)
+-                 .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+-        var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
++        var directoryService =
++          Components.classes["@mozilla.org/file/directory_service;1"].
++          getService(Components.interfaces.nsIProperties);
++
++        var extensionLoc = directoryService.get("ProfD", Components.interfaces.nsIFile);
++        extensionLoc.append("extensions");
++        extensionLoc.append(ENIGMAIL_EXTENSION_ID);
++        extensionLoc.append("wrappers");
+         extensionLoc.append("gpg-agent-wrapper.sh");
+         try {
+           extensionLoc.permissions=0755;
+@@ -1056,7 +1060,7 @@
+ 
+     if (matches && (matches.length > 1)) {
+       gLogLevel = matches[1];
+-      WARNING_LOG("enigmail.js: Enigmail: gLogLevel="+gLogLevel+"\n");
++      Ec.WARNING_LOG("enigmail.js: Enigmail: gLogLevel="+gLogLevel+"\n");
+     }
+ 
+     // Initialize global environment variables list
+@@ -1452,10 +1456,14 @@
+                   "--max-cache-ttl", "999999" ];  // ca. 11 days
+ 
+           try {
+-            var installLoc = Components.classes[NS_EXTENSION_MANAGER_CONTRACTID]
+-                     .getService(Components.interfaces.nsIExtensionManager)
+-                     .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+-            var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
++            var directoryService =
++                Components.classes["@mozilla.org/file/directory_service;1"].
++                getService(Components.interfaces.nsIProperties);
++            var extensionLoc =
++                directoryService.get("ProfD", Components.interfaces.nsIFile);
++            extensionLoc.append("extensions");
++            extensionLoc.append(ENIGMAIL_EXTENSION_ID);
++            extensionLoc.append("wrappers");
+             extensionLoc.append("gpg-agent-wrapper.sh");
+             try {
+               extensionLoc.permissions=0755;
+@@ -1625,12 +1633,12 @@
+       }
+     }
+     if ((this.agentType == "gpg") && (exitCode == 256)) {
+-      WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg and exit code is 256. You seem to use cygwin-gpg, activating countermeasures.\n");
++      Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg and exit code is 256. You seem to use cygwin-gpg, activating countermeasures.\n");
+       if (statusFlags & (nsIEnigmail.BAD_PASSPHRASE | nsIEnigmail.UNVERIFIED_SIGNATURE)) {
+-        WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->2\n");
++        Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->2\n");
+         exitCode = 2;
+       } else {
+-        WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->0\n");
++        Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Changing exitCode 256->0\n");
+         exitCode = 0;
+       }
+     }
+@@ -1643,7 +1651,7 @@
+                                 nsIEnigmail.DECRYPTION_FAILED |
+                                 nsIEnigmail.NO_PUBKEY |
+                                 nsIEnigmail.NO_SECKEY)))) {
+-        WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg version "+this.agentVersion+", activating countermeasures for file renaming bug.\n");
++        Ec.WARNING_LOG("enigmail.js: Enigmail.fixExitCode: Using gpg version "+this.agentVersion+", activating countermeasures for file renaming bug.\n");
+         exitCode = 0;
+       }
+     }
+@@ -4773,7 +4781,7 @@
+   }
+   else if (keyEdit.doCheck(GET_LINE, "sign_uid.class" )) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.trustLevel;
++    ret.writeTxt = new String(inputData.trustLevel);
+   }
+   else if (keyEdit.doCheck(GET_HIDDEN, "passphrase.adminpin.ask")) {
+     GetPin(inputData.parent, Ec.getString("enterAdminPin"), ret);
+@@ -4798,7 +4806,7 @@
+ 
+   if (keyEdit.doCheck(GET_LINE, "edit_ownertrust.value" )) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.trustLevel;
++    ret.writeTxt = new String(inputData.trustLevel);
+   }
+   else if (keyEdit.doCheck(GET_BOOL, "edit_ownertrust.set_ultimate.okay")) {
+     ret.exitCode = 0;
+@@ -4883,7 +4891,7 @@
+ 
+   if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.reasonCode;
++    ret.writeTxt = new String(inputData.reasonCode);
+   }
+   else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) {
+     ret.exitCode = 0;
+@@ -4949,7 +4957,7 @@
+   }
+   else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.code" )) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.reasonCode;
++    ret.writeTxt = new String(inputData.reasonCode);
+   }
+   else if (keyEdit.doCheck(GET_LINE, "ask_revocation_reason.text" )) {
+     ret.exitCode = 0;
+@@ -5225,7 +5233,7 @@
+   else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.backup_enc") ||
+            keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.backup_enc")) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.backupKey;
++    ret.writeTxt = new String(inputData.backupKey);
+   }
+   else if (keyEdit.doCheck(GET_BOOL, "cardedit.genkeys.replace_keys")) {
+     ret.exitCode = 0;
+@@ -5243,7 +5251,7 @@
+   }
+   else if (keyEdit.doCheck(GET_LINE, "keygen.valid")) {
+     ret.exitCode = 0;
+-    ret.writeTxt = inputData.expiry;
++    ret.writeTxt = new String(inputData.expiry);
+   }
+   else if (keyEdit.doCheck(GET_LINE, "cardedit.genkeys.size")) {
+     ret.exitCode = 0;
+diff -urN enigmail/package/install.rdf enigmail-new/package/install.rdf
+--- enigmail/package/install.rdf	2011-06-25 11:04:12.000000000 -0500
++++ enigmail-new/package/install.rdf	2011-07-08 16:28:53.000000000 -0500
+@@ -16,15 +16,15 @@
+       <Description>
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>5.0b1</em:minVersion>
+-        <em:maxVersion>5.0.*</em:maxVersion>
++        <em:maxVersion>5.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>
+       <!-- Seamonkey -->
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+-        <em:minVersion>2.1a1pre</em:minVersion>
+-        <em:maxVersion>2.1.*</em:maxVersion>
++        <em:minVersion>2.2</em:minVersion>
++        <em:maxVersion>2.2.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <!-- em:targetApplication>
+diff -urN enigmail/ui/content/enigmailCommon.js enigmail-new/ui/content/enigmailCommon.js
+--- enigmail/ui/content/enigmailCommon.js	2011-01-31 07:26:33.000000000 -0600
++++ enigmail-new/ui/content/enigmailCommon.js	2011-07-02 10:56:03.000000000 -0500
+@@ -435,7 +435,7 @@
+ }
+ 
+ function EnigFormatFpr(fingerprint) {
+-  EnigmailFuncs.formatFpr(fingerprint);
++  return EnigmailFuncs.formatFpr(fingerprint);
+ }
+ 
+ /////////////////////////
+diff -urN enigmail/ui/content/enigmailMessengerOverlay.js enigmail-new/ui/content/enigmailMessengerOverlay.js
+--- enigmail/ui/content/enigmailMessengerOverlay.js	2011-05-24 16:18:41.000000000 -0500
++++ enigmail-new/ui/content/enigmailMessengerOverlay.js	2011-07-02 11:19:50.000000000 -0500
+@@ -1071,7 +1071,7 @@
+           }
+           if (foundIndex >= 0) {
+             // EnigmailCommon.DEBUG_LOG("enigmailMessengerOverlay.js: innerHTML='"+node.innerHTML+"'\n");
+-            node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailCommon.convertToUnicode(messageContent, "UTF-8"));
++            node.innerHTML = EnigmailFuncs.formatPlaintextMsg(EnigmailCommon.convertToUnicode(messageContent, charset));
+             return;
+           }
+         }
+diff -urN enigmail/ui/content/enigmailMsgHdrViewOverlay.js enigmail-new/ui/content/enigmailMsgHdrViewOverlay.js
+--- enigmail/ui/content/enigmailMsgHdrViewOverlay.js	2011-02-15 13:44:27.000000000 -0600
++++ enigmail-new/ui/content/enigmailMsgHdrViewOverlay.js	2011-07-02 11:40:56.000000000 -0500
+@@ -72,6 +72,7 @@
+       this.statusBar.removeAttribute("signed");
+       this.statusBar.removeAttribute("encrypted");
+       this.enigmailBox.setAttribute("collapsed", "true")
++      Enigmail.msg.setAttachmentReveal(null);
+     }
+     catch (ex) {}
+   },
diff --git a/www-client/seamonkey/seamonkey-2.2.ebuild b/www-client/seamonkey/seamonkey-2.2-r1.ebuild
index e81f89a84909..1f46a71c93fe 100644
--- a/www-client/seamonkey/seamonkey-2.2.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2.ebuild,v 1.2 2011/07/09 23:09:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r1.ebuild,v 1.1 2011/07/10 21:51:41 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -161,7 +161,7 @@ src_prepare() {
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.2-seamonkey-2.2-versionfix.patch
+		epatch "${FILESDIR}"/enigmail/enigmail-update.patch
 		./makemake -r 2&>/dev/null
 		sed -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' \
 			-i Makefile.in || die