From a90cb717a5a4012a1e10c655850282302c8c7092 Mon Sep 17 00:00:00 2001
From: Eugen Sawin <esawin@mozilla.com>
Date: Fri, 29 Jul 2016 15:21:07 +0200
Subject: [PATCH] Bug 1272693 - [1.1] Disable building libpkix. r=keeler,ted

---
 config/external/nss/Makefile.in | 5 ++++-
 config/external/nss/nss.symbols | 1 -
 old-configure.in                | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index dc1f03424984..952049d8bef4 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -323,7 +323,10 @@ 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 nss/lib/libpkix
+NSS_DIRS += nss/lib/freebl nss/lib/softoken nss/lib/jar nss/lib/crmf nss/lib/ckfw
+
+DEFAULT_GMAKE_FLAGS += NSS_DISABLE_LIBPKIX=1
+
 ifeq (WINNT,$(OS_TARGET))
 NSS_DIRS += nss/lib/zlib
 endif
diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols
index 855e6c9f81d2..a69c748654db 100644
--- a/config/external/nss/nss.symbols
+++ b/config/external/nss/nss.symbols
@@ -142,7 +142,6 @@ CERT_NewCertList
 CERT_NewTempCertificate
 CERT_NicknameStringsFromCertList
 CERT_OCSPCacheSettings
-CERT_PKIXVerifyCert
 CERT_RemoveCertListNode
 CERT_RFC1485_EscapeAndQuote
 CERT_SaveSMimeProfile
diff --git a/old-configure.in b/old-configure.in
index 5ac10c888232..954968a9e707 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -6639,6 +6639,10 @@ 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