Backed out changeset dd66dc5f5603 (bug 1272693) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 29 Jul 2016 13:27:30 +0200
changeset 347307 0220622b0a711db67a58946be4d01197d544bebb
parent 347306 721b016eeceaa84cc0a73e63d77252e485108067
child 347308 87ebc9fdddeed6194f2dbe55ebaba09f7f0e7f3a
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1272693
milestone50.0a1
backs outdd66dc5f5603d0d5e885353094f71d99b17121e2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset dd66dc5f5603 (bug 1272693) for bustage
config/external/nss/Makefile.in
config/external/nss/nss.symbols
old-configure.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -318,20 +318,17 @@ ifdef MOZ_FOLD_LIBS
 NSS_STATIC_LIBS := $(strip $(shell $(MAKE) --no-print-directory -f $(srcdir)/nss.mk DEPTH='$(DEPTH)' topsrcdir='$(topsrcdir)' srcdir='$(srcdir)' echo-variable-libs))
 # Corresponding build directories
 NSS_STATIC_DIRS := $(foreach lib,$(NSS_STATIC_LIBS),$(patsubst %/,%,$(dir $(lib))))
 NSS_DIRS += $(NSS_STATIC_DIRS)
 
 # TODO: The following can be replaced by something simpler when bug 844884
 # is fixed.
 # Remaining nss/lib directories
-NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw
-
-DEFAULT_GMAKE_FLAGS += NSS_DISABLE_LIBPKIX=1
-
+NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw nss/lib/libpkix
 ifeq (WINNT,$(OS_TARGET))
 NSS_DIRS += nss/lib/zlib
 endif
 endif # MOZ_FOLD_LIBS
 
 # Filter-out $(LIBRARY_NAME) because it's already handled in config/rules.mk.
 NSS_DIST_DLL_FILES := $(addprefix $(DIST)/lib/$(DLL_PREFIX),$(addsuffix $(DLL_SUFFIX),$(filter-out $(LIBRARY_NAME),$(NSS_DLLS)) $(NSS_EXTRA_DLLS)))
 NSS_DIST_DLL_DEST := $(DIST)/bin
--- a/config/external/nss/nss.symbols
+++ b/config/external/nss/nss.symbols
@@ -137,16 +137,17 @@ CERT_IsUserCert
 CERT_MakeCANickname
 CERT_MergeExtensions
 CERT_NameTemplate @DATA@
 CERT_NameToAscii
 CERT_NewCertList
 CERT_NewTempCertificate
 CERT_NicknameStringsFromCertList
 CERT_OCSPCacheSettings
+CERT_PKIXVerifyCert
 CERT_RemoveCertListNode
 CERT_RFC1485_EscapeAndQuote
 CERT_SaveSMimeProfile
 CERT_SequenceOfCertExtensionTemplate @DATA@
 CERT_SetOCSPFailureMode
 CERT_SetOCSPTimeout
 CERT_SignedCrlTemplate @DATA@
 CERT_SignedDataTemplate @DATA@
--- a/old-configure.in
+++ b/old-configure.in
@@ -6634,20 +6634,16 @@ dnl MOZ_ENABLE_MASK_AS_SHORTHAND=1
 if test "$MOZ_ENABLE_MASK_AS_SHORTHAND"; then
   AC_DEFINE(MOZ_ENABLE_MASK_AS_SHORTHAND)
 fi
 AC_SUBST(MOZ_ENABLE_MASK_AS_SHORTHAND)
 
 # Avoid using obsolete NSPR features
 AC_DEFINE(NO_NSPR_10_SUPPORT)
 
-# Don't build NSS libpkix
-NSS_DISABLE_LIBPKIX=1
-AC_SUBST(NSS_DISABLE_LIBPKIX)
-
 MOZ_CREATE_CONFIG_STATUS()
 
 if test "$COMPILE_ENVIRONMENT"; then
   MOZ_SUBCONFIGURE_FFI()
   MOZ_SUBCONFIGURE_JEMALLOC()
 fi
 
 # Run freetype configure script