summaryrefslogtreecommitdiff
path: root/devel/nss/patches/patch-am
diff options
context:
space:
mode:
Diffstat (limited to 'devel/nss/patches/patch-am')
-rw-r--r--devel/nss/patches/patch-am6
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/nss/patches/patch-am b/devel/nss/patches/patch-am
index 88ad392b165..e88279c3098 100644
--- a/devel/nss/patches/patch-am
+++ b/devel/nss/patches/patch-am
@@ -1,11 +1,11 @@
-$NetBSD: patch-am,v 1.3 2012/04/18 21:01:42 ryoon Exp $
+$NetBSD: patch-am,v 1.4 2013/07/20 09:28:11 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.
---- security/nss/lib/freebl/blapi.h.orig 2009-06-29 18:15:13.000000000 +0200
-+++ security/nss/lib/freebl/blapi.h
+--- nss/lib/freebl/blapi.h.orig 2009-06-29 18:15:13.000000000 +0200
++++ nss/lib/freebl/blapi.h
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Cont
*/
extern void SHA1_Begin(SHA1Context *cx);