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.  Rename here to avoid conflict.

Patch from Yorick Hardy.  Fixes the crashes that had been seen when
trying to print that had previously been worked around by stopping
cups calling the routine.  Also fixes PR pkg/39863

4 files changed, 70 insertions, 2 deletions

diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile
index a02706f56c2..3ba240b6a3f 100644
--- a/www/firefox3/Makefile
+++ b/www/firefox3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/02/05 21:22:06 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2009/02/11 10:09:47 markd Exp $
 
 MOZILLA=		firefox3	# allow coexisting with firefox2
+PKGREVISION=		1
 COMMENT=		Lightweight gecko-based web browser
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo
index e04290c4b7c..b05589d9fa9 100644
--- a/www/firefox3/distinfo
+++ b/www/firefox3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/02/05 21:22:06 tnn Exp $
+$NetBSD: distinfo,v 1.16 2009/02/11 10:09:47 markd Exp $
 
 SHA1 (firefox-3.0.6-source.tar.bz2) = e2845c07b507308664f6f39086a050b2773382fb
 RMD160 (firefox-3.0.6-source.tar.bz2) = 89621d5c2e02f359a2552b714685b78cbdfbbf0e
@@ -41,6 +41,8 @@ SHA1 (patch-ei) = 4484d57e19e39ef86760716d5886ebf2a3e69f63
 SHA1 (patch-ej) = 9b9c708483399fa89c6bf5bdc15e79b31793c89d
 SHA1 (patch-ek) = b94debcf16ba6f0dccc0a812b5e5fa38a150c413
 SHA1 (patch-el) = 8a1586e4ebb76f584dc7b1cbc19f0c389ea206f7
+SHA1 (patch-em) = 6b8b470fc78a4a56400e77af1057b9266634dcc9
+SHA1 (patch-en) = 39926ce5669119c358e8600e2d70d08236e67443
 SHA1 (patch-wc) = 2de8665ed6c23c26566ca6d50165c0cf413a753d
 SHA1 (patch-wd) = fc5c3103ae6f2a2eccc01911a8207f3ca614008b
 SHA1 (patch-we) = f7fecce05454e9794ff7a4e7789031a5ef49c42d
diff --git a/www/firefox3/patches/patch-em b/www/firefox3/patches/patch-em
new file mode 100644
index 00000000000..25de86513cb
--- /dev/null
+++ b/www/firefox3/patches/patch-em
@@ -0,0 +1,17 @@
+$NetBSD: patch-em,v 1.1 2009/02/11 10:09:47 markd 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	2007-11-10 07:49:32.000000000 +1300
++++ security/nss/lib/freebl/blapi.h
+@@ -899,6 +899,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
diff --git a/www/firefox3/patches/patch-en b/www/firefox3/patches/patch-en
new file mode 100644
index 00000000000..e36656adc6c
--- /dev/null
+++ b/www/firefox3/patches/patch-en
@@ -0,0 +1,48 @@
+$NetBSD: patch-en,v 1.1 2009/02/11 10:09:47 markd 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/sha-fast-amd64-sun.s.orig	2007-10-12 14:44:43.000000000 +1300
++++ security/nss/lib/freebl/sha-fast-amd64-sun.s
+@@ -1712,9 +1712,9 @@ shaCompress:
+ .LFE7:
+ 	.size	shaCompress, .-shaCompress
+ 	.align 16
+-.globl SHA1_Update
+-	.type	SHA1_Update, @function
+-SHA1_Update:
++.globl NSS_SHA1_Update
++	.type	NSS_SHA1_Update, @function
++NSS_SHA1_Update:
+ .LFB5:
+ 	pushq	%rbp
+ .LCFI5:
+@@ -1800,7 +1800,7 @@ SHA1_Update:
+ 	call	shaCompress
+ 	jmp	.L245
+ .LFE5:
+-	.size	SHA1_Update, .-SHA1_Update
++	.size	NSS_SHA1_Update, .-NSS_SHA1_Update
+ 	.section	.rodata
+ 	.align 32
+ 	.type	bulk_pad.0, @object
+@@ -1902,7 +1902,7 @@ SHA1_End:
+ 	subl	%r8d, %edx
+ 	andl	$63, %edx
+ 	incl	%edx
+-	call	SHA1_Update@PLT
++	call	NSS_SHA1_Update@PLT
+ 	movq	%rbx, %rdi
+ 	movq	%r12, %rsi
+ 	shrq	$32, %rdi
+@@ -2018,7 +2018,7 @@ SHA1_HashBuf:
+ 	movl	%r12d, %edx
+ 	movq	%r13, %rsi
+ 	movq	%rbx, %rdi
+-	call	SHA1_Update@PLT
++	call	NSS_SHA1_Update@PLT
+ 	leaq	-292(%rbp), %rdx
+ 	movq	%r14, %rsi
+ 	movq	%rbx, %rdi