forked from pool/MozillaFirefox
- update to Firefox 9
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=244
This commit is contained in:
parent
02a5839fe7
commit
3df3bcb178
@ -16,6 +16,7 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define major 9
|
%define major 9
|
||||||
%define mainver %major.0
|
%define mainver %major.0
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From: Hans Petter Jansson <hpj@copyleft.no>
|
From: Hans Petter Jansson <hpj@copyleft.no>
|
||||||
Wolfgang Rosenauer <wr@rosenauer.org>
|
Wolfgang Rosenauer <wr@rosenauer.org>
|
||||||
Subject: use libnsssharedhelper if available at compile time
|
Subject: use libnsssharedhelper if available at compile time
|
||||||
(can be disabled by exporting MOZ_FF_NO_NSSHELPER=1)
|
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
|
||||||
References:
|
References:
|
||||||
|
|
||||||
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
|
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
|
||||||
@ -122,7 +122,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
|
|||||||
- SECMOD_DB, init_flags);
|
- SECMOD_DB, init_flags);
|
||||||
+ SECStatus init_rv = SECFailure;
|
+ SECStatus init_rv = SECFailure;
|
||||||
+#ifdef MOZ_ENABLE_NSSHELPER
|
+#ifdef MOZ_ENABLE_NSSHELPER
|
||||||
+ if (PR_GetEnv("MOZ_FF_NO_NSSHELPER")) {
|
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
|
||||||
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
|
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
|
||||||
+ SECMOD_DB, init_flags);
|
+ SECMOD_DB, init_flags);
|
||||||
+ } else {
|
+ } else {
|
||||||
|
Loading…
Reference in New Issue
Block a user