summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2010-07-14 22:22:05 +0000
committerJory Pratt <anarchy@gentoo.org>2010-07-14 22:22:05 +0000
commitb2d75c738a13c0c98ca504a918a631fbd9df4e6c (patch)
treea95d8183392509cba880ddfaacaace710e304989 /x11-plugins/enigmail/files
parentBlock dependency on the enet version. (diff)
downloadgentoo-2-b2d75c738a13c0c98ca504a918a631fbd9df4e6c.tar.gz
gentoo-2-b2d75c738a13c0c98ca504a918a631fbd9df4e6c.tar.bz2
gentoo-2-b2d75c738a13c0c98ca504a918a631fbd9df4e6c.zip
Fix bug #327099, issue connecting to gpg-agent for some
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/enigmail/files')
-rw-r--r--x11-plugins/enigmail/files/75_enigmai-js-fixup.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
new file mode 100644
index 000000000000..8e85cfcc9a3f
--- /dev/null
+++ b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
@@ -0,0 +1,27 @@
+--- mailnews/extensions/enigmail/package/enigmail.js 2010-06-26 19:51:30.000000000 +0200
++++ mailnews/extensions/enigmail/package/enigmail.js 2010-07-10 17:34:46.000000000 +0200
+@@ -1231,7 +1231,10 @@ function () {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
+ agentProcess.init(extensionLoc);
+ agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
+@@ -1758,7 +1761,10 @@ function (domWindow) {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ args.unshift(command.path);
+ args.unshift("start");
+ command = extensionLoc;
+