mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00
Code Issues Releases Activity

- Update to 1.5rc3

Browse Source 
- Use system nss/nspr/libm [1]

Obtained from:	www/firefox [1]
Release notes:	http://www.mozilla.org/products/firefox/releases/1.5.html
This commit is contained in:
Michael Johnson 2005-11-18 03:35:16 +00:00
parent 86f2f99aa5
commit 23d336822d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=148699
18 changed files with 636 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/firefox-devel/Makefile
View File

@ -7,7 +7,7 @@
#
PORTNAME= firefox
DISTVERSION= 1.5rc2
DISTVERSION= 1.5rc3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -20,7 +20,9 @@ COMMENT= Web browser based on the browser portion of Mozilla
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/libXft
Xft.2:${PORTSDIR}/x11-fonts/libXft \
nspr4:${PORTSDIR}/devel/nspr \
nss3:${PORTSDIR}/security/nss
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS= Xvfb:${X_VFBSERVER_PORT}
@ -60,7 +62,7 @@ FIREFOX_ICON= ${FF}.xpm
FIREFOX_ICON_SRC= ${PREFIX}/lib/${FF}/icons/default.xpm
PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
firefox-nspr firefox-nss firefox-plugin
firefox-plugin
JPI_LIST?=\
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \

6
www/firefox-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (firefox-1.5rc2-source.tar.bz2) = 5e93802fe6f6b74bf98d9902cc5c30a3
SHA256 (firefox-1.5rc2-source.tar.bz2) = 1a44eca46fc3067068ec5f8ddcde08649e86a3afae3f49f743e646cfab4d71bf
SIZE (firefox-1.5rc2-source.tar.bz2) = 34469490
MD5 (firefox-1.5rc3-source.tar.bz2) = e93ff413b1cde002a104aeed9050f406
SHA256 (firefox-1.5rc3-source.tar.bz2) = 433586cc261d519a3f0e97a1dbacea8893a79ba037d97fcd3c70b94aa8316267
SIZE (firefox-1.5rc3-source.tar.bz2) = 34472303

2
www/firefox-devel/files/mozconfig.in
View File

@ -32,7 +32,7 @@ ac_add_options --x-libraries=@X11BASE@/lib
ac_add_options --with-system-jpeg=@LOCALBASE@
ac_add_options --with-system-zlib
ac_add_options --with-system-png=@LOCALBASE@
ac_add_options --without-system-nspr
ac_add_options --with-system-nspr
ac_add_options --with-gssapi=@KRB5_HOME@
######################################################################
# set compile/link features

25
www/firefox-devel/files/patch-libm Normal file
View File

@ -0,0 +1,25 @@
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
@@ -148,5 +148,4 @@
endif
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
JSMATH_PRELINK = jsmathtemp.o
JS_SAFE_ARENA = 1
@@ -320,7 +319,4 @@
endif
@$(RM) -f $(JSMATH_PRELINK)
-else
-# Create dependency so we build fdlibm
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
endif
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
#
-DIRS = src/fdlibm src
+DIRS = src
include $(topsrcdir)/config/rules.mk

24
www/firefox-devel/files/patch-nspr-unix.c
View File

@ -1,24 +0,0 @@
$FreeBSD$
$MCom: ports/www/firefox-devel/files/patch-nspr-unix.c,v 1.6 2005/07/14 05:25:44 ahze Exp $
--- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
@@ -65,7 +65,8 @@
* PRInt32* pointer to a _PRSockLen_t* pointer.
*/
#if defined(HAVE_SOCKLEN_T) \
- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
+ || defined(FREEBSD)
#define _PRSockLen_t socklen_t
#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
|| defined(AIX4_1) || defined(LINUX) || defined(SONY) \
@@ -73,7 +74,7 @@
|| defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
|| defined(NEXTSTEP) || defined(QNX)
#define _PRSockLen_t int
-#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
+#elif (defined(AIX) && !defined(AIX4_1)) \
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|| defined(DGUX) || defined(VMS) || defined(NTO)
#define _PRSockLen_t size_t

178
www/firefox-devel/files/patch-sysnss Normal file
View File

@ -0,0 +1,178 @@
--- Makefile.in Tue Sep 14 16:59:40 2004
+++ Makefile.in Tue Aug 2 08:26:55 2005
@@ -102,6 +102,4 @@
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
@@ -37,16 +37,7 @@
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
HAVE_FREEBL_MODULES \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
ifeq (,$(filter i86pc ia64,$(OS_TEST)))
@@ -132,9 +123,4 @@
.nss.cleaned: .nss.checkout
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
@@ -153,43 +139,4 @@
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-endif
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
-ifndef DISABLE_DIST_GRE
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
@@ -200,18 +147,4 @@
install::
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_MODULES
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -227,9 +160,4 @@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
echo-requires-recursive::
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
@@ -117,5 +117,5 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
$(NULL)
--- config/config.mk Tue Oct 12 00:11:11 2004
+++ config/config.mk Tue Aug 2 09:19:18 2005
@@ -170,5 +170,4 @@
NSS_LIBS = \
$(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-lsmime3 \
-lssl3 \
@@ -189,11 +188,5 @@
endif
-NSS_DEP_LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
- $(NULL)
+NSS_DEP_LIBS =
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
@@ -88,4 +88,8 @@
}
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -406,4 +410,5 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR
};
@@ -419,5 +424,5 @@
}
- char *fullModuleName = nsnull;
+ char *fullModuleName;
#ifdef XP_MAC
nsCAutoString nativePath;
@@ -431,4 +436,12 @@
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
#endif
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
+ if (errno != ENOENT)
+ perror(fullModuleName);
+ continue;
+ }
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);

8
www/firefox3-devel/Makefile
View File

@ -7,7 +7,7 @@
#
PORTNAME= firefox
DISTVERSION= 1.5rc2
DISTVERSION= 1.5rc3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -20,7 +20,9 @@ COMMENT= Web browser based on the browser portion of Mozilla
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/libXft
Xft.2:${PORTSDIR}/x11-fonts/libXft \
nspr4:${PORTSDIR}/devel/nspr \
nss3:${PORTSDIR}/security/nss
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS= Xvfb:${X_VFBSERVER_PORT}
@ -60,7 +62,7 @@ FIREFOX_ICON= ${FF}.xpm
FIREFOX_ICON_SRC= ${PREFIX}/lib/${FF}/icons/default.xpm
PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
firefox-nspr firefox-nss firefox-plugin
firefox-plugin
JPI_LIST?=\
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \

6
www/firefox3-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (firefox-1.5rc2-source.tar.bz2) = 5e93802fe6f6b74bf98d9902cc5c30a3
SHA256 (firefox-1.5rc2-source.tar.bz2) = 1a44eca46fc3067068ec5f8ddcde08649e86a3afae3f49f743e646cfab4d71bf
SIZE (firefox-1.5rc2-source.tar.bz2) = 34469490
MD5 (firefox-1.5rc3-source.tar.bz2) = e93ff413b1cde002a104aeed9050f406
SHA256 (firefox-1.5rc3-source.tar.bz2) = 433586cc261d519a3f0e97a1dbacea8893a79ba037d97fcd3c70b94aa8316267
SIZE (firefox-1.5rc3-source.tar.bz2) = 34472303

2
www/firefox3-devel/files/mozconfig.in
View File

@ -32,7 +32,7 @@ ac_add_options --x-libraries=@X11BASE@/lib
ac_add_options --with-system-jpeg=@LOCALBASE@
ac_add_options --with-system-zlib
ac_add_options --with-system-png=@LOCALBASE@
ac_add_options --without-system-nspr
ac_add_options --with-system-nspr
ac_add_options --with-gssapi=@KRB5_HOME@
######################################################################
# set compile/link features

25
www/firefox3-devel/files/patch-libm Normal file
View File

@ -0,0 +1,25 @@
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
@@ -148,5 +148,4 @@
endif
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
JSMATH_PRELINK = jsmathtemp.o
JS_SAFE_ARENA = 1
@@ -320,7 +319,4 @@
endif
@$(RM) -f $(JSMATH_PRELINK)
-else
-# Create dependency so we build fdlibm
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
endif
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
#
-DIRS = src/fdlibm src
+DIRS = src
include $(topsrcdir)/config/rules.mk

24
www/firefox3-devel/files/patch-nspr-unix.c
View File

@ -1,24 +0,0 @@
$FreeBSD$
$MCom: ports/www/firefox-devel/files/patch-nspr-unix.c,v 1.6 2005/07/14 05:25:44 ahze Exp $
--- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
@@ -65,7 +65,8 @@
* PRInt32* pointer to a _PRSockLen_t* pointer.
*/
#if defined(HAVE_SOCKLEN_T) \
- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
+ || defined(FREEBSD)
#define _PRSockLen_t socklen_t
#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
|| defined(AIX4_1) || defined(LINUX) || defined(SONY) \
@@ -73,7 +74,7 @@
|| defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
|| defined(NEXTSTEP) || defined(QNX)
#define _PRSockLen_t int
-#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
+#elif (defined(AIX) && !defined(AIX4_1)) \
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|| defined(DGUX) || defined(VMS) || defined(NTO)
#define _PRSockLen_t size_t

178
www/firefox3-devel/files/patch-sysnss Normal file
View File

@ -0,0 +1,178 @@
--- Makefile.in Tue Sep 14 16:59:40 2004
+++ Makefile.in Tue Aug 2 08:26:55 2005
@@ -102,6 +102,4 @@
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
@@ -37,16 +37,7 @@
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
HAVE_FREEBL_MODULES \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
ifeq (,$(filter i86pc ia64,$(OS_TEST)))
@@ -132,9 +123,4 @@
.nss.cleaned: .nss.checkout
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
@@ -153,43 +139,4 @@
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-endif
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
-ifndef DISABLE_DIST_GRE
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
@@ -200,18 +147,4 @@
install::
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_MODULES
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -227,9 +160,4 @@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
echo-requires-recursive::
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
@@ -117,5 +117,5 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
$(NULL)
--- config/config.mk Tue Oct 12 00:11:11 2004
+++ config/config.mk Tue Aug 2 09:19:18 2005
@@ -170,5 +170,4 @@
NSS_LIBS = \
$(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-lsmime3 \
-lssl3 \
@@ -189,11 +188,5 @@
endif
-NSS_DEP_LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
- $(NULL)
+NSS_DEP_LIBS =
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
@@ -88,4 +88,8 @@
}
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -406,4 +410,5 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR
};
@@ -419,5 +424,5 @@
}
- char *fullModuleName = nsnull;
+ char *fullModuleName;
#ifdef XP_MAC
nsCAutoString nativePath;
@@ -431,4 +436,12 @@
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
#endif
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
+ if (errno != ENOENT)
+ perror(fullModuleName);
+ continue;
+ }
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);

8
www/firefox35/Makefile
View File

@ -7,7 +7,7 @@
#
PORTNAME= firefox
DISTVERSION= 1.5rc2
DISTVERSION= 1.5rc3
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@ -20,7 +20,9 @@ COMMENT= Web browser based on the browser portion of Mozilla
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/libXft
Xft.2:${PORTSDIR}/x11-fonts/libXft \
nspr4:${PORTSDIR}/devel/nspr \
nss3:${PORTSDIR}/security/nss
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS= Xvfb:${X_VFBSERVER_PORT}
@ -60,7 +62,7 @@ FIREFOX_ICON= ${FF}.xpm
FIREFOX_ICON_SRC= ${PREFIX}/lib/${FF}/icons/default.xpm
PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
firefox-nspr firefox-nss firefox-plugin
firefox-plugin
JPI_LIST?=\
${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \

6
www/firefox35/distinfo
View File

@ -1,3 +1,3 @@
MD5 (firefox-1.5rc2-source.tar.bz2) = 5e93802fe6f6b74bf98d9902cc5c30a3
SHA256 (firefox-1.5rc2-source.tar.bz2) = 1a44eca46fc3067068ec5f8ddcde08649e86a3afae3f49f743e646cfab4d71bf
SIZE (firefox-1.5rc2-source.tar.bz2) = 34469490
MD5 (firefox-1.5rc3-source.tar.bz2) = e93ff413b1cde002a104aeed9050f406
SHA256 (firefox-1.5rc3-source.tar.bz2) = 433586cc261d519a3f0e97a1dbacea8893a79ba037d97fcd3c70b94aa8316267
SIZE (firefox-1.5rc3-source.tar.bz2) = 34472303

2
www/firefox35/files/mozconfig.in
View File

@ -32,7 +32,7 @@ ac_add_options --x-libraries=@X11BASE@/lib
ac_add_options --with-system-jpeg=@LOCALBASE@
ac_add_options --with-system-zlib
ac_add_options --with-system-png=@LOCALBASE@
ac_add_options --without-system-nspr
ac_add_options --with-system-nspr
ac_add_options --with-gssapi=@KRB5_HOME@
######################################################################
# set compile/link features

25
www/firefox35/files/patch-libm Normal file
View File

@ -0,0 +1,25 @@
--- js/src/Makefile.in Thu Aug 4 22:26:52 2005
+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
@@ -148,5 +148,4 @@
endif
-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
JSMATH_PRELINK = jsmathtemp.o
JS_SAFE_ARENA = 1
@@ -320,7 +319,4 @@
endif
@$(RM) -f $(JSMATH_PRELINK)
-else
-# Create dependency so we build fdlibm
-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
endif
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
#
-DIRS = src/fdlibm src
+DIRS = src
include $(topsrcdir)/config/rules.mk

24
www/firefox35/files/patch-nspr-unix.c
View File

@ -1,24 +0,0 @@
$FreeBSD$
$MCom: ports/www/firefox-devel/files/patch-nspr-unix.c,v 1.6 2005/07/14 05:25:44 ahze Exp $
--- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
@@ -65,7 +65,8 @@
* PRInt32* pointer to a _PRSockLen_t* pointer.
*/
#if defined(HAVE_SOCKLEN_T) \
- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
+ || defined(FREEBSD)
#define _PRSockLen_t socklen_t
#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
|| defined(AIX4_1) || defined(LINUX) || defined(SONY) \
@@ -73,7 +74,7 @@
|| defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
|| defined(NEXTSTEP) || defined(QNX)
#define _PRSockLen_t int
-#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
+#elif (defined(AIX) && !defined(AIX4_1)) \
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|| defined(DGUX) || defined(VMS) || defined(NTO)
#define _PRSockLen_t size_t

178
www/firefox35/files/patch-sysnss Normal file
View File

@ -0,0 +1,178 @@
--- Makefile.in Tue Sep 14 16:59:40 2004
+++ Makefile.in Tue Aug 2 08:26:55 2005
@@ -102,6 +102,4 @@
# tier 1 - 3rd party individual libraries
#
-tier_1_dirs += dbm
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
@@ -37,16 +37,7 @@
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
HAVE_FREEBL_MODULES \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
ifeq (,$(filter i86pc ia64,$(OS_TEST)))
@@ -132,9 +123,4 @@
.nss.cleaned: .nss.checkout
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
@@ -153,43 +139,4 @@
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-endif
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
-ifndef DISABLE_DIST_GRE
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_MODULES
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
@@ -200,18 +147,4 @@
install::
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_MODULES
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
-endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
@@ -227,9 +160,4 @@
endif
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
echo-requires-recursive::
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
@@ -117,5 +117,5 @@
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
$(NULL)
--- config/config.mk Tue Oct 12 00:11:11 2004
+++ config/config.mk Tue Aug 2 09:19:18 2005
@@ -170,5 +170,4 @@
NSS_LIBS = \
$(LIBS_DIR) \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-lsmime3 \
-lssl3 \
@@ -189,11 +188,5 @@
endif
-NSS_DEP_LIBS = \
- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
- $(NULL)
+NSS_DEP_LIBS =
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
@@ -88,4 +88,8 @@
}
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
@@ -406,4 +410,5 @@
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
NS_XPCOM_CURRENT_PROCESS_DIR
};
@@ -419,5 +424,5 @@
}
- char *fullModuleName = nsnull;
+ char *fullModuleName;
#ifdef XP_MAC
nsCAutoString nativePath;
@@ -431,4 +436,12 @@
fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
#endif
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
+ if (errno != ENOENT)
+ perror(fullModuleName);
+ continue;
+ }
/* If a module exists with the same name, delete it. */
NS_ConvertUCS2toUTF8 modNameUTF8(modName);