From 224f5fbb968dc98e01f8c702db289136340f9e49 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 18 Nov 2009 08:59:00 +0000 Subject: [PATCH] Actually, only firefox35 bundles its own nss for some reason, so revert previous. No pkg change, no bump. --- .../patch-security_nss_lib_freebl_blapi_h | 17 ----------------- .../patch-security_nss_lib_freebl_blapi_h | 17 ----------------- 2 files changed, 34 deletions(-) delete mode 100644 mail/mozilla-thunderbird/patches/patch-security_nss_lib_freebl_blapi_h delete mode 100644 www/seamonkey/patches/patch-security_nss_lib_freebl_blapi_h diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_freebl_blapi_h b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_freebl_blapi_h deleted file mode 100644 index b140d29f6b7..00000000000 --- a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_freebl_blapi_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2009/11/17 23:08:12 ajacoutot 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. - ---- security/nss/lib/freebl/blapi.h.orig Mon Nov 16 13:56:20 2009 -+++ security/nss/lib/freebl/blapi.h Mon Nov 16 13:56:34 2009 -@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo - */ - extern void SHA1_Begin(SHA1Context *cx); - -+#define SHA1_Update NSS_SHA1_Update -+ - /* - ** Update the SHA-1 hash function with more data. - ** "cx" the context diff --git a/www/seamonkey/patches/patch-security_nss_lib_freebl_blapi_h b/www/seamonkey/patches/patch-security_nss_lib_freebl_blapi_h deleted file mode 100644 index 2f14b9c0abc..00000000000 --- a/www/seamonkey/patches/patch-security_nss_lib_freebl_blapi_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2009/11/17 23:07:45 ajacoutot 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. - ---- security/nss/lib/freebl/blapi.h.orig Mon Nov 16 14:01:55 2009 -+++ security/nss/lib/freebl/blapi.h Mon Nov 16 14:02:09 2009 -@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo - */ - extern void SHA1_Begin(SHA1Context *cx); - -+#define SHA1_Update NSS_SHA1_Update -+ - /* - ** Update the SHA-1 hash function with more data. - ** "cx" the context