summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2020-09-23 09:49:57 +0200
committerMartin Stransky <stransky@redhat.com>2020-09-23 09:49:57 +0200
commitc8a56b17a2cb928e86bf4faf74938a64b25b302e (patch)
tree24cd0005cf411c6dacc7303af63fc9ec2b358848
parentRe-enable builds for armv7hl and aarch64 architectures (diff)
downloadlibrewolf-fedora-ff-c8a56b17a2cb928e86bf4faf74938a64b25b302e.tar.gz
librewolf-fedora-ff-c8a56b17a2cb928e86bf4faf74938a64b25b302e.tar.bz2
librewolf-fedora-ff-c8a56b17a2cb928e86bf4faf74938a64b25b302e.zip
Added fix for rhbz#1731371
-rw-r--r--firefox-vaapi-extra-frames.patch2
-rw-r--r--firefox.sh.in10
-rw-r--r--firefox.spec5
3 files changed, 13 insertions, 4 deletions
diff --git a/firefox-vaapi-extra-frames.patch b/firefox-vaapi-extra-frames.patch
index c2ed7a2..e26158a 100644
--- a/firefox-vaapi-extra-frames.patch
+++ b/firefox-vaapi-extra-frames.patch
@@ -10,5 +10,3 @@ diff -up firefox-76.0.1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.old fi
typedef mozilla::layers::Image Image;
typedef mozilla::layers::PlanarYCbCrImage PlanarYCbCrImage;
-diff -up firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-76.0.1/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-76.0.1/media/webrtc/trunk/Makefile.old firefox-76.0.1/media/webrtc/trunk/Makefile
diff --git a/firefox.sh.in b/firefox.sh.in
index 75148e5..63c04cc 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -174,11 +174,19 @@ MOZILLA_DOWN=0
if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
# Is firefox running?
- /__PREFIX__/bin/pidof firefox > /dev/null 2>&1
+ /__PREFIX__/bin/pidof $MOZ_PROGRAM > /dev/null 2>&1
MOZILLA_DOWN=$?
fi
fi
+# When Firefox is not running, restore SELinux labels for profile files
+# (rhbz#1731371)
+if [ $MOZILLA_DOWN -ne 0 ]; then
+ if [ `getenforce` != "Disabled" ]; then
+ restorecon -vr ~/.mozilla/firefox/* &
+ fi
+fi
+
# Modify language pack configuration only when firefox is not running
# and language packs are not disabled
if [ $MOZILLA_DOWN -ne 0 ]; then
diff --git a/firefox.spec b/firefox.spec
index a76ce91..3000bd1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -116,7 +116,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 81.0
-Release: 5%{?dist}
+Release: 6%{?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
@@ -974,6 +974,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Sep 23 2020 Martin Stransky <stransky@redhat.com> - 81.0-6
+- Added fix for rhbz#1731371
+
* Tue Sep 22 2020 Kalev Lember <klember@redhat.com> - 81.0-5
- Re-enable builds for armv7hl and aarch64 architectures
bgstack15