From 696479cc950c19ff21b7dd1e2f74defe5be10f16 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Fri, 4 Sep 2009 17:33:58 +0000 Subject: [PATCH] Not needed once we upd --- nss-nolocalsql.patch | 52 --------------------------------------- nss-stubs-bug502133.patch | 23 ----------------- 2 files changed, 75 deletions(-) delete mode 100644 nss-nolocalsql.patch delete mode 100644 nss-stubs-bug502133.patch diff --git a/nss-nolocalsql.patch b/nss-nolocalsql.patch deleted file mode 100644 index 21101fa..0000000 --- a/nss-nolocalsql.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 \ diff --git a/nss-stubs-bug502133.patch b/nss-stubs-bug502133.patch deleted file mode 100644 index a0f1503..0000000 --- a/nss-stubs-bug502133.patch +++ /dev/null @@ -1,23 +0,0 @@ -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; - } - }