Bug#537866: new patch

[Timo Aaltonen]

this seems to work better


diff --git a/debian/libnss3.symbols b/debian/libnss3.symbols
index 14dc55e..b24e1b7 100644
--- a/debian/libnss3.symbols
+++ b/debian/libnss3.symbols
@@ -102,6 +102,8 @@ libnssckbi.so libnss3 (>= 2:3.13.4-2~) | libnss3-1d #MINVER#
 libnssdbm3.so libnss3 (>= 2:3.13.4-2~) | libnss3-1d #MINVER#
 |libnss3 #MINVER#
  *@NSSDBM_3.12 3.12.0
+libnsssysinit.so libnss3 #MINVER#
+ NSS_ReturnModuleSpecData at Base 3.14.2
 libsoftokn3.so libnss3 (>= 2:3.13.4-2~) | libnss3-1d #MINVER#
 |libnss3 #MINVER#
  *@NSS_3.4 3.12.0~1.9b1
diff --git a/debian/pkcs11.txt b/debian/pkcs11.txt
new file mode 100644
index 0000000..7f8bd21
--- /dev/null
+++ b/debian/pkcs11.txt
@@ -0,0 +1,4 @@
+library=libnsssysinit.so
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/etc/pki/nssdb'  certPrefix='' keyPrefix='' secmod='secmod.db' fla
+NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFl
diff --git a/debian/rules b/debian/rules
index 74166be..016e93e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ override_dh_auto_build:
                build_coreconf \
                build_dbm \
                all \
-               MOZILLA_CLIENT=1 \
                NSPR_INCLUDE_DIR=/usr/include/nspr \
                NSPR_LIB_DIR=/usr/lib \
                SOURCE_MD_DIR=$(DISTDIR) \
@@ -73,6 +72,7 @@ override_dh_auto_install: $(PREPROCESS_FILES:.in=)
                $(DISTDIR)/lib/libfreebl3.so \
                $(DISTDIR)/lib/libsoftokn3.so \
                $(DISTDIR)/lib/libnssdbm3.so \
+               $(DISTDIR)/lib/libnsssysinit.so \
                $(DISTDIR)/lib/libnssckbi.so
 
        install -m 644 -t debian/libnss3-dev/usr/include/nss \
@@ -86,6 +86,16 @@ override_dh_auto_install: $(PREPROCESS_FILES:.in=)
                $(foreach bin,certutil cmsutil crlutil modutil pk12util shlibsign signtool si
                $(DISTDIR)/bin/$(bin))
 
+       # Create the empty certificate databases, with empty passphrase
+       echo "\n" > /tmp/password
+       install -m 755 -d debian/libnss3/etc/pki/nssdb
+       LD_LIBRARY_PATH=$(DISTDIR)/lib $(DISTDIR)/bin/certutil -N -d debian/libnss3/etc/pki/n
+               -f /tmp/password
+       LD_LIBRARY_PATH=$(DISTDIR)/lib $(DISTDIR)/bin/certutil -N -d sql:debian/libnss3/etc/p
+               -f /tmp/password
+       chmod 644 debian/libnss3/etc/pki/nssdb/*
+       install -m 644 -t debian/libnss3/etc/pki/nssdb debian/pkcs11.txt
+
 override_dh_strip:
        dh_strip -a --dbg-package=libnss3-dbg
        $(foreach lib,libsoftokn3.so libfreebl3.so libnssdbm3.so, \




-- 
t