rpms/nss/devel nss-nolocalsql.patch, 1.5, 1.6 nss-stubs-bug502133.patch, 1.4, 1.5

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22854

Added Files:
	nss-nolocalsql.patch nss-stubs-bug502133.patch 
Log Message:
Restoring these two patches, although they nelong in nss-softokn we must still keep them and apply them here because we compile all sources

nss-nolocalsql.patch:
 Makefile                      |   10 +++++-----
 softoken/legacydb/manifest.mn |    6 +++---
 softoken/manifest.mn          |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: nss-nolocalsql.patch
===================================================================
RCS file: nss-nolocalsql.patch
diff -N nss-nolocalsql.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-nolocalsql.patch	31 Aug 2009 02:36:17 -0000	1.6
@@ -0,0 +1,52 @@
+diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
+--- ./mozilla/security/nss/lib/Makefile.nolocalsql	2007-07-19 23:36:49.000000000 +0200
++++ ./mozilla/security/nss/lib/Makefile	2009-04-14 17:07:40.000000000 +0200
+@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
+ DIRS := $(filter-out fortcrypt,$(DIRS))
+ endif
+ 
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-DIRS := sqlite $(DIRS)
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#DIRS := sqlite $(DIRS)
++#endif
++#endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-07-19 23:36:50.000000000 +0200
++++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ CSRCS = \
+ 	dbmshim.c \
+diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
+--- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2009-03-25 17:21:37.000000000 +0100
++++ ./mozilla/security/nss/lib/softoken/manifest.mn	2009-04-14 17:07:40.000000000 +0200
+@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
+ 
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+ 
+-ifdef MOZILLA_CLIENT
+-INCLUDES += -I$(DIST)/include/sqlite3
+-endif
++#ifdef MOZILLA_CLIENT
++#INCLUDES += -I$(DIST)/include/sqlite3
++#endif
+ 
+ EXPORTS = \
+ 	secmodt.h \

nss-stubs-bug502133.patch:
 stubs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: nss-stubs-bug502133.patch
===================================================================
RCS file: nss-stubs-bug502133.patch
diff -N nss-stubs-bug502133.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nss-stubs-bug502133.patch	31 Aug 2009 02:36:17 -0000	1.5
@@ -0,0 +1,23 @@
+diff -rupN nss-3.12.3.99.3-orig/mozilla/security/nss/lib/freebl/stubs.c nss-3.12.3.99.3/mozilla/security/nss/lib/freebl/stubs.c
+--- ./mozilla/security/nss/lib/freebl/stubs.c	2009-03-28 19:21:50.000000000 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.c	2009-06-08 20:37:20.000000000 -0700
+@@ -558,8 +558,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSPR(nspr);
+-	freebl_releaseLibrary(nspr);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nspr);
+ 	    return rv;
+ 	}
+     }
+@@ -570,8 +570,8 @@ FREEBL_InitStubs()
+ 	    return SECFailure;
+ 	}
+ 	rv = freebl_InitNSSUtil(nssutil);
+-	freebl_releaseLibrary(nssutil);
+ 	if (rv != SECSuccess) {
++	    freebl_releaseLibrary(nssutil);
+ 	    return rv;
+ 	}
+     }