summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec7
-rw-r--r--mozilla-1579023.patch23
2 files changed, 29 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index efe33ab..99767c0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -94,7 +94,7 @@ ExcludeArch: ppc64le
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 69.0
-Release: 2%{?pre_tag}%{?dist}
+Release: 3%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -151,6 +151,7 @@ Patch417: bug1375074-save-restore-x28.patch
Patch418: mozilla-1512162.patch
Patch419: mozilla-1568569.patch
Patch420: mozilla-1566876-webrtc-ind.patch
+Patch421: mozilla-1579023.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire.patch
@@ -364,6 +365,7 @@ This package contains results of tests executed during build.
%endif
%patch419 -p1 -b .1568569
%patch420 -p1 -b .1566876-webrtc-ind
+%patch421 -p1 -b .1579023
# Wayland specific upstream patches
%patch574 -p1 -b .firefox-pipewire
@@ -950,6 +952,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Mon Sep 9 2019 Martin Stransky <stransky@redhat.com> - 69.0-3
+- Added fix for mozbz#1579023
+
* Mon Sep 2 2019 Martin Stransky <stransky@redhat.com> - 69.0-2
- Added upstream Wayland patches (mozilla-1548475, mozilla-1562827,
mozilla-1567434, mozilla-1573813, mozilla-1574036,
diff --git a/mozilla-1579023.patch b/mozilla-1579023.patch
new file mode 100644
index 0000000..32881b9
--- /dev/null
+++ b/mozilla-1579023.patch
@@ -0,0 +1,23 @@
+diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
+--- a/security/manager/ssl/nsNSSComponent.cpp
++++ b/security/manager/ssl/nsNSSComponent.cpp
+@@ -683,10 +683,17 @@
+ AutoSECMODListReadLock secmodLock;
+ SECMODModuleList* list = SECMOD_GetDefaultModuleList();
+ while (list) {
+- if (SECMOD_HasRemovableSlots(list->module)) {
++ SECMODModule* module = list->module;
++ if (SECMOD_HasRemovableSlots(module)) {
+ *result = true;
+ return NS_OK;
+ }
++ for (int i = 0; i < module->slotCount; i++) {
++ if (!PK11_IsFriendly(module->slots[i])) {
++ *result = true;
++ return NS_OK;
++ }
++ }
+ list = list->next;
+ }
+ #endif
+
bgstack15