Follow up to
bug 399590, add the new library file to packaging
--- a/browser/installer/unix/config.it
+++ b/browser/installer/unix/config.it
@@ -755,16 +755,23 @@ Do Not Uninstall=FALSE
[Copy File8]
Timing=post smartupdate
Source=[$GRE_INSTALL_DIR]\freebl3.chk
Destination=[SETUP PATH]
Fail If Exists=FALSE
Do Not Uninstall=FALSE
+[Copy File9]
+Timing=post smartupdate
+Source=[$GRE_INSTALL_DIR]\nssutil3.dll
+Destination=[SETUP PATH]
+Fail If Exists=FALSE
+Do Not Uninstall=FALSE
+
[Path Lookup $GRE_INSTALL_DIR]
Path Reg Key Root=HKEY_LOCAL_MACHINE
Path Reg Key=Software\mozilla.org\GRE\$GreUniqueID$\Main
Path Reg Name=Install Directory
Strip Filename=FALSE
;Copy File SequentialX sections
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@@ -343,16 +343,17 @@ bin/components/dom_svg.xpt
; [Personal Security Manager]
;
bin/libnssckbi.so
bin/components/pipboot.xpt
bin/components/pipnss.xpt
bin/components/pippki.xpt
bin/libnss3.so
+bin/libnssutil3.so
bin/libsmime3.so
bin/libsoftokn3.chk
bin/libsoftokn3.so
bin/libfreebl3.chk
bin/libfreebl3.so
bin/libssl3.so
bin/libnssdbm3.so
bin/chrome/pipnss.jar
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -326,16 +326,17 @@ bin\res\svg.css
bin\components\dom_svg.xpt
; [Personal Security Manager]
;
bin\nssckbi.dll
bin\components\pipboot.xpt
bin\components\pipnss.xpt
bin\components\pippki.xpt
+bin\nssutil3.dll
bin\nss3.dll
bin\smime3.dll
bin\softokn3.chk
bin\softokn3.dll
bin\freebl3.chk
bin\freebl3.dll
bin\ssl3.dll
bin\nssdbm3.dll
--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@@ -217,16 +217,17 @@ components\wallet.dll
components\wallet.xpt
; psm2
; Optional - only if you need HTTPS support
components\pipboot.dll
components\pipboot.xpt
components\pipnss.dll
components\pipnss.xpt
+nssutil3.dll
nss3.dll
smime3.dll
softokn3.chk
softokn3.dll
freebl3.chk
freebl3.dll
ssl3.dll
nssckbi.dll
--- a/embedding/config/basebrowser-mac-macho
+++ b/embedding/config/basebrowser-mac-macho
@@ -157,16 +157,17 @@ components/wallet.xpt
; Optional - only if you need PSM2 support
components/libpipboot.dylib
components/pipboot.xpt
components/libpipnss.dylib
components/pipnss.xpt
chrome/pipnss.jar
defaults/pref/security-prefs.js
libnss3.dylib
+libnssutil3.dylib
libsmime3.dylib
libsoftokn3.chk
libsoftokn3.dylib
libfreebl3.chk
libfreebl3.dylib
libssl3.dylib
libnssckbi.dylib
--- a/embedding/config/basebrowser-qnx
+++ b/embedding/config/basebrowser-qnx
@@ -196,16 +196,17 @@ components/wallet.xpt
; psm2
; Optional - only if you need HTTPS support
components/libpipboot.so
components/pipboot.xpt
components/libpipnss.so
components/pipnss.xpt
chrome/pipnss.jar
defaults/pref/security-prefs.js
+libnssutil3.so
libnss3.so
libsmime3.so
libsoftokn3.chk
libsoftokn3.so
libfreebl3.chk
libfreebl3.so
libssl3.so
libnssckbi.so
--- a/embedding/config/basebrowser-unix
+++ b/embedding/config/basebrowser-unix
@@ -197,16 +197,17 @@ components/wallet.xpt
; psm2
; Optional - only if you need HTTPS support
components/libpipboot.so
components/pipboot.xpt
components/libpipnss.so
components/pipnss.xpt
chrome/pipnss.jar
defaults/pref/security-prefs.js
+libnssutil3.so
libnss3.so
libsmime3.so
libsoftokn3.chk
libsoftokn3.so
libfreebl3.chk
libfreebl3.so
libssl3.so
libnssckbi.so
--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@@ -233,16 +233,17 @@ components\wallet.xpt
;components\nsDownloadProgressListener.js
; psm2
; Optional - only if you need HTTPS support
components\pipboot.dll
components\pipboot.xpt
components\pipnss.dll
components\pipnss.xpt
+nssutil3.dll
nss3.dll
smime3.dll
softokn3.chk
softokn3.dll
freebl3.chk
freebl3.dll
ssl3.dll
nssckbi.dll
--- a/embedding/config/minimo-qnx
+++ b/embedding/config/minimo-qnx
@@ -150,16 +150,17 @@ components/plugin.xpt
; psm2
; Optional - only if you need HTTPS support
components/libpipboot.so
components/pipboot.xpt
components/libpipnss.so
components/pipnss.xpt
chrome/pipnss.jar
defaults/pref/security-prefs.js
+libnssutil3.so
libnss3.so
libsmime3.so
libsoftokn3.chk
libsoftokn3.so
libfreebl3.chk
libfreebl3.so
libssl3.so
libnssckbi.so
--- a/embedding/config/minimo-unix
+++ b/embedding/config/minimo-unix
@@ -149,16 +149,17 @@ components/plugin.xpt
; psm2
; Optional - only if you need HTTPS support
components/libpipboot.so
components/pipboot.xpt
components/libpipnss.so
components/pipnss.xpt
chrome/pipnss.jar
defaults/pref/security-prefs.js
+libnssutil3.so
libnss3.so
libsmime3.so
libsoftokn3.chk
libsoftokn3.so
libfreebl3.chk
libfreebl3.so
libssl3.so
libnssckbi.so
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -89,16 +89,17 @@ DEPENDENT_LIBS_LIST += \
$(NULL)
ifdef MOZ_ENABLE_LIBXUL
DEPENDENT_LIBS_LIST += \
$(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \
$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
+ $(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \
$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
$(LIB_PREFIX)smime3$(DLL_SUFFIX) \
$(NULL)
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
DEPENDENT_LIBS_LIST += js$(MOZ_BITS)$(VERSION_NUMBER)$(DLL_SUFFIX)
else
DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
--- a/xulrunner/installer/mozilla-nss.pc.in
+++ b/xulrunner/installer/mozilla-nss.pc.in
@@ -1,10 +1,10 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
Name: NSS
Description: Mozilla Network Security Services
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lnss3 -lsmime3 -lssl3 -lsoftokn3
+Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
Cflags: -I${includedir}/stable