From f552a4c7e4249dfb2b97a5f7d3f05aaac2d8d873 Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Tue, 17 Apr 2007 20:42:54 +0000 Subject: [PATCH] Bug 370693, Mozilla.org nightly bits broken, Failure to use crypto with FIPS mode Build system changes only Patch originally proposed by Wan-Teh in bug 249782 r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@224643 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 5 ----- mozilla/toolkit/mozapps/installer/packager.mk | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 56ca8c09985..8b50fda8766 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -162,14 +162,9 @@ ifdef MOZ_AIRBAG endif endif -## XXXvlad -- the test and cp should be removed once bug 249782 is -## completely fixed signnss: ifdef MOZILLA_OFFICIAL echo signing NSS libs -ifdef MSMANIFEST_TOOL - test -f $(DEPTH)/nss/shlibsign.exe.manifest && cp $(DEPTH)/nss/shlibsign.exe.manifest $(DIST)/bin -endif cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll endif # MOZILLA_OFFICIAL diff --git a/mozilla/toolkit/mozapps/installer/packager.mk b/mozilla/toolkit/mozapps/installer/packager.mk index 5526417bc77..e223146d6c7 100644 --- a/mozilla/toolkit/mozapps/installer/packager.mk +++ b/mozilla/toolkit/mozapps/installer/packager.mk @@ -178,7 +178,7 @@ NATIVE_ARCH = $(shell uname -p | sed -e s/powerpc/ppc/) NATIVE_DIST = $(DIST)/../../$(NATIVE_ARCH)/dist SIGN_CMD = $(NATIVE_DIST)/bin/run-mozilla.sh $(NATIVE_DIST)/bin/shlibsign -v -i else -SIGN_CMD = $(DIST)/bin/run-mozilla.sh $(DEPTH)/nss/shlibsign -v -i +SIGN_CMD = $(RUN_TEST_PROGRAM) $(DIST)/bin/shlibsign -v -i endif SOFTOKN = $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)/$(DLL_PREFIX)softokn3$(DLL_SUFFIX)