- rel 3; add run variable

diff --git a/apparmor-2.13.4-run_variable.patch b/apparmor-2.13.4-run_variable.patch
new file mode 100644 (file)
index 0000000..e3a59cf
--- /dev/null
+++ b/apparmor-2.13.4-run_variable.patch
@@ -0,0 +1,45 @@
+From 454fca7483eae7b7ee613343c2c02abaa20e37e3 Mon Sep 17 00:00:00 2001
+From: nl6720 <nl6720@gmail.com>
+Date: Thu, 13 Feb 2020 09:58:33 +0200
+Subject: [PATCH] Add "run" variable
+
+Signed-off-by: nl6720 <nl6720@gmail.com>
+(cherry picked from commit 452b5b8735e449cba29a1fb25c9bff38ba8763ec)
+---
+ parser/apparmor.d.pod               | 1 +
+ profiles/apparmor.d/tunables/global | 1 +
+ profiles/apparmor.d/tunables/run    | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 profiles/apparmor.d/tunables/run
+
+diff --git a/parser/apparmor.d.pod b/parser/apparmor.d.pod
+index 662830bd..59ac72c9 100644
+--- a/parser/apparmor.d.pod
++++ b/parser/apparmor.d.pod
+@@ -1279,6 +1279,7 @@ provided AppArmor policy:
+   @{apparmorfs}
+   @{sys}
+   @{tid}
++  @{run}
+   @{XDG_DESKTOP_DIR}
+   @{XDG_DOWNLOAD_DIR}
+   @{XDG_TEMPLATES_DIR}
+diff --git a/profiles/apparmor.d/tunables/global b/profiles/apparmor.d/tunables/global
+index 28d6fc6d..3b6f99cc 100644
+--- a/profiles/apparmor.d/tunables/global
++++ b/profiles/apparmor.d/tunables/global
+@@ -19,3 +19,4 @@
+ #include <tunables/kernelvars>
+ #include <tunables/xdg-user-dirs>
+ #include <tunables/share>
++#include <tunables/run>
+diff --git a/profiles/apparmor.d/tunables/run b/profiles/apparmor.d/tunables/run
+new file mode 100644
+index 00000000..e535d2fe
+--- /dev/null
++++ b/profiles/apparmor.d/tunables/run
+@@ -0,0 +1 @@
++@{run}=/run /var/run
+-- 
+2.26.2
+

diff --git a/apparmor-profiles.spec b/apparmor-profiles.spec
index 8afd1f8509cfeba90e12e9380f3975910186d29b..de677f1853ef19be15b20e38916481b64d08caba 100644 (file)
--- a/apparmor-profiles.spec
+++ b/apparmor-profiles.spec
@@ -2,13 +2,14 @@ Summary:      AppArmor profiles
 Summary(pl.UTF-8):     Profile AppArmor
 Name:          apparmor-profiles
 Version:       2.13.4
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL v2
 Group:         Base
 Source0:       http://launchpad.net/apparmor/2.13/%{version}/+download/apparmor-%{version}.tar.gz
 # Source0-md5: a50b793a3362551f07733be3df9c328f
 Patch0:                apparmor-2.13.4-fix_systemd_userdb.patch
+Patch1:                apparmor-2.13.4-run_variable.patch
 URL:           http://wiki.apparmor.net/
 Requires:      apparmor-parser
 Provides:      subdomain-profiles
@@ -61,6 +62,7 @@ Przykładowe profile AppArmor.
 %prep
 %setup -q -n apparmor-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/multiarch
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/ntpd
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/proc
+%config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/run
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/securityfs
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/sys
 %config(noreplace) %verify(not md5 mtime size) %{profiles_dir}/tunables/xdg-user-dirs