summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2020-10-16 16:49:00 +0200
committerMartin Stransky <stransky@redhat.com>2020-10-16 16:49:00 +0200
commit712997a5f5a6548cd83b103b83b326e24dbcb69f (patch)
treed4ecc2379edd55d3f8211387893f951c4d3cc4c0
parentActually disable the LTO (diff)
downloadlibrewolf-fedora-ff-712997a5f5a6548cd83b103b83b326e24dbcb69f.tar.gz
librewolf-fedora-ff-712997a5f5a6548cd83b103b83b326e24dbcb69f.tar.bz2
librewolf-fedora-ff-712997a5f5a6548cd83b103b83b326e24dbcb69f.zip
Updated SELinux relabel setup (rhbz#1731371)
-rw-r--r--firefox.sh.in5
-rw-r--r--firefox.spec5
2 files changed, 7 insertions, 3 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 63c04cc..863ef1f 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -65,6 +65,7 @@ MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
+GETENFORCE_FILE="/usr/sbin/getenforce"
##
## Enable Wayland backend?
@@ -182,8 +183,8 @@ 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/* &
+ if [ -x $GETENFORCE_FILE ] && [`getenforce` != "Disabled" ]; then
+ (restorecon -vr ~/.mozilla/firefox/* &)
fi
fi
diff --git a/firefox.spec b/firefox.spec
index 8fe2e2f..413e07b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 82.0
-Release: 1%{?dist}
+Release: 2%{?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
@@ -979,6 +979,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu Oct 15 2020 Martin Stransky <stransky@redhat.com> - 82.0-2
+- Updated SELinux relabel setup (rhbz#1731371)
+
* Thu Oct 15 2020 Martin Stransky <stransky@redhat.com> - 82.0-1
- Updated to 82.0 Build 2
bgstack15