From 67def8ac08d0ef8b87c89648023637ef200df271 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Thu, 2 Jun 2022 15:19:59 +0300 Subject: [PATCH] apparmor: update to 3.0.4. --- .../apparmor/patches/fix_logprofconf.patch | 10 --- srcpkgs/apparmor/patches/python-3.10.patch | 84 ------------------- .../apparmor/patches/python-distutils.patch | 13 --- srcpkgs/apparmor/template | 9 +- 4 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 srcpkgs/apparmor/patches/python-3.10.patch delete mode 100644 srcpkgs/apparmor/patches/python-distutils.patch diff --git a/srcpkgs/apparmor/patches/fix_logprofconf.patch b/srcpkgs/apparmor/patches/fix_logprofconf.patch index 62de9909717e..9b0101181ba6 100644 --- a/srcpkgs/apparmor/patches/fix_logprofconf.patch +++ b/srcpkgs/apparmor/patches/fix_logprofconf.patch @@ -63,13 +63,3 @@ modify logprof.conf for Void Linux # these ones shouln't have their own profiles /bin/awk = icn -@@ -112,6 +113,9 @@ - /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/python3.10 = icn - /usr/bin/tr = icn - - [required_hats] diff --git a/srcpkgs/apparmor/patches/python-3.10.patch b/srcpkgs/apparmor/patches/python-3.10.patch deleted file mode 100644 index 90d176d3b8c2..000000000000 --- a/srcpkgs/apparmor/patches/python-3.10.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ea7b201ba48b87469297d58751c57b03ceb82320 Mon Sep 17 00:00:00 2001 -From: Christian Boltz -Date: Wed, 11 Aug 2021 21:37:40 +0200 -Subject: [PATCH] Update abstractions/python and profiles for python 3.10 - -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187 ---- - profiles/apparmor.d/abstractions/python | 18 +++++++++--------- - profiles/apparmor.d/lsb_release | 2 +- - .../profiles/extras/usr.bin.chromium-browser | 4 ++-- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/profiles/apparmor.d/abstractions/python b/profiles/apparmor.d/abstractions/python -index 1b5cc9d0d..727030bdf 100644 ---- a/profiles/apparmor.d/abstractions/python -+++ b/profiles/apparmor.d/abstractions/python -@@ -12,18 +12,18 @@ - - abi , - -- /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so} mr, -- /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth} r, -- /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r, -+ /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{pyc,so} mr, -+ /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{egg,py,pth} r, -+ /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/{site,dist}-packages/ r, - /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so mr, - -- /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so} mr, -- /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth} r, -- /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r, -- /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so mr, -+ /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{pyc,so} mr, -+ /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{egg,py,pth} r, -+ /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/{site,dist}-packages/ r, -+ /usr/local/lib{,32,64}/python3.{1,}[0-9]/lib-dynload/*.so mr, - - # Site-wide configuration -- /etc/python{2.[4-7],3.[0-9]}/** r, -+ /etc/python{2.[4-7],3.[0-9],3.1[0-9]}/** r, - - # shared python paths - /usr/share/{pyshared,pycentral,python-support}/** r, -@@ -36,7 +36,7 @@ - /usr/lib/wx/python/*.pth r, - - # python build configuration and headers -- /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r, -+ /usr/include/python{2.[4-7],3.[0-9],3.1[0-9]}*/pyconfig.h r, - - # Include additions to the abstraction - include if exists -diff --git a/profiles/apparmor.d/lsb_release b/profiles/apparmor.d/lsb_release -index 33a1c71db..ad8b998fc 100644 ---- a/profiles/apparmor.d/lsb_release -+++ b/profiles/apparmor.d/lsb_release -@@ -18,7 +18,7 @@ profile lsb_release { - /dev/tty rw, - - /usr/bin/lsb_release r, -- /usr/bin/python3.[0-9] mr, -+ /usr/bin/python3.{1,}[0-9] mr, - - /etc/debian_version r, - /etc/default/apport r, -diff --git a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser -index 2df5338db..b47b6f721 100644 ---- a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser -+++ b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser -@@ -267,9 +267,9 @@ profile chromium_browser /usr/lib/@{chromium}/@{chromium} flags=(attach_disconne - /usr/share/distro-info/** r, - /var/lib/dpkg/** r, - -- /usr/local/lib/python3.[0-9]/dist-packages/ r, -+ /usr/local/lib/python3.{1,}[0-9]/dist-packages/ r, - /usr/bin/ r, -- /usr/bin/python3.[0-9] mr, -+ /usr/bin/python3.{1,}[0-9] mr, - } - - profile sandbox { --- -GitLab - diff --git a/srcpkgs/apparmor/patches/python-distutils.patch b/srcpkgs/apparmor/patches/python-distutils.patch deleted file mode 100644 index 9c22c7f11649..000000000000 --- a/srcpkgs/apparmor/patches/python-distutils.patch +++ /dev/null @@ -1,13 +0,0 @@ -distutils is deprecated in python 3.10, which means it imports but prints warnings - ---- a/libraries/libapparmor/m4/ac_python_devel.m4 -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 -@@ -69,7 +69,7 @@ - # Check if you have distutils, else fail - # - AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -+ ac_distutils_result=`$PYTHON -W ignore -c "import distutils" 2>&1` - if test -z "$ac_distutils_result"; then - AC_MSG_RESULT([yes]) - else diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 64140c0dbc5c..2341c88f8606 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,13 +1,14 @@ # Template file for 'apparmor' pkgname=apparmor -version=3.0.3 -revision=2 +version=3.0.4 +revision=1 wrksrc="${pkgname}-v${version}" build_wrksrc=libraries/libapparmor build_style=gnu-configure conf_files="/etc/apparmor.d/local/* /etc/apparmor/*" make_dirs="/etc/apparmor.d/disable 0755 root root" -hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which" +hostmakedepends="bison flex autoconf automake libtool gettext swig python3 + python3-setuptools which" makedepends="perl python3-devel" depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2 python3-psutil python3-dbus iproute2 which" @@ -18,7 +19,7 @@ license="GPL-2.0-only" homepage="https://gitlab.com/apparmor/apparmor" changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}" distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz" -checksum=51b1db60e962dd01856a1ec6a9d43b11ed4350dcc5738ef901097c999bcbf50e +checksum=85dd3aaaf6f5358db723c24c4f74fd2b2ffe99f76f3ac6d188c4e3b048a53346 replaces="apparmor-vim>=0" if [ -z "$CROSS_BUILD" ]; then