Date: Mon, 31 Aug 2009 19:22:50 GMT From: Aragon Gouveia <aragon@phat.za.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/138419: [patch] security/nss version upgrade Message-ID: <200908311922.n7VJMoa8030111@www.freebsd.org> Resent-Message-ID: <200908311930.n7VJU6eY079268@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138419
>Category: ports
>Synopsis: [patch] security/nss version upgrade
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 31 19:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Aragon Gouveia
>Release: 8.0-BETA3
>Organization:
>Environment:
FreeBSD igor.geek.sh 8.0-BETA3 FreeBSD 8.0-BETA3 #0: Fri Aug 28 06:14:52 SAST 2009 root@igor.geek.sh:/usr/obj/usr/src/sys/IGOR amd64
>Description:
Our version of NSS is getting pretty old now, and I know Ben Laurie is trying to port Chromium to BSD and hitting problems with our old NSS.
Please find attached patch which brings it up to the latest version, 3.12.4. I've personally tested this with pidgin and thunderbird linked against NSS, but only on AMD64. I think more testing is needed.
Thanks!
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN nss.orig/Makefile nss/Makefile
--- nss.orig/Makefile 2009-08-17 19:18:30.000000000 +0200
+++ nss/Makefile 2009-08-31 21:05:37.000000000 +0200
@@ -7,7 +7,6 @@
PORTNAME= nss
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -19,8 +18,10 @@
LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr
_MAJOR= 3
-_MINOR= 11
-_PATCH= 9
+_MINOR= 12
+_PATCH= 4
+
+OPTIONS= SYSSQLITE3 "Use system SQLite3 (slower)" Off
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
@@ -37,6 +38,16 @@
.include <bsd.port.pre.mk>
+.if defined(WITH_SYSSQLITE3)
+LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
+EXTRA_PATCHES+= ${FILESDIR}/sqlite3-system.patch
+MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1
+PLIST_SUB+= SYSSQLITE3="@comment "
+.else
+EXTRA_PATCHES+= ${FILESDIR}/sqlite3-builtin.patch
+PLIST_SUB+= SYSSQLITE3=""
+.endif
+
EXTERNALS= CVS dbm security/nss/cmd/zlib nsprpub security/dbm
EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
@@ -74,6 +85,12 @@
.for i in MAJOR MINOR PATCH
@${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config
.endfor
+ @cd ${WRKSRC} && \
+ ${FIND} . -name "*.c" -o -name "*.h" | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
+.if !defined(WITH_SYSSQLITE3)
+ @${MV} ${WRKSRC}/lib/sqlite/sqlite.def ${WRKSRC}/lib/sqlite/nsssqlite.def
+.endif
do-install:
${MKDIR} ${PREFIX}/include/nss ${PREFIX}/lib/nss
diff -urN nss.orig/distinfo nss/distinfo
--- nss.orig/distinfo 2008-03-12 15:12:02.000000000 +0200
+++ nss/distinfo 2009-08-31 09:44:50.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (nss-3.11.9.tar.gz) = 5df54e8522bebf0f8c8c22e8f0df18fa
-SHA256 (nss-3.11.9.tar.gz) = fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
-SIZE (nss-3.11.9.tar.gz) = 3760535
+MD5 (nss-3.12.4.tar.gz) = 1ee3ed9c1900079319bd1de51388d856
+SHA256 (nss-3.12.4.tar.gz) = 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
+SIZE (nss-3.12.4.tar.gz) = 5412877
diff -urN nss.orig/files/nss-config.in nss/files/nss-config.in
--- nss.orig/files/nss-config.in 2007-03-19 07:13:40.000000000 +0200
+++ nss/files/nss-config.in 2009-08-31 20:52:07.000000000 +0200
@@ -20,6 +20,7 @@
[--cflags]
Dynamic Libraries:
nss
+ nssutil
ssl
smime
EOF
@@ -33,6 +34,7 @@
lib_ssl=yes
lib_smime=yes
lib_nss=yes
+lib_nssutil=yes
while test $# -gt 0; do
case "$1" in
@@ -83,6 +85,9 @@
nss)
lib_nss=yes
;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
*)
usage 1 1>&2
;;
@@ -132,6 +137,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
diff -urN nss.orig/files/nss.pc.in nss/files/nss.pc.in
--- nss.orig/files/nss.pc.in 2007-03-19 07:13:40.000000000 +0200
+++ nss/files/nss.pc.in 2009-08-31 21:05:00.000000000 +0200
@@ -7,5 +7,5 @@
Description: Mozilla Network Security Services
Version: @PORTVERSION@
Requires: nspr
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3
+Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lnssutil3
Cflags: -I${includedir}/nss -I${includedir}/nss/nss
diff -urN nss.orig/files/patch-..::coreconf::FreeBSD.mk nss/files/patch-..::coreconf::FreeBSD.mk
--- nss.orig/files/patch-..::coreconf::FreeBSD.mk 2009-08-17 19:18:30.000000000 +0200
+++ nss/files/patch-..::coreconf::FreeBSD.mk 2009-08-31 17:47:50.000000000 +0200
@@ -1,6 +1,6 @@
---- ../coreconf/FreeBSD.mk.orig 2006-01-21 02:36:11.000000000 +0000
-+++ ../coreconf/FreeBSD.mk 2009-08-17 17:17:41.235006000 +0000
-@@ -37,16 +37,20 @@
+--- ../coreconf/FreeBSD.mk.orig 2008-07-12 16:28:59.000000000 +0200
++++ ../coreconf/FreeBSD.mk 2009-08-31 10:20:16.000000000 +0200
+@@ -37,16 +37,23 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -18,13 +18,16 @@
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH = powerpc
+else
++ifeq ($(OS_TEST),amd64)
++USE_64 = 1
++endif
CPU_ARCH = x86
endif
+endif
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -60,20 +64,18 @@ ifndef CLASSIC_NSPR
+@@ -60,20 +67,18 @@
USE_PTHREADS = 1
DEFINES += -D_THREAD_SAFE -D_REENTRANT
OS_LIBS += -pthread
@@ -34,7 +37,7 @@
ARCH = freebsd
--MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
+-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
+DLL_SUFFIX = so.1
-ifeq ($(MOZ_OBJFORMAT),elf)
@@ -50,7 +53,7 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -82,4 +84,5 @@ PROCESS_MAP_FILE = grep -v ';-' $< | \
+@@ -82,4 +87,5 @@
G++INCLUDES = -I/usr/include/g++
diff -urN nss.orig/files/patch-cmd::platlibs.mk nss/files/patch-cmd::platlibs.mk
--- nss.orig/files/patch-cmd::platlibs.mk 2007-03-19 07:13:40.000000000 +0200
+++ nss/files/patch-cmd::platlibs.mk 1970-01-01 02:00:00.000000000 +0200
@@ -1,14 +0,0 @@
---- cmd/platlibs.mk Wed Apr 6 17:35:41 2005
-+++ cmd/platlibs.mk Wed Jul 27 22:22:59 2005
-@@ -72,5 +72,4 @@
- $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-@@ -120,5 +118,4 @@
- $(CRYPTOLIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- $(NULL)
-
diff -urN nss.orig/files/patch-sysdb nss/files/patch-sysdb
--- nss.orig/files/patch-sysdb 2008-03-12 15:12:02.000000000 +0200
+++ nss/files/patch-sysdb 2009-08-31 14:17:06.000000000 +0200
@@ -1,36 +1,53 @@
---- lib/softoken/cdbhdl.h Sun Apr 25 11:03:16 2004
-+++ lib/softoken/cdbhdl.h Fri Jul 22 00:25:16 2005
-@@ -43,6 +43,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 @@
#define _CDBHDL_H_
--#include "nspr.h"
+ #include "nspr.h"
-#include "mcom_db.h"
-+#include <nspr.h>
+#include <db.h>
++#include <fcntl.h>
#include "pcertt.h"
- --- lib/softoken/dbmshim.c Tue Mar 29 13:21:18 2005
-+++ lib/softoken/dbmshim.c Fri Jul 22 00:35:33 2005
-@@ -40,5 +40,6 @@
- * $Id: dbmshim.c,v 1.11 2005/03/29 18:21:18 nelsonb%netscape.com Exp $
+ #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 $
*/
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "secitem.h"
- #include "secder.h"
---- lib/softoken/keydb.c Fri Jun 4 20:50:32 2004
-+++ lib/softoken/keydb.c Fri Jul 22 00:37:01 2005
-@@ -46,5 +46,6 @@
+ #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 @@
+ #include "blapi.h"
#include "secitem.h"
#include "pcert.h"
-#include "mcom_db.h"
-+#include <db.h>
-+#include <fcntl.h>
- #include "lowpbe.h"
#include "secerr.h"
---- lib/softoken/pcertdb.c Tue Mar 29 13:21:18 2005
-+++ lib/softoken/pcertdb.c Fri Jul 22 00:40:00 2005
-@@ -44,5 +44,6 @@
+
+ #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 @@
+
+ #include "nspr.h"
+ #include "seccomon.h"
+-#include "mcom_db.h"
++#include <db.h>
+
+ /*
+ * 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 @@
+ */
#include "lowkeyti.h"
#include "pcert.h"
-#include "mcom_db.h"
@@ -38,138 +55,84 @@
+#include <fcntl.h>
#include "pcert.h"
#include "secitem.h"
---- lib/softoken/pk11db.c Fri Apr 1 19:46:13 2005
-+++ lib/softoken/pk11db.c Fri Jul 22 00:42:01 2005
-@@ -42,5 +42,6 @@
+ #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 @@
+
#include "pk11pars.h"
- #include "pkcs11i.h"
+ #include "lgdb.h"
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
- #include "cdbhdl.h"
#include "secerr.h"
---- lib/softoken/keydbi.h Tue Apr 27 19:04:38 2004
-+++ lib/softoken/keydbi.h Fri Jul 22 00:43:24 2005
-@@ -42,7 +42,7 @@
- #define _KEYDBI_H_
--#include "nspr.h"
-+#include <nspr.h>
- #include "seccomon.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 @@
+ #include "ckt.h"
+ #endif /* CKT_H */
+
-#include "mcom_db.h"
+#include <db.h>
- /*
---- lib/softoken/config.mk Mon May 24 20:13:11 2004
-+++ lib/softoken/config.mk Fri Jul 22 00:55:20 2005
-@@ -47,5 +47,4 @@
- $(CRYPTOLIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- $(NULL)
-
---- lib/certdb/certdb.c Sat Mar 5 03:03:03 2005
-+++ lib/certdb/certdb.c Fri Jul 22 01:02:11 2005
-@@ -53,5 +53,4 @@
- #include "keyhi.h"
- #include "secitem.h"
--#include "mcom_db.h"
- #include "certdb.h"
- #include "prprf.h"
---- lib/certdb/genname.c Sun Apr 25 11:03:03 2004
-+++ lib/certdb/genname.c Fri Jul 22 01:02:59 2005
-@@ -39,5 +39,4 @@
- #include "secitem.h"
- #include "secoidt.h"
--#include "mcom_db.h"
- #include "secasn1.h"
- #include "secder.h"
---- lib/certdb/stanpcertdb.c Thu Dec 2 16:34:15 2004
-+++ lib/certdb/stanpcertdb.c Fri Jul 22 01:03:19 2005
-@@ -38,5 +38,4 @@
+ NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
- #include "cert.h"
--#include "mcom_db.h"
- #include "certdb.h"
- #include "secitem.h"
---- lib/certdb/xauthkid.c Sun Apr 25 11:03:03 2004
-+++ lib/certdb/xauthkid.c Fri Jul 22 01:03:54 2005
-@@ -40,6 +40,5 @@
+--- 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,10 +40,6 @@
+
+ EXTRA_LIBS += $(CRYPTOLIB)
+
+-ifndef NSS_DISABLE_DBM
+-EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-endif
+-
+ # can't do this in manifest.mn because OS_TARGET isn't defined there.
+ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+
+--- 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 @@
+ *
*/
-#include "prtypes.h"
--#include "mcom_db.h"
+#include <prtypes.h>
#include "seccomon.h"
#include "secdert.h"
---- lib/certdb/xbsconst.c Sun Apr 25 11:03:03 2004
-+++ lib/certdb/xbsconst.c Fri Jul 22 01:05:41 2005
-@@ -39,6 +39,6 @@
+ #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
*/
-#include "prtypes.h"
--#include "mcom_db.h"
-+#include <limits.h> /* LONG_MAX */
+#include <prtypes.h>
+ #include <limits.h> /* for LONG_MAX */
#include "seccomon.h"
#include "secdert.h"
-@@ -48,5 +48,5 @@
- #include "certt.h"
- #include "secder.h"
--#include "prprf.h"
-+#include <prprf.h>
- #include "secerr.h"
-
---- lib/certdb/xconst.c Tue Nov 9 01:13:32 2004
-+++ lib/certdb/xconst.c Fri Jul 22 01:06:20 2005
-@@ -39,6 +39,5 @@
+--- 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
*/
-#include "prtypes.h"
--#include "mcom_db.h"
+#include <prtypes.h>
#include "seccomon.h"
#include "secdert.h"
-@@ -48,5 +47,5 @@
- #include "cert.h"
- #include "secder.h"
--#include "prprf.h"
-+#include <prprf.h>
- #include "xconst.h"
- #include "genname.h"
---- lib/ckfw/dbm/ckdbm.h Wed Jan 19 21:25:47 2005
-+++ lib/ckfw/dbm/ckdbm.h Fri Jul 22 01:06:58 2005
-@@ -57,5 +57,5 @@
- #endif /* CKT_H */
-
--#include "mcom_db.h"
-+#include <db.h>
-
- NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
---- lib/freebl/mac_rand.c Sun Apr 25 11:03:08 2004
-+++ lib/freebl/mac_rand.c Fri Jul 22 01:08:19 2005
-@@ -40,5 +40,4 @@
- #endif
- #include "secrng.h"
--#include "mcom_db.h"
- #ifdef XP_MAC
- #include <Events.h>
---- lib/pk11wrap/secmodi.h Mon Mar 28 15:45:37 2005
-+++ lib/pk11wrap/secmodi.h Fri Jul 22 01:08:47 2005
-@@ -42,5 +42,5 @@
- #include "pkcs11.h"
- #include "nssilock.h"
--#include "mcom_db.h"
-+#include <db.h>
#include "secoidt.h"
- #include "secdert.h"
---- lib/softoken/dbinit.c.orig 2008-03-12 08:43:36.000000000 -0400
-+++ lib/softoken/dbinit.c 2008-03-12 08:44:10.000000000 -0400
-@@ -39,6 +39,7 @@
- /* $Id: dbinit.c,v 1.28.2.1 2006/09/22 00:21:03 julien.pierre.bugs%sun.com Exp $ */
+--- 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 @@
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
+ else
+-DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
++DBMLIB = $(NULL)
+ endif
- #include <ctype.h>
-+#include <fcntl.h>
- #include "seccomon.h"
- #include "prinit.h"
- #include "prprf.h"
+ ifdef USE_STATIC_LIBS
diff -urN nss.orig/files/sqlite3-builtin.patch nss/files/sqlite3-builtin.patch
--- nss.orig/files/sqlite3-builtin.patch 1970-01-01 02:00:00.000000000 +0200
+++ nss/files/sqlite3-builtin.patch 2009-08-31 18:11:31.000000000 +0200
@@ -0,0 +1,63 @@
+--- 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 2009-08-31 17:54:32.000000000 +0200
++++ lib/sqlite/manifest.mn 2009-08-31 17:54:44.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 += -DTHREADSAFE=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 \
diff -urN nss.orig/files/sqlite3-system.patch nss/files/sqlite3-system.patch
--- nss.orig/files/sqlite3-system.patch 1970-01-01 02:00:00.000000000 +0200
+++ nss/files/sqlite3-system.patch 2009-08-31 18:16:27.000000000 +0200
@@ -0,0 +1,13 @@
+--- lib/softoken/manifest.mn.orig 2009-08-31 18:15:14.000000000 +0200
++++ lib/softoken/manifest.mn 2009-08-31 18:15:30.000000000 +0200
+@@ -47,9 +47,7 @@
+
+ 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
++INCLUDES += -I/usr/local/include
+
+ EXPORTS = \
+ secmodt.h \
diff -urN nss.orig/pkg-plist nss/pkg-plist
--- nss.orig/pkg-plist 2007-03-19 07:13:40.000000000 +0200
+++ nss/pkg-plist 2009-08-31 18:25:39.000000000 +0200
@@ -68,6 +68,7 @@
include/nss/nss/nsslocks.h
include/nss/nss/nssrwlk.h
include/nss/nss/nssrwlkt.h
+include/nss/nss/nssutil.h
include/nss/nss/ocsp.h
include/nss/nss/ocspt.h
include/nss/nss/p12.h
@@ -113,7 +114,7 @@
include/nss/nss/sslerr.h
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
-include/nss/nss/watcomfx.h
+include/nss/nss/utilrename.h
lib/nss/libcrmf.a
lib/nss/libfreebl3.so
lib/nss/libfreebl3.so.1
@@ -121,10 +122,16 @@
lib/nss/libnss3.so.1
lib/nss/libnssckbi.so
lib/nss/libnssckbi.so.1
+lib/nss/libnssdbm3.so
+lib/nss/libnssdbm3.so.1
+lib/nss/libnssutil3.so
+lib/nss/libnssutil3.so.1
lib/nss/libsmime3.so
lib/nss/libsmime3.so.1
lib/nss/libsoftokn3.so
lib/nss/libsoftokn3.so.1
+%%SYSSQLITE3%%lib/nss/libnsssqlite3.so
+%%SYSSQLITE3%%lib/nss/libnsssqlite3.so.1
lib/nss/libssl3.so
lib/nss/libssl3.so.1
libdata/pkgconfig/nss.pc
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908311922.n7VJMoa8030111>