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

Pull in the same fix as applied in firefox35, mozilla-thunderbird and

Browse Source 
seamonkey. Bump PKGNAMEs & SHARED_LIBS.
This commit is contained in:
landry 2009-11-18 08:44:51 +00:00
parent 5987c3a4f6
commit 5fbe1bc593
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
productivity/sunbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/11/10 20:48:06 landry Exp $
# $OpenBSD: Makefile,v 1.2 2009/11/18 08:44:51 landry Exp $
SHARED_ONLY = Yes
@ -7,8 +7,8 @@ COMMENT-lightning = Mozilla Thunderbird calendar extension
VER = 0.9
DISTNAME = lightning-sunbird-${VER}-source
PKGNAME-main = sunbird-${VER}
PKGNAME-lightning = lightning-${VER}
PKGNAME-main = sunbird-${VER}p0
PKGNAME-lightning = lightning-${VER}p0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = productivity mail
@ -16,7 +16,7 @@ CATEGORIES = productivity mail
MULTI_PACKAGES = -main -lightning
# need to be in synch with mail/mozilla-thunderbird for lighting to work
SO_VERSION = 13.0
SO_VERSION = 14.0
.for _lib in accessibility appcomps auth autoconfig calbasecomps caps chrome commandlines \
composer cookie docshell editor embedcomponents fileview gfx_gtk gfxps \

17
productivity/sunbird/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/18 08:44:51 landry 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