diff -r bcb3d1af73f7 -r 3006d73ad2fa mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Sun Feb 03 16:47:11 2013 +0100 +++ b/mozilla-shared-nss-db.patch Mon Feb 04 08:00:25 2013 +0100 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8108,16 +8108,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8275,16 +8275,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,7 +42,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -93,10 +93,13 @@ DEFINES += \ +@@ -92,16 +92,19 @@ DEFINES += \ $(NULL) EXPORTS += \ @@ -54,6 +54,12 @@ +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + + EXPORTS_NAMESPACES = mozilla + + EXPORTS_mozilla += \ + PublicSSL.h \ + $(NULL) + include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp @@ -83,7 +89,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1735,18 +1742,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -123,7 +129,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -500,17 +500,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif