|
[-]
[+]
|
Changed |
mozilla-nss.changes
|
|
|
|
[-]
[+]
|
Changed |
mozilla-nss.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
nss-amd64-comba.patch
^
|
| @@ -1,13 +0,0 @@
-Index: mozilla/security/nss/lib/freebl/Makefile
-===================================================================
---- mozilla.orig/security/nss/lib/freebl/Makefile 2007-06-19 19:46:15.000000000 +0200
-+++ mozilla/security/nss/lib/freebl/Makefile 2007-12-10 16:18:51.000000000 +0100
-@@ -130,7 +130,7 @@ ifeq ($(CPU_ARCH),x86_64)
- ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
- ASFLAGS += -march=opteron -m64 -fPIC
- DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
-- DEFINES += -DNSS_USE_COMBA
-+# DEFINES += -DNSS_USE_COMBA
- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
- # DEFINES += -DMPI_AMD64_ADD
- MPI_SRCS += mpi_amd64.c mp_comba.c
|
|
[-]
[+]
|
Added |
nss-no-rpath.patch
^
|
| @@ -0,0 +1,25 @@
+Index: security/nss/cmd/platlibs.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
+retrieving revision 1.55
+diff -u -p -6 -r1.55 platlibs.mk
+--- security/nss/cmd/platlibs.mk 12 Oct 2007 01:44:40 -0000 1.55
++++ security/nss/cmd/platlibs.mk 22 Jan 2008 09:18:05 -0000
+@@ -49,15 +49,15 @@ else
+ EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
+ endif
+ endif
+
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
+ endif
+ endif
+
+ ifeq ($(OS_ARCH), HP-UX)
+ ifeq ($(OS_TEST), ia64)
+ EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
|
|
[-]
[+]
|
Changed |
nss-opt.patch
^
|
| @@ -1,19 +1,23 @@
Index: security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
-retrieving revision 1.27.2.3
-diff -u -p -6 -r1.27.2.3 Linux.mk
---- security/coreconf/Linux.mk 25 Apr 2006 01:32:16 -0000 1.27.2.3
-+++ security/coreconf/Linux.mk 5 Dec 2007 15:55:35 -0000
-@@ -145,13 +145,13 @@ ifeq ($(OS_RELEASE),2.0)
+retrieving revision 1.31
+diff -u -p -6 -r1.31 Linux.mk
+--- security/coreconf/Linux.mk 22 Nov 2007 04:39:56 -0000 1.31
++++ security/coreconf/Linux.mk 22 Jan 2008 08:30:06 -0000
+@@ -145,17 +145,13 @@ ifeq ($(OS_RELEASE),2.0)
endif
PROCESS_MAP_FILE = grep -v ';-' $< | \
sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
endif
ifdef BUILD_OPT
-- OPTIMIZER = -O2
-+ OPTIMIZER = $(OPT_FLAGS)
+-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
+- OPTIMIZER = -Os
+-else
+- OPTIMIZER = -O2
+-endif
++ OPTIMIZER = $(OPT_FLAGS)
endif
ifeq ($(USE_PTHREADS),1)
|
|
[-]
[+]
|
Deleted |
nss-random.patch
^
|
| @@ -1,94 +0,0 @@
-From:
-Subject: some NSS issues regarding getting random data
- (like creating netstat zombies)
-References:
-https://bugzilla.mozilla.org/show_bug.cgi?id=51429
-
-Index: security/nss/lib/freebl/unix_rand.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/unix_rand.c,v
-retrieving revision 1.17.10.7
-diff -u -p -6 -r1.17.10.7 unix_rand.c
---- security/nss/lib/freebl/unix_rand.c 25 Jul 2007 23:18:55 -0000 1.17.10.7
-+++ security/nss/lib/freebl/unix_rand.c 3 Dec 2007 18:56:48 -0000
-@@ -863,13 +863,14 @@ safe_pclose(FILE *fp)
- /* yield the processor so the child gets some time to exit normally */
- PR_Sleep(PR_INTERVAL_NO_WAIT);
-
- /* if the child hasn't exited, kill it -- we're done with its output */
- while ((rv = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR)
- ;
-- if (rv == 0 && kill(pid, SIGKILL) == 0) {
-+ if (rv == 0) {
-+ kill(pid, SIGKILL);
- while ((rv = waitpid(pid, &status, 0)) == -1 && errno == EINTR)
- ;
- }
-
- /* Reset SIGCHLD signal hander before returning */
- sigaction(SIGCHLD, &oldact, NULL);
-@@ -918,21 +919,12 @@ void RNG_SystemInfoForRNG(void)
- "/var/tmp",
- "/usr/tmp",
- 0
- };
- #endif
-
--#ifdef DO_PS
--For now it is considered that it is too expensive to run the ps command
--for the small amount of entropy it provides.
--#if defined(__sun) && (!defined(__svr4) && !defined(SVR4)) || defined(bsdi) || defined(LINUX)
-- static char ps_cmd[] = "ps aux";
--#else
-- static char ps_cmd[] = "ps -el";
--#endif
--#endif /* DO_PS */
- #if defined(BSDI)
- static char netstat_ni_cmd[] = "netstat -nis";
- #else
- static char netstat_ni_cmd[] = "netstat -ni";
- #endif
-
-@@ -977,15 +969,19 @@ for the small amount of entropy it provi
-
- /*
- * Bug 100447: On BSD/OS 4.2 and 4.3, we have problem calling safe_popen
- * in a pthreads environment. Therefore, we call safe_popen last and on
- * BSD/OS we do not call safe_popen when we succeeded in getting data
- * from /dev/urandom.
-+ *
-+ * Bug 174993: On platforms providing /dev/urandom, don't fork netstat
-+ * either, if data has been gathered successfully
- */
-
--#ifdef BSDI
-+#if defined(BSDI) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(FREEBSD) || defined(DARWIN) || defined(LINUX)
- if (bytes)
- return;
- #endif
-
- #ifdef SOLARIS
-
-@@ -1007,21 +1003,12 @@ for the small amount of entropy it provi
- }
- bytes += kstat_bytes;
- PORT_Assert(bytes);
- }
- #endif
-
--#ifdef DO_PS
-- fp = safe_popen(ps_cmd);
-- if (fp != NULL) {
-- while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
-- RNG_RandomUpdate(buf, bytes);
-- safe_pclose(fp);
-- }
--#endif
--
- #ifdef DO_NETSTAT
- fp = safe_popen(netstat_ni_cmd);
- if (fp != NULL) {
- while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
- RNG_RandomUpdate(buf, bytes);
- safe_pclose(fp);
|
|
[-]
[+]
|
Added |
nss-sqlitename.patch
^
|
| @@ -0,0 +1,75 @@
+Index: security/nss/cmd/platlibs.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
+retrieving revision 1.55
+diff -u -p -6 -r1.55 platlibs.mk
+--- security/nss/cmd/platlibs.mk 12 Oct 2007 01:44:40 -0000 1.55
++++ security/nss/cmd/platlibs.mk 23 Jan 2008 08:25:42 -0000
+@@ -69,13 +69,17 @@ EXTRA_SHARED_LIBS += \
+ else
+ EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
+ endif
+ endif
+ endif
+
++ifdef NSS_USE_SYSTEM_SQLITE
+ SQLITE=-lsqlite3
++else
++SQLITE=-lnsssqlite3
++endif
+
+ ifdef USE_STATIC_LIBS
+
+ # can't do this in manifest.mn because OS_ARCH isn't defined there.
+ ifeq ($(OS_ARCH), WINNT)
+
+Index: security/nss/lib/sqlite/manifest.mn
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
+retrieving revision 1.3
+diff -u -p -6 -r1.3 manifest.mn
+--- security/nss/lib/sqlite/manifest.mn 15 Aug 2007 15:30:05 -0000 1.3
++++ security/nss/lib/sqlite/manifest.mn 23 Jan 2008 08:39:29 -0000
+@@ -35,15 +35,16 @@
+ #
+ # ***** END LICENSE BLOCK *****
+ CORE_DEPTH = ../../..
+
+ MODULE = nss
+
+-LIBRARY_NAME = sqlite
++LIBRARY_NAME = nsssqlite
+ LIBRARY_VERSION = 3
+ MAPFILE = $(OBJDIR)/sqlite.def
++MAPFILE_SOURCE = sqlite.def
+ DEFINES += -DTHREADSAFE=1
+
+ EXPORTS = \
+ $(NULL)
+
+ PRIVATE_EXPORTS = \
+Index: security/nss/lib/softoken/config.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
+retrieving revision 1.23
+diff -u -p -r1.23 config.mk
+--- security/nss/lib/softoken/config.mk 5 Feb 2008 05:33:37 -0000 1.23
++++ security/nss/lib/softoken/config.mk 19 Feb 2008 11:50:02 -0000
+@@ -86,12 +86,16 @@ else
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib \
+ -lnssutil3 \
+- -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+ -lplds4 \
+ -lnspr4 \
+ $(NULL)
++ifdef NSS_USE_SYSTEM_SQLITE
++EXTRA_SHARED_LIBS += -lsqlite3
++else
++EXTRA_SHARED_LIBS += -lnsssqlite3
++endif
+ endif
+
+ ifeq ($(OS_TARGET),AIX)
|
|
[-]
[+]
|
Deleted |
uninit.patch
^
|
| @@ -1,51 +0,0 @@
-Index: security/nss/cmd/fipstest/fipstest.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/fipstest/fipstest.c,v
-retrieving revision 1.3.2.21
-diff -u -p -r1.3.2.21 fipstest.c
---- security/nss/cmd/fipstest/fipstest.c 25 Mar 2006 23:47:58 -0000 1.3.2.21
-+++ security/nss/cmd/fipstest/fipstest.c 28 Jul 2006 05:09:07 -0000
-@@ -2916,8 +2916,8 @@ void sha_test(char *reqfn)
- unsigned char seed[HASH_LENGTH_MAX]; /* max size of seed 64 bytes */
- unsigned char MD[HASH_LENGTH_MAX]; /* message digest */
-
-- FILE *req; /* input stream from the REQUEST file */
-- FILE *resp; /* output stream to the RESPONSE file */
-+ FILE *req = NULL; /* input stream from the REQUEST file */
-+ FILE *resp; /* output stream to the RESPONSE file */
-
- buf = PORT_ZAlloc(bufSize);
- if (buf == NULL) {
-@@ -3013,7 +3013,9 @@ void sha_test(char *reqfn)
- }
- }
- loser:
-- fclose(req);
-+ if (req) {
-+ fclose(req);
-+ }
- if (buf) {
- PORT_ZFree(buf, bufSize);
- }
-@@ -3088,8 +3090,8 @@ void hmac_test(char *reqfn)
- unsigned char HMAC[HASH_LENGTH_MAX]; /* computed HMAC */
- HASH_HashType hash_alg; /* HMAC type */
-
-- FILE *req; /* input stream from the REQUEST file */
-- FILE *resp; /* output stream to the RESPONSE file */
-+ FILE *req = NULL; /* input stream from the REQUEST file */
-+ FILE *resp; /* output stream to the RESPONSE file */
-
- buf = PORT_ZAlloc(bufSize);
- if (buf == NULL) {
-@@ -3201,7 +3203,9 @@ void hmac_test(char *reqfn)
- }
- }
- loser:
-- fclose(req);
-+ if (req) {
-+ fclose(req);
-+ }
- if (buf) {
- PORT_ZFree(buf, bufSize);
- }
|
|
[-]
[+]
|
Added |
baselibs.conf
^
|
| @@ -0,0 +1 @@
+mozilla-nss
|
|
|
Changed |
nss-3.12.0.tar.bz2
^
|
|
[-]
[+]
|
Changed |
nss-config.in
^
|
| @@ -33,6 +33,7 @@
lib_ssl=yes
lib_smime=yes
lib_nss=yes
+lib_nssutil=yes
while test $# -gt 0; do
case "$1" in
@@ -83,6 +84,9 @@
nss)
lib_nss=yes
;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
*)
usage 1 1>&2
;;
@@ -132,6 +136,9 @@
if test -n "$lib_nss"; then
libdirs="$libdirs -lnss${major_version}"
fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
echo $libdirs
fi
|
|
[-]
[+]
|
Changed |
nss.pc.in
^
|
| @@ -6,6 +6,6 @@
Name: NSS
Description: Network Security Services
Version: %VERSION%
-Requires: nspr >= 4.7.0
-Libs: -Wl,-rpath-link,${libdir} -L${libdir} -lssl3 -lsmime3 -lnss3
+Requires: nspr >= 4.7.1
+Libs: -Wl,-rpath-link,${libdir} -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
Cflags: -I${includedir}
|
