summaryrefslogtreecommitdiff
path: root/mail/thunderbird10/patches/patch-am
diff options
context:
space:
mode:
Diffstat (limited to 'mail/thunderbird10/patches/patch-am')
-rw-r--r--mail/thunderbird10/patches/patch-am17
1 files changed, 17 insertions, 0 deletions
diff --git a/mail/thunderbird10/patches/patch-am b/mail/thunderbird10/patches/patch-am
new file mode 100644
index 00000000000..1e9fad81817
--- /dev/null
+++ b/mail/thunderbird10/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $
+
+SHA1_Update conflicts with openssl which may be dynamically loaded
+at runtime via libcups or libgssapi so causing a crash due to using
+the wrong binding. So rename here to avoid conflict.
+
+--- mozilla/security/nss/lib/freebl/blapi.h.orig 2012-02-16 10:25:24.000000000 +0000
++++ mozilla/security/nss/lib/freebl/blapi.h
+@@ -1038,6 +1038,8 @@ extern void SHA1_DestroyContext(SHA1Cont
+ */
+ extern void SHA1_Begin(SHA1Context *cx);
+
++#define SHA1_Update NSS_SHA1_Update
++
+ /*
+ ** Update the SHA-1 hash function with more data.
+ ** "cx" the context