head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q2:1.1.0.4
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.2
	pkgsrc-2009Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.09.22.13.17.30;	author tnn;	state dead;
branches;
next	1.1;

1.1
date	2009.02.11.10.09.47;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Send firefox3 on it's way to the happy hunting ground.
@
text
@$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
@


1.1
log
@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
@
text
@d1 1
a1 1
$NetBSD$
@