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-am.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/blapi.h.orig	2009-06-29 18:15:13.000000000 +0200
+++ mozilla/security/nss/lib/freebl/blapi.h
@@@@ -925,6 +925,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
@


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-am,v 1.1 2010/03/16 10:59:10 tnn Exp $
@