Bug 509319: We also need to generate libnssdbm3.chk with shlibsign.
authorWan-Teh Chang <wtc@google.com>
Fri, 04 Sep 2009 18:28:54 -0700
changeset 32255 2f2d6044477436d136809ebddbe830ea2441b799
parent 32254 3521b67756f648a824ec47494a2329f78425f19f
child 32256 94678be140279852446e063acde562a0f54f38d0
push id8947
push userwtc@google.com
push dateSat, 05 Sep 2009 01:29:07 +0000
treeherdermozilla-central@2f2d60444774 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs509319
milestone1.9.3a1pre
Bug 509319: We also need to generate libnssdbm3.chk with shlibsign. We don't need to link with -lsoftokn3. Add nssdbm3 to some packaging files. The patch is written by Kai Engert <kaie@kuix.de>. r=wtc.
Makefile.in
configure.in
embedding/config/basebrowser-installer-win.pkg
embedding/config/basebrowser-mac-macho
embedding/config/basebrowser-qnx
embedding/config/basebrowser-unix
embedding/config/basebrowser-win
embedding/config/minimo-qnx
embedding/config/minimo-unix
security/manager/Makefile.in
toolkit/mozapps/installer/packager.mk
xulrunner/installer/mozilla-nss.pc.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -204,16 +204,17 @@ ifdef MOZ_CRASHREPORTER
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 signnss:
 ifdef MOZILLA_OFFICIAL
 	echo signing NSS libs
 	cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll
 	cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
+	cd $(DIST)/bin; ./shlibsign.exe -v -i nssdbm3.dll
 endif # MOZILLA_OFFICIAL
 
 deliver: rebase signnss
 
 endif # WINNT
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(srcdir)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
--- a/configure.in
+++ b/configure.in
@@ -4245,29 +4245,27 @@ if test -n "$MOZ_NATIVE_NSS"; then
    NSS_LIBS="$NSS_LIBS -lcrmf"
 else
    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
    NSS_DEP_LIBS="\
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)ssl$NSS_VERSION\$(DLL_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nss$NSS_VERSION\$(DLL_SUFFIX) \
-        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION\$(DLL_SUFFIX) \
-        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)softokn$NSS_VERSION\$(DLL_SUFFIX)"
+        \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION\$(DLL_SUFFIX)"
 
    if test -z "$GNU_CC" && test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "WINCE" -o "$OS_ARCH" = "OS2"; then
        NSS_LIBS="\
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)ssl$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
         \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nss$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
-        \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
-        \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)softokn$NSS_VERSION.\$(IMPORT_LIB_SUFFIX)"
+        \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(IMPORT_LIB_SUFFIX)"
    else
-       NSS_LIBS='$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION"
+       NSS_LIBS='$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION"
    fi
 fi
 
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system JPEG support
 dnl ========================================================
 MOZ_ARG_WITH_STRING(system-jpeg,
 [  --with-system-jpeg[=PFX]
--- a/embedding/config/basebrowser-installer-win.pkg
+++ b/embedding/config/basebrowser-installer-win.pkg
@@ -219,16 +219,18 @@ 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
+nssdbm3.chk
+nssdbm3.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
@@ -156,16 +156,18 @@ components/wallet.xpt
 components/libpipboot.dylib
 components/pipboot.xpt
 components/libpipnss.dylib
 components/pipnss.xpt
 chrome/pipnss.jar
 defaults/pref/security-prefs.js
 libnss3.dylib
 libnssutil3.dylib
+libnssdbm3.chk
+libnssdbm3.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,18 @@ components/wallet.xpt
 components/libpipboot.so
 components/pipboot.xpt
 components/libpipnss.so
 components/pipnss.xpt
 chrome/pipnss.jar
 defaults/pref/security-prefs.js
 libnssutil3.so
 libnss3.so
+libnssdbm3.chk
+libnssdbm3.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,18 @@ components/wallet.xpt
 components/libpipboot.so
 components/pipboot.xpt
 components/libpipnss.so
 components/pipnss.xpt
 chrome/pipnss.jar
 defaults/pref/security-prefs.js
 libnssutil3.so
 libnss3.so
+libnssdbm3.chk
+libnssdbm3.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
@@ -232,16 +232,18 @@ 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
+nssdbm3.chk
+nssdbm3.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
@@ -153,16 +153,18 @@ components/plugin.xpt
 components/libpipboot.so
 components/pipboot.xpt
 components/libpipnss.so
 components/pipnss.xpt
 chrome/pipnss.jar
 defaults/pref/security-prefs.js
 libnssutil3.so
 libnss3.so
+libnssdbm3.chk
+libnssdbm3.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
@@ -152,16 +152,18 @@ components/plugin.xpt
 components/libpipboot.so
 components/pipboot.xpt
 components/libpipnss.so
 components/pipnss.xpt
 chrome/pipnss.jar
 defaults/pref/security-prefs.js
 libnssutil3.so
 libnss3.so
+libnssdbm3.chk
+libnssdbm3.so
 libsmime3.so
 libsoftokn3.chk
 libsoftokn3.so
 libfreebl3.chk
 libfreebl3.so
 libssl3.so
 libnssckbi.so
 
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -67,26 +67,24 @@ endif
 ifndef MOZ_NATIVE_NSS
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 SDK_LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(IMPORT_LIB_SUFFIX) \
-  $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
   $(NULL)
 else
 SDK_LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
-  $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
   $(NULL)
 endif
 endif
 
 # Default
 HAVE_FREEBL_LIBS = 1
 
 # 32-bit HP-UX PA-RISC
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -201,18 +201,18 @@ FREEBL		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_
 NSSDBM		= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)nssdbm3$(NSS_DLL_SUFFIX)
 FREEBL_32FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32fpu_3$(DLL_SUFFIX)
 FREEBL_32INT	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int_3$(DLL_SUFFIX)
 FREEBL_32INT64	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX)
 FREEBL_64FPU	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64fpu_3$(DLL_SUFFIX)
 FREEBL_64INT	= $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_64int_3$(DLL_SUFFIX)
 
 SIGN_NSS	+= $(SIGN_CMD) $(SOFTOKN); \
+	$(SIGN_CMD) $(NSSDBM); \
 	if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi; \
-	if test -f $(NSSDBM); then $(SIGN_CMD) $(NSSDBM); fi; \
 	if test -f $(FREEBL_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi; \
 	if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); fi; \
 	if test -f $(FREEBL_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi; \
 	if test -f $(FREEBL_64FPU); then $(SIGN_CMD) $(FREEBL_64FPU); fi; \
 	if test -f $(FREEBL_64INT); then $(SIGN_CMD) $(FREEBL_64INT); fi;
 
 endif # MOZ_PSM
 endif # !CROSS_COMPILE
--- 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 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
+Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
 Cflags: -I${includedir}