Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 11:27:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 509319: We also need to generate libnssdbm3.chk with shlibsign.

Browse Source 
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.
This commit is contained in:
Wan-Teh Chang 2009-09-04 18:28:54 -07:00
parent b04e9f345d
commit 7a99ca1ed3
12 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -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

8
configure.in
View File

@ -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

2
embedding/config/basebrowser-installer-win.pkg
View File

@ -224,6 +224,8 @@ components\pipnss.dll
components\pipnss.xpt
nssutil3.dll
nss3.dll
nssdbm3.chk
nssdbm3.dll
smime3.dll
softokn3.chk
softokn3.dll

2
embedding/config/basebrowser-mac-macho
View File

@ -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

2
embedding/config/basebrowser-qnx
View File

@ -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

2
embedding/config/basebrowser-unix
View File

@ -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

2
embedding/config/basebrowser-win
View File

@ -237,6 +237,8 @@ components\pipnss.dll
components\pipnss.xpt
nssutil3.dll
nss3.dll
nssdbm3.chk
nssdbm3.dll
smime3.dll
softokn3.chk
softokn3.dll

2
embedding/config/minimo-qnx
View File

@ -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

2
embedding/config/minimo-unix
View File

@ -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

2
security/manager/Makefile.in
View File

@ -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

2
toolkit/mozapps/installer/packager.mk
View File

@ -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; \

2
xulrunner/installer/mozilla-nss.pc.in
View File

@ -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}