head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2012.03.10.14.57.31;	author ryoon;	state dead;
branches;
next	1.1;

1.1
date	2012.03.10.03.26.05;	author ryoon;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove necessary backups of the patches.
@
text
@$NetBSD: patch-an.orig,v 1.1 2012/03/10 03:26:05 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/sha-fast-amd64-sun.s.orig	2009-06-29 18:15:14.000000000 +0200
+++ mozilla/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
@Update to 2.7.2

* Many new features.
* Security bugfixes.
* See http://www.seamonkey-project.org/releases/seamonkey2.7/
@
text
@d1 1
a1 1
$NetBSD: patch-an,v 1.3 2010/03/16 10:59:10 tnn Exp $
@