diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-05-20 10:01:55 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-05-20 10:01:55 +0000 |
| commit | 7dde1715ae5dc5f15b4fc1c1c9489f7e4caff23f (patch) | |
| tree | b86dddae05eb7e96f94ca64acdda0ea1771cd03b /security/nss/files/sqlite3-builtin.patch | |
| parent | The massXpert project aims at providing (bio)chemists with a software (diff) | |
A bunch of changes for the SQLITE3 backend:
1) fix for bug #528467 (C_UnwrapKey didn't work with DSA and EC private keys)
2) fix for bug #526231 (C_GetAttributeValue didn't correctly work)
3) partial fix for bug #564011 (object ID race on keypairgen)
4) use sqlite3 in ports (there is no reason to compile the bundled one)
Approved by: no objections by marcus and gnome team
Notes
Notes:
svn path=/head/; revision=254639
Diffstat (limited to 'security/nss/files/sqlite3-builtin.patch')
| -rw-r--r-- | security/nss/files/sqlite3-builtin.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/security/nss/files/sqlite3-builtin.patch b/security/nss/files/sqlite3-builtin.patch deleted file mode 100644 index 80a65db348c8..000000000000 --- a/security/nss/files/sqlite3-builtin.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- cmd/platlibs.mk.orig 2009-08-31 17:56:52.000000000 +0200 -+++ cmd/platlibs.mk 2009-08-31 17:53:35.000000000 +0200 -@@ -80,7 +80,7 @@ - endif - endif - --SQLITE=-lsqlite3 -+SQLITE=-lnsssqlite3 - - ifdef NSS_DISABLE_DBM - DBMLIB = $(NULL) -@@ -129,7 +129,7 @@ - $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ - $(PKIXLIB) \ - $(DBMLIB) \ -- $(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \ -+ $(DIST)/lib/$(LIB_PREFIX)nsssqlite3.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ---- lib/sqlite/manifest.mn.orig 2010-01-09 06:04:37.000000000 +0100 -+++ lib/sqlite/manifest.mn 2010-03-28 22:52:27.000000000 +0200 -@@ -38,9 +38,9 @@ - - MODULE = nss - --LIBRARY_NAME = sqlite -+LIBRARY_NAME = nsssqlite - LIBRARY_VERSION = 3 --MAPFILE = $(OBJDIR)/sqlite.def -+MAPFILE = $(OBJDIR)/nsssqlite.def - DEFINES += -DSQLITE_THREADSAFE=1 - - EXPORTS = \ ---- lib/softoken/config.mk.orig 2009-08-31 17:55:03.000000000 +0200 -+++ lib/softoken/config.mk 2009-08-31 17:55:15.000000000 +0200 -@@ -57,7 +57,7 @@ - -L$(DIST)/lib \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ -- -lsqlite3 \ -+ -lnsssqlite3 \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ -@@ -66,7 +66,7 @@ - else # ! NS_USE_GCC - - EXTRA_SHARED_LIBS += \ -- $(DIST)/lib/sqlite3.lib \ -+ $(DIST)/lib/nsssqlite3.lib \ - $(DIST)/lib/nssutil3.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ -@@ -83,7 +83,7 @@ - -L$(DIST)/lib \ - -L$(NSSUTIL_LIB_DIR) \ - -lnssutil3 \ -- -lsqlite3 \ -+ -lnsssqlite3 \ - -L$(NSPR_LIB_DIR) \ - -lplc4 \ - -lplds4 \ |