diff options
Diffstat (limited to 'security/nss/files/patch-sysdb')
| -rw-r--r-- | security/nss/files/patch-sysdb | 97 |
1 files changed, 48 insertions, 49 deletions
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb index bbef0a77aeb2..1739e021484d 100644 --- a/security/nss/files/patch-sysdb +++ b/security/nss/files/patch-sysdb @@ -1,6 +1,6 @@ ---- lib/softoken/legacydb/cdbhdl.h.orig 2009-08-31 12:33:12.000000000 +0200 -+++ lib/softoken/legacydb/cdbhdl.h 2009-08-31 12:33:36.000000000 +0200 -@@ -43,7 +43,8 @@ +--- lib/softoken/legacydb/cdbhdl.h.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/cdbhdl.h +@@ -9,7 +9,8 @@ #define _CDBHDL_H_ #include "nspr.h" @@ -10,12 +10,11 @@ #include "pcertt.h" #include "prtypes.h" - ---- lib/softoken/legacydb/dbmshim.c.orig 2009-08-31 10:40:23.000000000 +0200 -+++ lib/softoken/legacydb/dbmshim.c 2009-08-31 10:40:35.000000000 +0200 -@@ -39,7 +39,8 @@ - * - * $Id: dbmshim.c,v 1.2 2007/06/13 00:24:57 rrelyea%redhat.com Exp $ +--- lib/softoken/legacydb/dbmshim.c.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/dbmshim.c +@@ -5,7 +5,8 @@ + /* + * Berkeley DB 1.85 Shim code to handle blobs. */ -#include "mcom_db.h" +#include <db.h> @@ -23,9 +22,9 @@ #include "secitem.h" #include "nssb64.h" #include "blapi.h" ---- lib/softoken/legacydb/keydb.c.orig 2009-08-31 10:40:04.000000000 +0200 -+++ lib/softoken/legacydb/keydb.c 2009-08-31 10:40:08.000000000 +0200 -@@ -43,7 +43,6 @@ +--- lib/softoken/legacydb/keydb.c.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/keydb.c +@@ -9,7 +9,6 @@ #include "blapi.h" #include "secitem.h" #include "pcert.h" @@ -33,9 +32,9 @@ #include "secerr.h" #include "keydbi.h" ---- lib/softoken/legacydb/keydbi.h.orig 2009-08-31 12:33:17.000000000 +0200 -+++ lib/softoken/legacydb/keydbi.h 2009-08-31 12:34:13.000000000 +0200 -@@ -43,5 +43,5 @@ +--- lib/softoken/legacydb/keydbi.h.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/keydbi.h +@@ -10,7 +10,7 @@ #include "nspr.h" #include "seccomon.h" @@ -44,9 +43,9 @@ /* * Handle structure for open key databases ---- lib/softoken/legacydb/pcertdb.c.orig 2009-08-31 10:40:52.000000000 +0200 -+++ lib/softoken/legacydb/pcertdb.c 2009-08-31 10:41:26.000000000 +0200 -@@ -41,7 +41,8 @@ +--- lib/softoken/legacydb/pcertdb.c.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/pcertdb.c +@@ -7,7 +7,8 @@ */ #include "lowkeyti.h" #include "pcert.h" @@ -56,21 +55,21 @@ #include "pcert.h" #include "secitem.h" #include "secder.h" ---- lib/softoken/legacydb/pk11db.c.orig 2009-08-31 10:40:57.000000000 +0200 -+++ lib/softoken/legacydb/pk11db.c 2009-08-31 10:41:55.000000000 +0200 -@@ -41,7 +41,8 @@ +--- lib/softoken/legacydb/pk11db.c.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/pk11db.c +@@ -8,7 +8,8 @@ + */ - #include "pk11pars.h" #include "lgdb.h" -#include "mcom_db.h" +#include <db.h> +#include <fcntl.h> #include "secerr.h" + #include "utilpars.h" - #define FREE_CLEAR(p) if (p) { PORT_Free(p); p = NULL; } ---- lib/ckfw/dbm/ckdbm.h.orig 2009-08-31 10:46:00.000000000 +0200 -+++ lib/ckfw/dbm/ckdbm.h 2009-08-31 10:46:22.000000000 +0200 -@@ -59,7 +59,7 @@ +--- lib/ckfw/dbm/ckdbm.h.orig 2018-08-31 12:55:53 UTC ++++ lib/ckfw/dbm/ckdbm.h +@@ -23,7 +23,7 @@ #include "ckt.h" #endif /* CKT_H */ @@ -79,9 +78,9 @@ NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance; ---- lib/softoken/legacydb/config.mk.orig 2009-08-31 12:39:49.000000000 +0200 -+++ lib/softoken/legacydb/config.mk 2009-08-31 12:40:03.000000000 +0200 -@@ -40,7 +40,6 @@ +--- lib/softoken/legacydb/config.mk.orig 2018-08-31 12:55:53 UTC ++++ lib/softoken/legacydb/config.mk +@@ -8,7 +8,6 @@ CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX EXTRA_LIBS += \ $(CRYPTOLIB) \ @@ -89,9 +88,9 @@ $(NULL) # can't do this in manifest.mn because OS_TARGET isn't defined there. ---- lib/certdb/xauthkid.c.orig 2009-08-31 12:43:13.000000000 +0200 -+++ lib/certdb/xauthkid.c 2009-08-31 12:44:21.000000000 +0200 -@@ -39,7 +39,7 @@ +--- lib/certdb/xauthkid.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xauthkid.c +@@ -7,7 +7,7 @@ * */ @@ -100,10 +99,10 @@ #include "seccomon.h" #include "secdert.h" #include "secoidt.h" ---- lib/certdb/xbsconst.c.orig 2009-08-31 12:43:22.000000000 +0200 -+++ lib/certdb/xbsconst.c 2009-08-31 12:44:41.000000000 +0200 -@@ -38,7 +38,7 @@ - * X.509 v3 Basic Constraints Extension +--- lib/certdb/xbsconst.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xbsconst.c +@@ -6,7 +6,7 @@ + * X.509 v3 Basic Constraints Extension */ -#include "prtypes.h" @@ -111,10 +110,10 @@ #include <limits.h> /* for LONG_MAX */ #include "seccomon.h" #include "secdert.h" ---- lib/certdb/xconst.c.orig 2009-08-31 12:43:46.000000000 +0200 -+++ lib/certdb/xconst.c 2009-08-31 12:44:50.000000000 +0200 -@@ -38,7 +38,7 @@ - * X.509 Extension Encoding +--- lib/certdb/xconst.c.orig 2018-08-31 12:55:53 UTC ++++ lib/certdb/xconst.c +@@ -6,7 +6,7 @@ + * X.509 Extension Encoding */ -#include "prtypes.h" @@ -122,20 +121,20 @@ #include "seccomon.h" #include "secdert.h" #include "secoidt.h" ---- lib/manifest.mn~ +--- lib/manifest.mn.orig 2018-08-31 12:55:53 UTC +++ lib/manifest.mn -@@ -20,7 +20,7 @@ DIRS = \ - $(UTIL_SRCDIR) \ +@@ -20,7 +20,7 @@ ifndef NSS_BUILD_UTIL_ONLY + SOFTOKEN_SRCDIRS = \ $(FREEBL_SRCDIR) \ $(SQLITE_SRCDIR) \ - $(DBM_SRCDIR) \ + $(NULL) \ $(SOFTOKEN_SRCDIR) \ - base dev pki \ - libpkix \ ---- cmd/platlibs.mk.orig 2009-08-31 12:57:13.000000000 +0200 -+++ cmd/platlibs.mk 2009-08-31 12:57:29.000000000 +0200 -@@ -85,7 +85,7 @@ + $(NULL) + ifndef NSS_BUILD_SOFTOKEN_ONLY +--- cmd/platlibs.mk.orig 2018-08-31 12:55:53 UTC ++++ cmd/platlibs.mk +@@ -29,7 +29,7 @@ endif # BUILD_SUN_PKG ifdef NSS_DISABLE_DBM DBMLIB = $(NULL) else @@ -143,4 +142,4 @@ +DBMLIB = $(NULL) endif - ifdef USE_STATIC_LIBS + ifeq ($(NSS_BUILD_UTIL_ONLY),1) |