2 Wolfgang Rosenauer <wr@rosenauer.org> |
2 Wolfgang Rosenauer <wr@rosenauer.org> |
3 Subject: use libnsssharedhelper if available at compile time |
3 Subject: use libnsssharedhelper if available at compile time |
4 (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
4 (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
5 References: |
5 References: |
6 |
6 |
7 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
|
8 --- a/config/autoconf.mk.in |
|
9 +++ b/config/autoconf.mk.in |
|
10 @@ -540,16 +540,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO |
|
11 |
|
12 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
|
13 MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ |
|
14 |
|
15 GLIB_CFLAGS = @GLIB_CFLAGS@ |
|
16 GLIB_LIBS = @GLIB_LIBS@ |
|
17 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
|
18 |
|
19 +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ |
|
20 +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
|
21 +NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
|
22 + |
|
23 MOZ_NATIVE_MAKEDEPEND = @MOZ_NATIVE_MAKEDEPEND@ |
|
24 |
|
25 CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ |
|
26 |
|
27 MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
|
28 COMPILER_DEPEND = @COMPILER_DEPEND@ |
|
29 MDDEPDIR := @MDDEPDIR@ |
|
30 CC_WRAPPER = @CC_WRAPPER@ |
|
31 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
32 --- a/configure.in |
8 --- a/configure.in |
33 +++ b/configure.in |
9 +++ b/configure.in |
34 @@ -8052,16 +8052,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS) |
35 |
11 |
36 dnl ======================================================== |
12 dnl ======================================================== |
37 dnl HarfBuzz |
13 dnl HarfBuzz |
38 dnl ======================================================== |
14 dnl ======================================================== |
39 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
105 #include "nsCertVerificationThread.h" |
81 #include "nsCertVerificationThread.h" |
106 |
82 |
107 #include "nsNetUtil.h" |
83 #include "nsNetUtil.h" |
108 #include "nsAppDirectoryServiceDefs.h" |
84 #include "nsAppDirectoryServiceDefs.h" |
109 #include "nsDirectoryService.h" |
85 #include "nsDirectoryService.h" |
110 @@ -1740,18 +1747,34 @@ nsNSSComponent::InitializeNSS(bool showW |
86 @@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW |
111 ConfigureInternalPKCS11Token(); |
87 ConfigureInternalPKCS11Token(); |
112 |
88 |
113 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
114 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
115 // later. It also allows us to work around a bug in the system NSS in |
91 // later. It also allows us to work around a bug in the system NSS in |
116 // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as |
92 // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as |
117 // "/usr/lib/nss/libnssckbi.so". |
93 // "/usr/lib/nss/libnssckbi.so". |
118 PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; |
94 uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; |
119 - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
95 - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
120 - SECMOD_DB, init_flags); |
96 - SECMOD_DB, init_flags); |
121 + SECStatus init_rv = SECFailure; |
97 + SECStatus init_rv = SECFailure; |
122 +#ifdef MOZ_ENABLE_NSSHELPER |
98 +#ifdef MOZ_ENABLE_NSSHELPER |
123 + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { |
99 + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { |
145 } |
121 } |
146 else { |
122 else { |
147 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
148 --- a/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
149 +++ b/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
150 @@ -441,17 +441,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
126 @@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
151 endif |
127 endif |
152 endif |
128 endif |
153 endif |
129 endif |
154 |
130 |
155 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |