From 8582335d9cbf93b6426813be41b0ffc50338affe Mon Sep 17 00:00:00 2001 From: Paper Date: Wed, 21 Oct 2020 17:25:50 +0200 Subject: [PATCH] apparmor: update to 3.0.0 --- .../apparmor/files/profiles/usr.bin.dhcpcd | 2 +- srcpkgs/apparmor/files/profiles/usr.bin.nginx | 2 +- .../apparmor/files/profiles/usr.bin.php-fpm | 2 +- .../files/profiles/usr.bin.pulseaudio | 2 +- srcpkgs/apparmor/files/profiles/usr.bin.uuidd | 2 +- .../files/profiles/usr.bin.wpa_supplicant | 2 +- .../patches/correct_paths_logprofconf.patch | 60 ++++++++++++++----- srcpkgs/apparmor/template | 10 ++-- 8 files changed, 58 insertions(+), 24 deletions(-) diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd index 26364f36385..f4e0501ebf0 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd @@ -58,5 +58,5 @@ profile dhcpcd /{usr/,}bin/dhcpcd { owner @{PROC}/@{pid}/stat r, # Site-specific additions and overrides. See local/README for details. - #include + include if exists } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.nginx b/srcpkgs/apparmor/files/profiles/usr.bin.nginx index 5e4854d9032..1d06fecfc18 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.nginx +++ b/srcpkgs/apparmor/files/profiles/usr.bin.nginx @@ -30,5 +30,5 @@ /var/log/nginx/* w, # Site-specific additions and overrides. See local/README for details. - #include + include if exists } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm index 98366dcaabf..67a29f7bdc7 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm +++ b/srcpkgs/apparmor/files/profiles/usr.bin.php-fpm @@ -38,7 +38,7 @@ /var/log/php-fpm.log w, # Site-specific additions and overrides. See local/README for details. - #include + include if exists } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio index 4b17e6edc08..4ce35f699f9 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio +++ b/srcpkgs/apparmor/files/profiles/usr.bin.pulseaudio @@ -118,6 +118,6 @@ profile pulseaudio /usr/bin/pulseaudio { } # Site-specific additions and overrides. See local/README for details. - #include + include if exists } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd index 8c00a903611..bea18d5bff7 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.uuidd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.uuidd @@ -13,5 +13,5 @@ /run/uuidd/request rw, # Site-specific additions and overrides. See local/README for details. - #include + include if exists } diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant index df53acc82d6..d2336a6564e 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant +++ b/srcpkgs/apparmor/files/profiles/usr.bin.wpa_supplicant @@ -45,5 +45,5 @@ bus=system path=/fi/epitest/hostap/WPASupplicant/**, - #include + include if exists } diff --git a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch index 0f25758486a..fb6ce53ffdc 100644 --- a/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch +++ b/srcpkgs/apparmor/patches/correct_paths_logprofconf.patch @@ -1,5 +1,14 @@ +From 6f2649203d6bfc26b79f624b5b4625603923bccd Mon Sep 17 00:00:00 2001 +From: Paper +Date: Wed, 21 Oct 2020 10:20:47 +0200 +Subject: [PATCH] correct paths in logprof.conf + +--- + utils/logprof.conf | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + diff --git a/utils/logprof.conf b/utils/logprof.conf -index a3d7a31..296dd8b 100644 +index a778792..a9f7b79 100644 --- a/utils/logprof.conf +++ b/utils/logprof.conf @@ -14,7 +14,7 @@ @@ -11,19 +20,42 @@ index a3d7a31..296dd8b 100644 ldd = /usr/bin/ldd logger = /bin/logger /usr/bin/logger -@@ -36,10 +36,10 @@ - custom_includes = - +@@ -51,12 +51,10 @@ + /bin/mount = u + /usr/bin/mount = u + /etc/init.d/subdomain = u +- /sbin/cardmgr = u +- /usr/sbin/cardmgr = u +- /sbin/subdomain_parser = u +- /usr/sbin/subdomain_parser = u +- /usr/sbin/genprof = u +- /usr/sbin/logprof = u ++ /usr/bin/cardmgr = u ++ /usr/bin/subdomain_parser = u ++ /usr/bin/genprof = u ++ /usr/bin/logprof = u + /usr/lib/YaST2/servers_non_y2/ag_genprof = u + /usr/lib/YaST2/servers_non_y2/ag_logprof = u --[repository] -- distro = ubuntu-intrepid -- url = http://apparmor.test.opensuse.org/backend/api -- preferred_user = ubuntu -+#[repository] -+# distro = ubuntu-intrepid -+# url = http://apparmor.test.opensuse.org/backend/api -+# preferred_user = ubuntu +@@ -97,8 +95,7 @@ + /usr/bin/sed = icn + /bin/touch = icn + /usr/bin/touch = icn +- /sbin/killall5 = icn +- /usr/sbin/killall5 = icn ++ /usr/bin/killall5 = icn + /usr/bin/find = icn + /usr/bin/killall = icn + /usr/bin/nice = icn +@@ -112,6 +109,8 @@ + /usr/bin/python3.5 = icn + /usr/bin/python3.6 = icn + /usr/bin/python3.7 = icn ++ /usr/bin/python3.8 = icn ++ /usr/bin/python3.9 = icn + /usr/bin/tr = icn - [qualifiers] - # things will be painfully broken if bash has a profile + [required_hats] +-- +2.29.0 diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index b064f78086e..ea2e82742d9 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor -version=2.13.4 -revision=6 +version=3.0.0 +revision=1 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Olivier Mauras " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://gitlab.com/apparmor/apparmor" distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz" -checksum=4f45e5a5de59b72039c6cf218bb61cb4fc42eeb7f47ca109a58238896394a33b +checksum=8c440ab1848e723483a8550ed2889e18f322e9d7ee9eb4e2e712152ea61da68f patch_args="-Np1" if [ -z "$CROSS_BUILD" ]; then @@ -47,7 +47,9 @@ pre_build() { post_build() { cd ${wrksrc} - sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile + sed -i 's#SBINDIR=${DESTDIR}/usr/sbin#SBINDIR=${DESTDIR}/usr/bin#' binutils/Makefile + sed -i 's#SBINDIR=${DESTDIR}/usr/sbin#SBINDIR=${DESTDIR}/usr/bin#' utils/Makefile + sed -i 's#/sbin#/usr/bin#g' parser/Makefile make ${makejobs} -C binutils make ${makejobs} -C utils make ${makejobs} -C parser