cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Thunderbird bundles its own libnss3, so use same workaround as for

Browse Source 
security/nss:
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.

ok jasper@ sthen@
This commit is contained in:
ajacoutot 2009-11-17 23:08:12 +00:00
parent 6815706205
commit b0bbc8ee65
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.85 2009/08/21 16:40:42 martynas Exp $
# $OpenBSD: Makefile,v 1.86 2009/11/17 23:08:12 ajacoutot Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -7,8 +7,8 @@ COMMENT= redesign of Mozilla's mail component
VER= 2.0.0.23
DISTNAME= mozilla
PKGNAME= mozilla-thunderbird-${VER}
SO_VERSION= 13.0
PKGNAME= mozilla-thunderbird-${VER}p0
SO_VERSION= 14.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues. Whenever PKGNAME gets
# bumped and/or SO_VERSION changes, remember to update enigmail's

17
mail/mozilla-thunderbird/patches/patch-security_nss_lib_freebl_blapi_h Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2009/11/17 23:08:12 ajacoutot 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 Mon Nov 16 13:56:20 2009
+++ security/nss/lib/freebl/blapi.h Mon Nov 16 13:56:34 2009
@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
*/
extern void SHA1_Begin(SHA1Context *cx);
+#define SHA1_Update NSS_SHA1_Update
+
/*
** Update the SHA-1 hash function with more data.
** "cx" the context