From: Michal Vasilek Date: Fri, 12 Nov 2021 16:02:51 +0000 (+0100) Subject: apparmor: cleanup X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=aae551544bcd4c49a203a2ad0406b17bacd1b8cc;p=feed%2Fpackages.git apparmor: cleanup * replace 020-fix-ss-path.patch with an upstream patch 020-remove-which-dep.patch * remove 030-remove-pynotify2-dep.patch and do not install aa-notify * simplify 060-openwrt-dnsmasq-profile.patch * add two upstream patches for Python 3.10 compatibility * add an upstream patch to move from deprecated distutils which broke the build with Python 3.10+ Signed-off-by: Michal Vasilek --- diff --git a/utils/apparmor/Makefile b/utils/apparmor/Makefile index 6a100aabc0..3073fb6051 100644 --- a/utils/apparmor/Makefile +++ b/utils/apparmor/Makefile @@ -6,10 +6,10 @@ PKG_NAME:=apparmor PKG_VERSION:=3.0.3 PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitlab.com/apparmor/apparmor.git -PKG_SOURCE_VERSION:=0325ba06da6eeb5acf3e568063a08136fd0913e0 -PKG_MIRROR_HASH:=2c8f4607b9936f401a3fcb92cbc3627dc5b551fbde089162172e1801faba68bc +PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://gitlab.com/apparmor/apparmor/-/archive/v$(PKG_VERSION) +PKG_HASH:=66db49cc578e6a85ba2fc350507ad1741d2534cdfc7ed71a81261f84d6e2262d +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE @@ -168,13 +168,15 @@ endef define Package/python3-apparmor/install $(INSTALL_DIR) \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages \ - $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor - $(INSTALL_DATA) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/*.egg-info \ - $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info $(INSTALL_DATA) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/*.py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor $(INSTALL_BIN) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/*.so \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)-libapparmor/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/* \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/ $(LN) -s _LibAppArmor.cpython-$(PYTHON3_VERSION_MAJOR)$(PYTHON3_VERSION_MINOR).so \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/LibAppArmor/_LibAppArmor.so endef @@ -187,18 +189,21 @@ define Package/apparmor-utils/install $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/etc/apparmor/severity.db $(1)/etc/apparmor/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)-utils/sbin/apparmor_parser $(1)/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)-utils/usr/bin/{aa-exec,aa-easyprof,aa-enabled,aa-features-abi} $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)-utils/usr/sbin/{aa-audit,aa-autodep,aa-cleanprof,aa-complain,aa-decode,aa-disable,aa-enforce,aa-genprof,aa-logprof,aa-mergeprof,aa-notify,aa-remove-unknown,aa-status,aa-unconfined} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)-utils/usr/sbin/{aa-audit,aa-autodep,aa-cleanprof,aa-complain,aa-decode,aa-disable,aa-enforce,aa-genprof,aa-logprof,aa-mergeprof,aa-remove-unknown,aa-status,aa-unconfined} $(1)/usr/sbin/ $(LN) aa-status $(1)/usr/sbin/apparmor_status $(INSTALL_DIR) $(1)/usr/share/apparmor/easyprof/templates $(1)/usr/share/apparmor/easyprof/policygroups $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/share/apparmor/easyprof/templates/* $(1)/usr/share/apparmor/easyprof/templates/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/share/apparmor/easyprof/policygroups/* $(1)/usr/share/apparmor/easyprof/policygroups/ - $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule - $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/*.egg-info \ - $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ + $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/*.py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule/*.py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule + $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/* \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor-$(PKG_VERSION)-py$(PYTHON3_VERSION).egg-info/ $(INSTALL_DIR) $(1)/etc/init.d $(1)/lib/functions $(INSTALL_BIN) ./files/apparmor.sh $(1)/lib/functions/ $(INSTALL_BIN) ./files/apparmor.init $(1)/etc/init.d/apparmor diff --git a/utils/apparmor/patches/020-fix-ss-path.patch b/utils/apparmor/patches/020-fix-ss-path.patch deleted file mode 100644 index 11e53b0219..0000000000 --- a/utils/apparmor/patches/020-fix-ss-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/utils/aa-unconfined -+++ b/utils/aa-unconfined -@@ -118,7 +118,7 @@ def read_proc_current(filename): - pids = set() - if paranoid: - pids = get_all_pids() --elif args.with_ss or (not args.with_netstat and (os.path.exists('/bin/ss') or os.path.exists('/usr/bin/ss'))): -+elif args.with_ss or (not args.with_netstat and (os.path.exists('/usr/sbin/ss') or os.path.exists('/bin/ss') or os.path.exists('/usr/bin/ss') or os.path.exists('/sbin/ss'))): - pids = get_pids_ss() - else: - pids = get_pids_netstat() diff --git a/utils/apparmor/patches/020-remove-which-dep.patch b/utils/apparmor/patches/020-remove-which-dep.patch new file mode 100644 index 0000000000..07b481d34c --- /dev/null +++ b/utils/apparmor/patches/020-remove-which-dep.patch @@ -0,0 +1,92 @@ +From c31d49234f0c7a81b69d525e249b154e11c486a9 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Thu, 12 Aug 2021 15:57:01 +0200 +Subject: [PATCH] utils: use internal which implementation + +* removes runtime dependency on which +* fixes aa-unconfined when ss is installed outside {/usr,}/bin + +Signed-off-by: Michal Vasilek +--- + utils/aa-unconfined | 2 +- + utils/apparmor/easyprof.py | 8 +++----- + utils/apparmor/sandbox.py | 10 ++++------ + 3 files changed, 8 insertions(+), 12 deletions(-) + +--- a/utils/aa-unconfined ++++ b/utils/aa-unconfined +@@ -116,7 +116,7 @@ def read_proc_current(filename): + pids = set() + if paranoid: + pids = get_all_pids() +-elif args.with_ss or (not args.with_netstat and (os.path.exists('/bin/ss') or os.path.exists('/usr/bin/ss'))): ++elif args.with_ss or (not args.with_netstat and (aa.which("ss") is not None)): + pids = get_pids_ss() + else: + pids = get_pids_netstat() +--- a/utils/apparmor/easyprof.py ++++ b/utils/apparmor/easyprof.py +@@ -22,6 +22,8 @@ import subprocess + import sys + import tempfile + ++from apparmor.aa import which ++ + # + # TODO: move this out to the common library + # +@@ -294,13 +296,9 @@ class AppArmorEasyProfile: + if os.path.isfile(self.conffile): + self._get_defaults() + +- self.parser_path = '/sbin/apparmor_parser' ++ self.parser_path = which('apparmor_parser') + if opt.parser_path: + self.parser_path = opt.parser_path +- elif not os.path.exists(self.parser_path): +- rc, self.parser_path = cmd(['which', 'apparmor_parser']) +- if rc != 0: +- self.parser_path = None + + self.parser_base = "/etc/apparmor.d" + if opt.parser_base: +--- a/utils/apparmor/sandbox.py ++++ b/utils/apparmor/sandbox.py +@@ -9,6 +9,7 @@ + # ------------------------------------------------------------------ + + from apparmor.common import AppArmorException, debug, error, msg, cmd ++from apparmor.aa import which + import apparmor.easyprof + import optparse + import os +@@ -31,8 +32,7 @@ def check_requirements(binary): + + for e in exes: + debug("Searching for '%s'" % e) +- rc, report = cmd(['which', e]) +- if rc != 0: ++ if which(e) is None: + error("Could not find '%s'" % e, do_exit=False) + return False + +@@ -306,8 +306,7 @@ class SandboxXephyr(SandboxXserver): + def start(self): + for e in ['Xephyr', 'matchbox-window-manager']: + debug("Searching for '%s'" % e) +- rc, report = cmd(['which', e]) +- if rc != 0: ++ if which(e) is None: + raise AppArmorException("Could not find '%s'" % e) + + '''Run any setup code''' +@@ -567,8 +566,7 @@ EndSection + + def start(self): + debug("Searching for '%s'" % 'xpra') +- rc, report = cmd(['which', 'xpra']) +- if rc != 0: ++ if which('xpra') is None: + raise AppArmorException("Could not find '%s'" % 'xpra') + + if self.driver == "xdummy": diff --git a/utils/apparmor/patches/030-remove-pynotify2-dep.patch b/utils/apparmor/patches/030-remove-pynotify2-dep.patch deleted file mode 100644 index 7de4ddc1e1..0000000000 --- a/utils/apparmor/patches/030-remove-pynotify2-dep.patch +++ /dev/null @@ -1,416 +0,0 @@ ---- a/utils/aa-notify -+++ b/utils/aa-notify -@@ -13,17 +13,6 @@ - # - # ---------------------------------------------------------------------- - # --# /etc/apparmor/notify.conf: --# # set to 'yes' to enable AppArmor DENIED notifications --# show_notifications="yes" --# --# # only people in use_group can run this script --# use_group="admin" --# --# $HOME/.apparmor/notify.conf can have: --# # set to 'yes' to enable AppArmor DENIED notifications --# show_notifications="yes" --# - # In a typical desktop environment one would run as a service the - # command: - # /usr/bin/aa-notify -p -w 10 -@@ -35,7 +24,6 @@ import re - import sys - import time - import struct --import notify2 - import psutil - import pwd - import grp -@@ -60,56 +48,9 @@ def get_user_login(): - username = os.getlogin() - return username - -- --def get_last_login_timestamp(username): -- '''Directly read wtmp and get last login for user as epoch timestamp''' -- timestamp = 0 -- filename = '/var/log/wtmp' -- last_login = 0 -- -- debug_logger.debug('Username: {}'.format(username)) -- -- with open(filename, "rb") as wtmp_file: -- offset = 0 -- wtmp_filesize = os.path.getsize(filename) -- debug_logger.debug('WTMP filesize: {}'.format(wtmp_filesize)) -- while offset < wtmp_filesize: -- wtmp_file.seek(offset) -- offset += 384 # Increment for next entry -- -- type = struct.unpack(", -+ -+include -+ -+@{TFTP_DIR} = /srv/tftp /srv/tftpboot /var/tftp -+ - # ------------------------------------------------------------------ - # - # Copyright (C) 2009 John Dong -@@ -9,126 +16,95 @@ - # - # ------------------------------------------------------------------ - --abi , -- --@{TFTP_DIR}=/var/tftp /srv/tftp /srv/tftpboot - --include - profile dnsmasq /usr/{bin,sbin}/dnsmasq flags=(attach_disconnected) { +@@ -18,6 +18,7 @@ profile dnsmasq /usr/{bin,sbin}/dnsmasq include include include + include -+ include if exists capability chown, -+ capability dac_override, -+ capability net_admin, # for DHCP server capability net_bind_service, -+ capability net_raw, # for DHCP server ping checks - capability setgid, - capability setuid, -- capability dac_override, -- capability net_admin, # for DHCP server -- capability net_raw, # for DHCP server ping checks -+ - network inet raw, - network inet6 raw, - -- signal (receive) peer=/usr/{bin,sbin}/libvirtd, -- signal (receive) peer=libvirtd, -- ptrace (readby) peer=/usr/{bin,sbin}/libvirtd, -- ptrace (readby) peer=libvirtd, -+ signal receive peer=/usr/{bin,sbin}/libvirtd, -+ signal receive peer=libvirtd, +@@ -38,6 +39,8 @@ profile dnsmasq /usr/{bin,sbin}/dnsmasq -- owner /dev/tty rw, -+ ptrace readby peer=/usr/{bin,sbin}/libvirtd, -+ ptrace readby peer=libvirtd, + @{PROC}/@{pid}/fd/ r, -- @{PROC}/@{pid}/fd/ r, -- -- /etc/dnsmasq.conf r, -- /etc/dnsmasq.d/ r, -- /etc/dnsmasq.d/* r, -- /etc/dnsmasq.d-available/ r, -- /etc/dnsmasq.d-available/* r, -- /etc/ethers r, -- /etc/NetworkManager/dnsmasq.d/ r, -- /etc/NetworkManager/dnsmasq.d/* r, - /etc/NetworkManager/dnsmasq-shared.d/ r, - /etc/NetworkManager/dnsmasq-shared.d/* r, -+ /etc/NetworkManager/dnsmasq.d/ r, -+ /etc/NetworkManager/dnsmasq.d/* r, - /etc/dnsmasq-conf.conf r, - /etc/dnsmasq-resolv.conf r, -- -- /usr/{bin,sbin}/dnsmasq mr, -- -- /var/log/dnsmasq*.log w, -- -+ /etc/dnsmasq.conf r, -+ /etc/dnsmasq.d-available/ r, -+ /etc/dnsmasq.d-available/* r, -+ /etc/dnsmasq.d/ r, -+ /etc/dnsmasq.d/* r, -+ /etc/ethers r, + /tmp/** r, -+ /usr/libexec/libvirt_leaseshelper Cx -> libvirt_leaseshelper, -+ /usr/lib{,64}/libvirt/libvirt_leaseshelper Cx -> libvirt_leaseshelper, - /usr/share/dnsmasq{-base,}/ r, - /usr/share/dnsmasq{-base,}/* r, -- -- @{run}/*dnsmasq*.pid w, -- @{run}/dnsmasq-forwarders.conf r, -- @{run}/dnsmasq/ r, -- @{run}/dnsmasq/* rw, -- -+ /usr/{bin,sbin}/dnsmasq mr, -+ /var/lib/NetworkManager/dnsmasq-*.leases rw, -+ /var/lib/libvirt/dnsmasq/ r, -+ /var/lib/libvirt/dnsmasq/* r, -+ /var/lib/lxd-bridge/dnsmasq.*.leases rw, -+ /var/lib/lxd/networks/*/dnsmasq.* r, -+ /var/lib/lxd/networks/*/dnsmasq.leases rw, -+ /var/lib/lxd/networks/*/dnsmasq.pid rw, -+ /var/lib/misc/dnsmasq.*.leases rw, - /var/lib/misc/dnsmasq.leases rw, # Required only for DHCP server usage -- -+ /var/log/dnsmasq*.log w, - /{,usr/}bin/{ba,da,}sh ix, # Required to execute --dhcp-script argument -- -- # access to iface mtu needed for Router Advertisement messages in IPv6 -- # Neighbor Discovery protocol (RFC 2461) -+ @{PROC}/@{pid}/fd/ r, - @{PROC}/sys/net/ipv6/conf/*/mtu r, -- -- # for the read-only TFTP server - @{TFTP_DIR}/ r, - @{TFTP_DIR}/** r, -- -- # libvirt config and hosts file for dnsmasq -- /var/lib/libvirt/dnsmasq/ r, -- /var/lib/libvirt/dnsmasq/* r, -- -- # libvirt pid files for dnsmasq -- @{run}/libvirt/network/ r, -+ @{run}/*dnsmasq*.pid w, -+ @{run}/NetworkManager/NetworkManager.pid w, -+ @{run}/NetworkManager/dnsmasq.conf r, -+ @{run}/NetworkManager/dnsmasq.pid w, -+ @{run}/dnsmasq-forwarders.conf r, -+ @{run}/dnsmasq/ r, -+ @{run}/dnsmasq/* rw, -+ @{run}/libvirt/network/ r, - @{run}/libvirt/network/*.pid rw, -- -- # libvirt lease helper -- /usr/lib{,64}/libvirt/libvirt_leaseshelper Cx -> libvirt_leaseshelper, -- /usr/libexec/libvirt_leaseshelper Cx -> libvirt_leaseshelper, -- -- # lxc-net pid and lease files -- @{run}/lxc/dnsmasq.pid rw, -- /var/lib/misc/dnsmasq.*.leases rw, -- -- # lxd-bridge pid and lease files -- @{run}/lxd-bridge/dnsmasq.pid rw, -- /var/lib/lxd-bridge/dnsmasq.*.leases rw, -- /var/lib/lxd/networks/*/dnsmasq.* r, -- /var/lib/lxd/networks/*/dnsmasq.leases rw, -- /var/lib/lxd/networks/*/dnsmasq.pid rw, -- -- # NetworkManager integration -- /var/lib/NetworkManager/dnsmasq-*.leases rw, -+ @{run}/lxc/dnsmasq.pid rw, -+ @{run}/lxd-bridge/dnsmasq.pid rw, - @{run}/nm-dns-dnsmasq.conf r, - @{run}/nm-dnsmasq-*.pid rw, - @{run}/sendsigs.omit.d/*dnsmasq.pid w, -- @{run}/NetworkManager/dnsmasq.conf r, -- @{run}/NetworkManager/dnsmasq.pid w, -- @{run}/NetworkManager/NetworkManager.pid w, -+ owner /dev/tty rw, + - - profile libvirt_leaseshelper { - include - - /etc/libnl-3/classid r, -- -- /usr/lib{,64}/libvirt/libvirt_leaseshelper m, - /usr/libexec/libvirt_leaseshelper m, -- -- owner @{PROC}/@{pid}/net/psched r, -- owner @{PROC}/@{pid}/status r, -- -+ /usr/lib{,64}/libvirt/libvirt_leaseshelper m, -+ /var/lib/libvirt/dnsmasq/*.leases rw, -+ /var/lib/libvirt/dnsmasq/*.status* rw, -+ @{run}/leaseshelper.pid rwk, - @{sys}/devices/system/cpu/ r, - @{sys}/devices/system/node/ r, - @{sys}/devices/system/node/*/meminfo r, -+ owner @{PROC}/@{pid}/net/psched r, -+ owner @{PROC}/@{pid}/status r, - -- # libvirt lease and status files for dnsmasq -- /var/lib/libvirt/dnsmasq/*.leases rw, -- /var/lib/libvirt/dnsmasq/*.status* rw, -- -- @{run}/leaseshelper.pid rwk, - } -- -- # Site-specific additions and overrides. See local/README for details. -- include if exists - } + /etc/dnsmasq.conf r, + /etc/dnsmasq.d/ r, + /etc/dnsmasq.d/* r, diff --git a/utils/apparmor/patches/070-python-3.10.patch b/utils/apparmor/patches/070-python-3.10.patch new file mode 100644 index 0000000000..8e80dea0c3 --- /dev/null +++ b/utils/apparmor/patches/070-python-3.10.patch @@ -0,0 +1,81 @@ +From 6cfc6eeec22d3c9ffae413819654359b76680150 Mon Sep 17 00:00:00 2001 +From: John Johansen +Date: Fri, 13 Aug 2021 20:13:59 +0000 +Subject: [PATCH] Merge Update abstractions/python and profiles for python 3.10 + +Add support for python 3.10 in abstractions and profiles. + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/783 +Acked-by: John Johansen +(cherry picked from commit 31fda3eee7b1e5f936b31d3578ed596789d5fcce) +Signed-off-by: John Johansen +--- + 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(-) + +--- 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 +--- 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, +--- 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/@{chro + /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 { diff --git a/utils/apparmor/patches/070-systemd.patch b/utils/apparmor/patches/070-systemd.patch deleted file mode 100644 index 667f270b89..0000000000 --- a/utils/apparmor/patches/070-systemd.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -351,7 +351,7 @@ install-redhat: - install -m 755 rc.apparmor.$(subst install-,,$@) $(DESTDIR)/etc/init.d/apparmor - - .PHONY: install-suse --install-suse: install-systemd -+install-suse: - install -m 755 -d $(SBINDIR) - ln -sf service $(SBINDIR)/rcapparmor - -@@ -413,14 +413,6 @@ install-indep: indep - $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} - $(MAKE) install_manpages DESTDIR=${DESTDIR} - --.PHONY: install-systemd --install-systemd: -- install -m 755 -d $(SYSTEMD_UNIT_DIR) -- install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR) -- install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX) -- install -m 755 -d $(USR_SBINDIR) -- install -m 755 aa-teardown $(USR_SBINDIR) -- - ifndef VERBOSE - .SILENT: clean - endif diff --git a/utils/apparmor/patches/080-add-new-python-versions-to-logprof-conf.patch b/utils/apparmor/patches/080-add-new-python-versions-to-logprof-conf.patch new file mode 100644 index 0000000000..cdee6cc559 --- /dev/null +++ b/utils/apparmor/patches/080-add-new-python-versions-to-logprof-conf.patch @@ -0,0 +1,38 @@ +From 06dc32a9f3ede351c46167afa5002a0fe062c0f7 Mon Sep 17 00:00:00 2001 +From: Steve Beattie +Date: Thu, 26 Aug 2021 17:43:43 +0000 +Subject: [PATCH] utils: Add new python versions to logprof.conf + +Adding everything up to 3.19 should make the file future-proof for a +while ;-) + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/193 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/795 +Acked-by: Steve Beattie +(cherry picked from commit 4559a2997cf162b0f54f602180fd352e8d2486c1) +Signed-off-by: Steve Beattie +--- + utils/logprof.conf | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/utils/logprof.conf ++++ b/utils/logprof.conf +@@ -112,6 +112,18 @@ + /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/python3.11 = icn ++ /usr/bin/python3.12 = icn ++ /usr/bin/python3.13 = icn ++ /usr/bin/python3.14 = icn ++ /usr/bin/python3.15 = icn ++ /usr/bin/python3.16 = icn ++ /usr/bin/python3.17 = icn ++ /usr/bin/python3.18 = icn ++ /usr/bin/python3.19 = icn + /usr/bin/tr = icn + + [required_hats] diff --git a/utils/apparmor/patches/090-setuptools.patch b/utils/apparmor/patches/090-setuptools.patch new file mode 100644 index 0000000000..b5f9db3863 --- /dev/null +++ b/utils/apparmor/patches/090-setuptools.patch @@ -0,0 +1,254 @@ +From ab4cfb5e84a95decd06487dc4e59827ddb8ce79d Mon Sep 17 00:00:00 2001 +From: Georgia Garcia +Date: Wed, 10 Nov 2021 19:50:35 +0000 +Subject: [PATCH] replace deprecated distutils with setuptools + +Adds python3 setuptools as a build dependency for libapparmor + +Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 +MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 +Signed-off-by: Georgia Garcia +Acked-by: Christian Boltz +(cherry picked from commit 21e5a721ab2abe26bb12b9da7accc39d4fff9804) +Signed-off-by: John Johansen +--- + .gitignore | 3 ++ + .gitlab-ci.yml | 2 +- + libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- + libraries/libapparmor/swig/python/Makefile.am | 2 +- + libraries/libapparmor/swig/python/setup.py.in | 2 +- + .../libapparmor/swig/python/test/Makefile.am | 2 +- + profiles/Makefile | 2 +- + utils/Makefile | 1 + + utils/python-tools-setup.py | 6 ++-- + utils/test/Makefile | 2 +- + utils/test/README.md | 18 ++++++++++ + 11 files changed, 49 insertions(+), 27 deletions(-) + create mode 100644 utils/test/README.md + +--- a/.gitignore ++++ b/.gitignore +@@ -159,6 +159,7 @@ libraries/libapparmor/swig/perl/libappar + libraries/libapparmor/swig/perl/libapparmor_wrap.o + libraries/libapparmor/swig/perl/pm_to_blib + libraries/libapparmor/swig/python/LibAppArmor.py ++libraries/libapparmor/swig/python/LibAppArmor.egg-info/ + libraries/libapparmor/swig/python/build/ + libraries/libapparmor/swig/python/libapparmor_wrap.c + libraries/libapparmor/swig/python/Makefile +@@ -203,6 +204,8 @@ utils/*.tmp + utils/po/*.mo + utils/apparmor/*.pyc + utils/apparmor/rule/*.pyc ++utils/apparmor.egg-info/ ++utils/build/ + utils/htmlcov/ + utils/test/common_test.pyc + utils/test/.coverage +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -1,7 +1,7 @@ + --- + image: ubuntu:latest + before_script: +- - export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install --no-install-recommends -y build-essential apache2-dev autoconf automake bison dejagnu flex libpam-dev libtool perl liblocale-gettext-perl pkg-config python-all-dev python3-all-dev pyflakes3 ruby-dev swig lsb-release python3-notify2 python3-psutil zlib1g-dev ++ - export DEBIAN_FRONTEND=noninteractive && apt-get update -qq && apt-get install --no-install-recommends -y build-essential apache2-dev autoconf automake bison dejagnu flex libpam-dev libtool perl liblocale-gettext-perl pkg-config python-all-dev python3-all-dev pyflakes3 ruby-dev swig lsb-release python3-notify2 python3-psutil python3-setuptools zlib1g-dev + - lsb_release -a + - uname -a + +--- a/libraries/libapparmor/m4/ac_python_devel.m4 ++++ b/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,17 +66,17 @@ variable to configure. See ``configure - + fi + + # +- # Check if you have distutils, else fail ++ # Check if you have setuptools, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the setuptools Python package]) ++ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` ++ if test -z "$ac_setuptools_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ AC_MSG_ERROR([cannot import Python module "setuptools". + Please check your Python installation. The error was: +-$ac_distutils_result]) ++$ac_setuptools_result]) + PYTHON_VERSION="" + fi + +@@ -88,8 +88,8 @@ $ac_distutils_result]) + PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` + fi + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` ++ python_path=`$PYTHON -c "import sys; import sysconfig;\ ++sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi +@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysc + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) +- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` ++ py_version=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` + if test "$py_version" == "[None]"; then + if test -n "$PYTHON_VERSION"; then + py_version=$PYTHON_VERSION +@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[: + fi + fi + +- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ +-sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ ++ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ + "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` + fi + AC_MSG_RESULT([$PYTHON_LDFLAGS]) +@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0 + # + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` ++ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ ++sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` + fi + AC_MSG_RESULT([$PYTHON_SITE_PKG]) + AC_SUBST([PYTHON_SITE_PKG]) +@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysc + PYTHON_EXTRA_LIBS='' + fi + if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('B + PYTHON_EXTRA_LDFLAGS='' + fi + if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ +-conf = distutils.sysconfig.get_config_var; \ ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ ++conf = sysconfig.get_config_var; \ + sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -21,7 +21,7 @@ install-exec-local: + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi +- rm -rf build ++ rm -rf build LibAppArmor.egg-info + if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi + + endif +--- a/libraries/libapparmor/swig/python/setup.py.in ++++ b/libraries/libapparmor/swig/python/setup.py.in +@@ -1,4 +1,4 @@ +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import string + + setup(name = 'LibAppArmor', +--- a/libraries/libapparmor/swig/python/test/Makefile.am ++++ b/libraries/libapparmor/swig/python/test/Makefile.am +@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_ + CLEANFILES = test_python.py + + # bah, how brittle is this? +-PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' ++PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' + + TESTS = test_python.py + TESTS_ENVIRONMENT = \ +--- a/profiles/Makefile ++++ b/profiles/Makefile +@@ -41,7 +41,7 @@ ifdef USE_SYSTEM + LOGPROF?=aa-logprof + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -67,6 +67,7 @@ clean: pod_clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc + rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ ++ rm -rf apparmor.egg-info/ + + # ${CAPABILITIES} is defined in common/Make.rules + .PHONY: check_severity_db +--- a/utils/python-tools-setup.py ++++ b/utils/python-tools-setup.py +@@ -20,14 +20,14 @@ + # Note: --version=... must be the last argument to this script + # + +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import os + import shutil + import sys + + class Install(_install, object): +- '''Override distutils to install the files where we want them.''' ++ '''Override setuptools to install the files where we want them.''' + def run(self): + # Now byte-compile everything + super(Install, self).run() +--- a/utils/test/Makefile ++++ b/utils/test/Makefile +@@ -28,7 +28,7 @@ ifdef USE_SYSTEM + PARSER= + else + # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am +- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") ++ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") + LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ + LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) + PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) +--- /dev/null ++++ b/utils/test/README.md +@@ -0,0 +1,18 @@ ++# Running individual tests ++ ++Python's unittest allows individual tests to be executed by specifying the class name and the test on the command line. ++When running tests individually, the unittest framework executes the "setUp" and "tearDown" methods automatically. ++For more information, refer to the [unittest documentation](https://docs.python.org/3/library/unittest.html). ++ ++Make sure to set the environment variables pointing to the in-tree apparmor modules, and the in-tree libapparmor and its python wrapper: ++ ++```bash ++$ export PYTHONPATH=..:../../libraries/libapparmor/swig/python/build/$(/usr/bin/python3 -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") ++$ export __AA_CONFDIR=. ++``` ++ ++To execute the test individually, run: ++ ++```bash ++$ python3 ./test-tile.py ClassFoo.test_bar ++``` +\ No newline at end of file