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-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
@


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$
@