From c5e74f99f543e7a92f020b2a6262feaa830f37c3 Mon Sep 17 00:00:00 2001 From: martynas Date: Sun, 21 Jun 2009 18:42:15 +0000 Subject: [PATCH] register nspr&nss; regen plist let nspr&nss find external sqlite3 RAND_DEV = /dev/arandom --disable-jit --- www/firefox35/Makefile | 16 ++++++----- .../patch-security_coreconf_OpenBSD_mk | 11 +++++--- .../patch-security_nss_cmd_platlibs_mk | 15 +++++++++++ .../patch-security_nss_lib_softoken_config_mk | 27 +++++++++++++++++++ www/firefox35/pkg/PLIST | 13 ++++++++- 5 files changed, 71 insertions(+), 11 deletions(-) create mode 100644 www/firefox35/patches/patch-security_nss_cmd_platlibs_mk create mode 100644 www/firefox35/patches/patch-security_nss_lib_softoken_config_mk diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index c323d62b319..82e2293dbfc 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2009/06/21 18:17:11 martynas Exp $ +# $OpenBSD: Makefile,v 1.6 2009/06/21 18:42:15 martynas Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 @@ -15,12 +15,13 @@ SO_VERSION= 21.0 browserdirprovider caps chardet chrome commandlines composer \ cookie docshell embedcomponents fileview gkgfxthebes gklayout \ gkplugin htmlpars i18n imgicon imglib2 intlapp jar50 jsd \ - mozfind mozjs necko nsappshell oji permissions pipboot \ - pipnss pippki places pref rdf remoteservice satchel \ - spellchecker storagecomps system-pref tkautocomplete \ - toolkitcomps txmgr uconv ucvmath universalchardet unixproxy \ - webbrwsr widget_gtk2 windowds xpconnect xpinstall zipwriter \ - gfxpsshar gkgfx gtkxtbin jsj thebes xpcom xpcom_core xul \ + mozfind necko nsappshell oji permissions pipboot pipnss \ + pippki places pref rdf remoteservice satchel spellchecker \ + storagecomps system-pref tkautocomplete toolkitcomps txmgr \ + uconv ucvmath universalchardet unixproxy webbrwsr widget_gtk2 \ + windowds xpconnect xpinstall zipwriter freebl3 gfxpsshar \ + gkgfx gtkxtbin jsj mozjs nspr4 nss3 nssckbi nssdbm3 nssutil3 \ + plc4 plds4 smime3 softokn3 ssl3 thebes xpcom xpcom_core xul \ nullplugin unixprintplugin SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor @@ -85,6 +86,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \ --disable-gnomeui \ --disable-gnomevfs \ --disable-dbus \ + --disable-jit \ --enable-xinerama \ --enable-svg \ --enable-svg-renderer=cairo \ diff --git a/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk b/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk index 4a7978df02d..f2c9fff6494 100644 --- a/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk +++ b/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2009/06/21 15:04:16 martynas Exp $ +$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2009/06/21 18:42:15 martynas Exp $ --- security/coreconf/OpenBSD.mk.orig Wed Jun 17 07:22:08 2009 -+++ security/coreconf/OpenBSD.mk Sun Jun 21 17:57:58 2009 ++++ security/coreconf/OpenBSD.mk Sun Jun 21 21:35:54 2009 @@ -56,7 +56,7 @@ OS_LIBS += -pthread DSO_LDOPTS += -pthread endif @@ -10,7 +10,12 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2009/06/21 15:04:16 martynas OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD -@@ -68,7 +68,7 @@ DSO_CFLAGS = -fPIC -DPIC +@@ -64,11 +64,11 @@ OS_LIBS = + + ARCH = openbsd + +-DSO_CFLAGS = -fPIC -DPIC ++DSO_CFLAGS = -I${LOCALBASE}/include -DRAND_DEV=\"/dev/arandom\" -fPIC -DPIC DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) DSO_LDFLAGS = diff --git a/www/firefox35/patches/patch-security_nss_cmd_platlibs_mk b/www/firefox35/patches/patch-security_nss_cmd_platlibs_mk new file mode 100644 index 00000000000..e2b7476ba17 --- /dev/null +++ b/www/firefox35/patches/patch-security_nss_cmd_platlibs_mk @@ -0,0 +1,15 @@ +$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1 2009/06/21 18:42:15 martynas Exp $ +--- security/nss/cmd/platlibs.mk.orig Sun Jun 21 21:34:18 2009 ++++ security/nss/cmd/platlibs.mk Sun Jun 21 21:34:45 2009 +@@ -201,9 +201,10 @@ endif + # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. + EXTRA_SHARED_LIBS += \ + -L$(DIST)/lib \ ++ -L$(NSPR_LIB_DIR) \ ++ -L$(LOCALBASE)/lib \ + $(SQLITE) \ + -lnssutil3 \ +- -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ diff --git a/www/firefox35/patches/patch-security_nss_lib_softoken_config_mk b/www/firefox35/patches/patch-security_nss_lib_softoken_config_mk new file mode 100644 index 00000000000..68c28cb2851 --- /dev/null +++ b/www/firefox35/patches/patch-security_nss_lib_softoken_config_mk @@ -0,0 +1,27 @@ +$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1 2009/06/21 18:42:15 martynas Exp $ +--- security/nss/lib/softoken/config.mk.orig Wed Jun 17 07:22:11 2009 ++++ security/nss/lib/softoken/config.mk Sun Jun 21 21:33:37 2009 +@@ -60,9 +60,10 @@ RESNAME = $(LIBRARY_NAME).rc + ifdef NS_USE_GCC + EXTRA_SHARED_LIBS += \ + -L$(DIST)/lib \ ++ -L$(NSPR_LIB_DIR) \ ++ -L$(LOCALBASE)/lib \ + -lnssutil3 \ + -lsqlite3 \ +- -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ +@@ -85,9 +86,10 @@ else + # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. + EXTRA_SHARED_LIBS += \ + -L$(DIST)/lib \ ++ -L$(NSPR_LIB_DIR) \ ++ -L$(LOCALBASE)/lib \ + -lnssutil3 \ + -lsqlite3 \ +- -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ diff --git a/www/firefox35/pkg/PLIST b/www/firefox35/pkg/PLIST index 4fbe435ff4a..5a522d52647 100644 --- a/www/firefox35/pkg/PLIST +++ b/www/firefox35/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/06/21 14:28:14 martynas Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/06/21 18:42:15 martynas Exp $ bin/firefox bin/mozilla-firefox @man man/man1/firefox.1 @@ -310,11 +310,22 @@ mozilla-firefox/icons/document.png mozilla-firefox/icons/mozicon128.png mozilla-firefox/icons/mozicon16.xpm mozilla-firefox/icons/mozicon50.xpm +@lib mozilla-firefox/libfreebl3.so.${LIBfreebl3_VERSION} @lib mozilla-firefox/libgfxpsshar.so.${LIBgfxpsshar_VERSION} @lib mozilla-firefox/libgkgfx.so.${LIBgkgfx_VERSION} @lib mozilla-firefox/libgtkxtbin.so.${LIBgtkxtbin_VERSION} @lib mozilla-firefox/libjsj.so.${LIBjsj_VERSION} @lib mozilla-firefox/libmozjs.so.${LIBmozjs_VERSION} +@lib mozilla-firefox/libnspr4.so.${LIBnspr4_VERSION} +@lib mozilla-firefox/libnss3.so.${LIBnss3_VERSION} +@lib mozilla-firefox/libnssckbi.so.${LIBnssckbi_VERSION} +@lib mozilla-firefox/libnssdbm3.so.${LIBnssdbm3_VERSION} +@lib mozilla-firefox/libnssutil3.so.${LIBnssutil3_VERSION} +@lib mozilla-firefox/libplc4.so.${LIBplc4_VERSION} +@lib mozilla-firefox/libplds4.so.${LIBplds4_VERSION} +@lib mozilla-firefox/libsmime3.so.${LIBsmime3_VERSION} +@lib mozilla-firefox/libsoftokn3.so.${LIBsoftokn3_VERSION} +@lib mozilla-firefox/libssl3.so.${LIBssl3_VERSION} @lib mozilla-firefox/libthebes.so.${LIBthebes_VERSION} @lib mozilla-firefox/libxpcom.so.${LIBxpcom_VERSION} @lib mozilla-firefox/libxpcom_core.so.${LIBxpcom_core_VERSION}