Update to 91.3. Remove upstreamed mozilla-bmo1735309.patch and rebase…

… mozilla-sandbox-fips.patch
openSUSE · Nov 9, 2021 · 71a2d2c · 71a2d2c
1 parent b77a61a
commit 71a2d2c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 356 deletions.
diff --git a/firefox/MozillaFirefox.spec b/firefox/MozillaFirefox.spec
@@ -28,8 +28,8 @@
 # major 69
 # mainver %major.99
 %define major          91
-%define mainver        %major.2.0
-%define orig_version   91.2.0
+%define mainver        %major.3.0
+%define orig_version   91.3.0
 %define orig_suffix    esr
 %define update_channel release
 %define branding       1
@@ -229,7 +229,6 @@ Patch26:        mozilla-bmo1626236.patch
 Patch27:        mozilla-s390x-skia-gradient.patch
 Patch28:        mozilla-libavcodec58_91.patch
 Patch29:        mozilla-silence-no-return-type.patch
-Patch30:        mozilla-bmo1735309.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -359,7 +358,6 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1

diff --git a/firefox/mozilla-bmo1735309.patch b/firefox/mozilla-bmo1735309.patch
diff --git a/firefox/tar_stamps b/firefox/tar_stamps
@@ -1,10 +1,10 @@
 PRODUCT="firefox"
 CHANNEL="release"
-VERSION="91.2.0"
+VERSION="91.3.0"
 VERSION_SUFFIX="esr"
-PREV_VERSION="91.1.0"
+PREV_VERSION="91.2.0"
 PREV_VERSION_SUFFIX="esr"
 #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
 RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-esr91"
-RELEASE_TAG="5d4ad120b8d41af6d9452a0572e774865f110e0e"
-RELEASE_TIMESTAMP="20210927140538"
+RELEASE_TAG="8802d620459d50ea648821a15497d06efd15732b"
+RELEASE_TIMESTAMP="20211028170545"
diff --git a/mozilla-bmo1735309.patch b/mozilla-bmo1735309.patch
diff --git a/mozilla-sandbox-fips.patch b/mozilla-sandbox-fips.patch
@@ -10,8 +10,8 @@ diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox
 @@ -655,6 +655,7 @@ void SetMediaPluginSandbox(const char* a
    auto files = new SandboxOpenedFiles();
    files->Add(std::move(plugin));
-   files->Add("/dev/urandom", true);
-+  files->Add("/dev/random", true);
+   files->Add("/dev/urandom", SandboxOpenedFile::Dup::YES);
++  files->Add("/dev/random", SandboxOpenedFile::Dup::YES);
    files->Add("/etc/ld.so.cache");  // Needed for NSS in clearkey.
    files->Add("/sys/devices/system/cpu/cpu0/tsc_freq_khz");
    files->Add("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq");