From a516810243d4c002c52fec169aeddda7e01d3a4dcd0da98fa38ad15e4520a32e Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 2 Apr 2013 20:03:24 +0000 Subject: [PATCH 1/3] Accepting request 162270 from home:cboltz - add Requires: insserv to parser package (needed by initscript) OBS-URL: https://build.opensuse.org/request/show/162270 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=36 --- apparmor.changes | 5 +++++ apparmor.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/apparmor.changes b/apparmor.changes index 81cc8bf..307266b 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 2 18:56:56 UTC 2013 - opensuse@cboltz.de + +- add Requires: insserv to parser package (needed by initscript) + ------------------------------------------------------------------- Tue Mar 5 17:49:42 UTC 2013 - opensuse@cboltz.de diff --git a/apparmor.spec b/apparmor.spec index 9992a41..0f42531 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -167,6 +167,9 @@ Provides: subdomain-parser-demo = %{version} Provides: subdomain_parser = %{version} Provides: apparmor-parser(CAP_SYSLOG) +# initscript needs /lib/lsb/init-functions from insserv/insserv-compat +Requires: insserv + %description parser The AppArmor Parser is a userlevel program that is used to load in program profiles to the AppArmor Security kernel module. From 2ea42efed0c45d6425c9511a3b79986162a2be0993f5b87ab9ae796e7a733752 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 13 May 2013 23:00:39 +0000 Subject: [PATCH 2/3] Accepting request 175273 from home:coolo:branches:openSUSE:Factory - do not package directories as %config - especially not as noreplace OBS-URL: https://build.opensuse.org/request/show/175273 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=37 --- apparmor.changes | 5 +++++ apparmor.spec | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/apparmor.changes b/apparmor.changes index 307266b..b4209e2 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 13 12:42:04 UTC 2013 - coolo@suse.com + +- do not package directories as %config - especially not as noreplace + ------------------------------------------------------------------- Tue Apr 2 18:56:56 UTC 2013 - opensuse@cboltz.de diff --git a/apparmor.spec b/apparmor.spec index 0f42531..0d3b0b0 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -643,8 +643,17 @@ fi %files profiles %defattr(644,root,root,755) %dir %{_sysconfdir}/apparmor.d/ -%config(noreplace) %{_sysconfdir}/apparmor.d/* -%exclude %{_sysconfdir}/apparmor.d/cache +%dir %{_sysconfdir}/apparmor.d/abstractions +%config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/* +%dir %{_sysconfdir}/apparmor.d/apache2.d +%config(noreplace) %{_sysconfdir}/apparmor.d/apache2.d/phpsysinfo +%config(noreplace) %{_sysconfdir}/apparmor.d/*.* +%dir %{_sysconfdir}/apparmor.d/local +%config(noreplace) %{_sysconfdir}/apparmor.d/local/* +%dir %{_sysconfdir}/apparmor.d/program-chunks +%config(noreplace) %{_sysconfdir}/apparmor.d/program-chunks/* +%dir %{_sysconfdir}/apparmor.d/tunables +%config(noreplace) %{_sysconfdir}/apparmor.d/tunables/* %dir %{_sysconfdir}/apparmor/ %dir %{_sysconfdir}/apparmor/profiles %config %{_sysconfdir}/apparmor/profiles/extras/ From 77f186fe2c883b7eadc2ae8efe730264a0e2519d23c2ae24c973ecb955658ea0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 13 May 2013 23:04:07 +0000 Subject: [PATCH 3/3] package /etc/apparmor.d/disable again (was lost in Coolo's SR) OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=38 --- apparmor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apparmor.spec b/apparmor.spec index 0d3b0b0..6aa44b0 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -646,6 +646,7 @@ fi %dir %{_sysconfdir}/apparmor.d/abstractions %config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/* %dir %{_sysconfdir}/apparmor.d/apache2.d +%dir %{_sysconfdir}/apparmor.d/disable %config(noreplace) %{_sysconfdir}/apparmor.d/apache2.d/phpsysinfo %config(noreplace) %{_sysconfdir}/apparmor.d/*.* %dir %{_sysconfdir}/apparmor.d/local