зеркало из https://github.com/mozilla/gecko-dev.git
Bug 509558, Need to package nssdbm3.chk for NSS >= 3.12.4 (Firefox 3.6a1 doesn't support FIPS mode), r=ted.mielczarek
This commit is contained in:
Родитель
1e624e18bd
Коммит
dc3b066478
|
@ -363,6 +363,7 @@ bin/libfreebl3.chk
|
||||||
bin/libfreebl3.so
|
bin/libfreebl3.so
|
||||||
bin/libssl3.so
|
bin/libssl3.so
|
||||||
bin/libnssdbm3.so
|
bin/libnssdbm3.so
|
||||||
|
bin/libnssdbm3.chk
|
||||||
bin/chrome/pippki.jar
|
bin/chrome/pippki.jar
|
||||||
bin/chrome/pippki.manifest
|
bin/chrome/pippki.manifest
|
||||||
|
|
||||||
|
|
|
@ -359,6 +359,7 @@ bin\freebl3.chk
|
||||||
bin\freebl3.dll
|
bin\freebl3.dll
|
||||||
bin\ssl3.dll
|
bin\ssl3.dll
|
||||||
bin\nssdbm3.dll
|
bin\nssdbm3.dll
|
||||||
|
bin\nssdbm3.chk
|
||||||
bin\chrome\pippki.jar
|
bin\chrome\pippki.jar
|
||||||
bin\chrome\pippki.manifest
|
bin\chrome\pippki.manifest
|
||||||
|
|
||||||
|
|
|
@ -58,8 +58,10 @@ SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
|
||||||
|
|
||||||
ifndef NSS_DISABLE_DBM
|
ifndef NSS_DISABLE_DBM
|
||||||
NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
|
NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
|
||||||
|
NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
|
||||||
else
|
else
|
||||||
NSSDBM3_LIB =
|
NSSDBM3_LIB =
|
||||||
|
NSSDBM3_CHK =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef MOZ_NATIVE_NSS
|
ifndef MOZ_NATIVE_NSS
|
||||||
|
@ -323,6 +325,9 @@ ifndef SKIP_CHK
|
||||||
endif
|
endif
|
||||||
$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
|
$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
|
||||||
ifndef NSS_DISABLE_DBM
|
ifndef NSS_DISABLE_DBM
|
||||||
|
ifndef SKIP_CHK
|
||||||
|
$(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin
|
||||||
|
endif
|
||||||
$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
|
$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
|
||||||
endif
|
endif
|
||||||
$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
|
$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
|
||||||
|
@ -382,6 +387,9 @@ ifndef SKIP_CHK
|
||||||
$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
|
$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
|
||||||
endif
|
endif
|
||||||
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
|
$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
|
||||||
|
ifndef SKIP_CHK
|
||||||
|
$(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir)
|
||||||
|
endif
|
||||||
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
|
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
|
||||||
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
|
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
|
||||||
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
|
$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
|
||||||
|
|
|
@ -202,6 +202,7 @@ endif
|
||||||
|
|
||||||
SOFTOKN = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)softokn3$(NSS_DLL_SUFFIX)
|
SOFTOKN = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)softokn3$(NSS_DLL_SUFFIX)
|
||||||
FREEBL = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX)
|
FREEBL = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl3$(NSS_DLL_SUFFIX)
|
||||||
|
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_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_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_32INT64 = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl_32int64_3$(DLL_SUFFIX)
|
||||||
|
@ -210,6 +211,7 @@ FREEBL_64INT = $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(DLL_PREFIX)freebl
|
||||||
|
|
||||||
SIGN_NSS += $(SIGN_CMD) $(SOFTOKN); \
|
SIGN_NSS += $(SIGN_CMD) $(SOFTOKN); \
|
||||||
if test -f $(FREEBL); then $(SIGN_CMD) $(FREEBL); fi; \
|
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_32FPU); then $(SIGN_CMD) $(FREEBL_32FPU); fi; \
|
||||||
if test -f $(FREEBL_32INT); then $(SIGN_CMD) $(FREEBL_32INT); 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_32INT64); then $(SIGN_CMD) $(FREEBL_32INT64); fi; \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче