From 7a99ca1ed37d9104f00d05991c7fc6bf0ea78398 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Fri, 4 Sep 2009 18:28:54 -0700 Subject: [PATCH] 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 . r=wtc. --- Makefile.in | 1 + configure.in | 8 +++----- embedding/config/basebrowser-installer-win.pkg | 2 ++ embedding/config/basebrowser-mac-macho | 2 ++ embedding/config/basebrowser-qnx | 2 ++ embedding/config/basebrowser-unix | 2 ++ embedding/config/basebrowser-win | 2 ++ embedding/config/minimo-qnx | 2 ++ embedding/config/minimo-unix | 2 ++ security/manager/Makefile.in | 2 -- toolkit/mozapps/installer/packager.mk | 2 +- xulrunner/installer/mozilla-nss.pc.in | 2 +- 12 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index f45eb9567ba3..7c24ceca2ac8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -209,6 +209,7 @@ 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 diff --git a/configure.in b/configure.in index 69067a1a907c..bed482a07b6c 100644 --- a/configure.in +++ b/configure.in @@ -4250,8 +4250,7 @@ else \$(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="\ @@ -4259,10 +4258,9 @@ else \$(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 diff --git a/embedding/config/basebrowser-installer-win.pkg b/embedding/config/basebrowser-installer-win.pkg index bcb4b401c1ec..91f05269b78e 100644 --- a/embedding/config/basebrowser-installer-win.pkg +++ b/embedding/config/basebrowser-installer-win.pkg @@ -224,6 +224,8 @@ components\pipnss.dll components\pipnss.xpt nssutil3.dll nss3.dll +nssdbm3.chk +nssdbm3.dll smime3.dll softokn3.chk softokn3.dll diff --git a/embedding/config/basebrowser-mac-macho b/embedding/config/basebrowser-mac-macho index ec4383adfb09..423f356b94f6 100644 --- a/embedding/config/basebrowser-mac-macho +++ b/embedding/config/basebrowser-mac-macho @@ -161,6 +161,8 @@ chrome/pipnss.jar defaults/pref/security-prefs.js libnss3.dylib libnssutil3.dylib +libnssdbm3.chk +libnssdbm3.dylib libsmime3.dylib libsoftokn3.chk libsoftokn3.dylib diff --git a/embedding/config/basebrowser-qnx b/embedding/config/basebrowser-qnx index 1c1dc1dede6e..7aed5576857d 100644 --- a/embedding/config/basebrowser-qnx +++ b/embedding/config/basebrowser-qnx @@ -201,6 +201,8 @@ chrome/pipnss.jar defaults/pref/security-prefs.js libnssutil3.so libnss3.so +libnssdbm3.chk +libnssdbm3.so libsmime3.so libsoftokn3.chk libsoftokn3.so diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix index 7f47d3fa14d7..a5b42f3e59ed 100644 --- a/embedding/config/basebrowser-unix +++ b/embedding/config/basebrowser-unix @@ -202,6 +202,8 @@ chrome/pipnss.jar defaults/pref/security-prefs.js libnssutil3.so libnss3.so +libnssdbm3.chk +libnssdbm3.so libsmime3.so libsoftokn3.chk libsoftokn3.so diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index 6896a2200d62..df7729c17c6e 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -237,6 +237,8 @@ components\pipnss.dll components\pipnss.xpt nssutil3.dll nss3.dll +nssdbm3.chk +nssdbm3.dll smime3.dll softokn3.chk softokn3.dll diff --git a/embedding/config/minimo-qnx b/embedding/config/minimo-qnx index d4d0d6d84c68..b3f822ebef9c 100644 --- a/embedding/config/minimo-qnx +++ b/embedding/config/minimo-qnx @@ -158,6 +158,8 @@ chrome/pipnss.jar defaults/pref/security-prefs.js libnssutil3.so libnss3.so +libnssdbm3.chk +libnssdbm3.so libsmime3.so libsoftokn3.chk libsoftokn3.so diff --git a/embedding/config/minimo-unix b/embedding/config/minimo-unix index 59dac9ace469..e96582aebb32 100644 --- a/embedding/config/minimo-unix +++ b/embedding/config/minimo-unix @@ -157,6 +157,8 @@ chrome/pipnss.jar defaults/pref/security-prefs.js libnssutil3.so libnss3.so +libnssdbm3.chk +libnssdbm3.so libsmime3.so libsoftokn3.chk libsoftokn3.so diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index 3692216c925e..466125c97885 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -72,7 +72,6 @@ SDK_LIBS = \ $(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 = \ @@ -81,7 +80,6 @@ SDK_LIBS = \ $(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 diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 632d1eae02b7..489a4bc008f4 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -206,8 +206,8 @@ FREEBL_64FPU = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl 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; \ diff --git a/xulrunner/installer/mozilla-nss.pc.in b/xulrunner/installer/mozilla-nss.pc.in index 281ac4088f01..088832aa1a25 100644 --- a/xulrunner/installer/mozilla-nss.pc.in +++ b/xulrunner/installer/mozilla-nss.pc.in @@ -6,5 +6,5 @@ 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}