From 332644f47a9cc6025dc868cdc9c1cc1c209830db Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Oct 2021 13:16:03 -0700 Subject: [PATCH] apparmor: update to 3.0.3 Fix compilation under Fedora. There's some weird systemd target. Just remove it. Signed-off-by: Rosen Penev --- utils/apparmor/Makefile | 4 ++-- utils/apparmor/patches/070-systemd.patch | 26 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 utils/apparmor/patches/070-systemd.patch diff --git a/utils/apparmor/Makefile b/utils/apparmor/Makefile index 431546ee6f..58feeac605 100644 --- a/utils/apparmor/Makefile +++ b/utils/apparmor/Makefile @@ -3,13 +3,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apparmor -PKG_VERSION:=3.0.1 +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:=303ceca041ad8023fa44cdda366448d60b6299790266834b4078d30b70ad27f9 +PKG_MIRROR_HASH:=2c8f4607b9936f401a3fcb92cbc3627dc5b551fbde089162172e1801faba68bc PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/utils/apparmor/patches/070-systemd.patch b/utils/apparmor/patches/070-systemd.patch new file mode 100644 index 0000000000..667f270b89 --- /dev/null +++ b/utils/apparmor/patches/070-systemd.patch @@ -0,0 +1,26 @@ +--- 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