diff --git a/apparmor.changes b/apparmor.changes index 585be86..5333613 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 10 09:49:17 UTC 2018 - Petr Vorel + +- Backport dnsmasq fix: + 025c7dc6 ("dnsmasq: Add permission to open log files") + (boo#1111342) + ------------------------------------------------------------------- Wed Aug 22 11:32:59 UTC 2018 - suse-beta@cboltz.de diff --git a/apparmor.spec b/apparmor.spec index 02909bc..d265b31 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -77,6 +77,9 @@ Patch11: fix-samba-profiles.patch # SR 629206 - make pyflakes 2.0 happy (unused variable) Patch12: make-pyflakes-happy.diff +# boo#1111342 Backport fix for dnsmasq into Tumbleweed (add permission to open log files) +Patch13: dnsmasq-Add-permission-to-open-log-files.patch + PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix /lib/apparmor @@ -369,6 +372,7 @@ SubDomain. %patch10 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build export SUSE_ASNEEDED=0 diff --git a/dnsmasq-Add-permission-to-open-log-files.patch b/dnsmasq-Add-permission-to-open-log-files.patch new file mode 100644 index 0000000..bf11f0e --- /dev/null +++ b/dnsmasq-Add-permission-to-open-log-files.patch @@ -0,0 +1,28 @@ +From 025c7dc6a131da24c31e41ad32753015a0ec0f76 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Mon, 8 Oct 2018 16:44:01 +0200 +Subject: [PATCH] dnsmasq: Add permission to open log files + +--log-facility option needs to have permission to open files. +Use '*' to allow using more files (for using more dnsmasq instances). + +Signed-off-by: Petr Vorel +Signed-off-by: Jamie Strandboge +Signed-off-by: Steve Beattie +--- + profiles/apparmor.d/usr.sbin.dnsmasq | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/profiles/apparmor.d/usr.sbin.dnsmasq b/profiles/apparmor.d/usr.sbin.dnsmasq +index 2b4b1bfc..f2e6847d 100644 +--- a/profiles/apparmor.d/usr.sbin.dnsmasq ++++ b/profiles/apparmor.d/usr.sbin.dnsmasq +@@ -43,6 +43,8 @@ + + /usr/sbin/dnsmasq mr, + ++ /var/log/*dnsmasq.log w, ++ + /{,var/}run/*dnsmasq*.pid w, + /{,var/}run/dnsmasq-forwarders.conf r, + /{,var/}run/dnsmasq/ r,