diff options
Diffstat (limited to 'package/apparmor')
5 files changed, 7 insertions, 117 deletions
diff --git a/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch b/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch deleted file mode 100644 index d3f4a51646..0000000000 --- a/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c9fe40d9386a5e4cf99f44df9b98382d83f1c4f4 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci <angelo@amarulasolutions.com> -Date: Fri, 24 Apr 2020 17:34:24 +0200 -Subject: [PATCH] parser: binutils: fix compilation with libintl - -When libintl is available on the system, we need to link against the -libintl library too. - -Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> ---- - binutils/Makefile | 4 ++++ - parser/Makefile | 5 +++++ - 2 files changed, 9 insertions(+) - -diff --git a/binutils/Makefile b/binutils/Makefile -index 11459bec..d8c1b634 100644 ---- a/binutils/Makefile -+++ b/binutils/Makefile -@@ -56,6 +56,10 @@ SBINTOOLS = aa-status - - AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread - -+ifdef WITH_LIBINTL -+ AALIB += -lintl -+endif -+ - ifdef USE_SYSTEM - # Using the system libapparmor so Makefile dependencies can't be used - LIBAPPARMOR_A = -diff --git a/parser/Makefile b/parser/Makefile -index eab64be9..998230ee 100644 ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -91,6 +91,11 @@ AAREOBJECTS = $(AAREOBJECT) - AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) - AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread - -+ifdef WITH_LIBINTL -+ AALIB += -lintl -+endif -+ -+ - ifdef USE_SYSTEM - # Using the system libapparmor so Makefile dependencies can't be used - LIBAPPARMOR_A = --- -2.25.1 - diff --git a/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch b/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch deleted file mode 100644 index 4caefe447b..0000000000 --- a/package/apparmor/0002-replace-deprecated-egrep-with-grep-e.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5f46dedd6e8109d845af118b36039a5d7dd05af9 Mon Sep 17 00:00:00 2001 -From: Christian Boltz <apparmor@cboltz.de> -Date: Mon, 18 Mar 2019 19:17:16 +0100 -Subject: [PATCH] replace deprecated egrep with grep -e - -(cherry picked from commit 5f46dedd6e8109d845af118b36039a5d7dd05af9) -Signed-off-by: Christian Boltz <apparmor@cboltz.de> -Signed-off-by: Adam Duskett <Aduskett@gmail.com> ---- - parser/rc.apparmor.functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions -index 22e8367..f3108f8 100644 ---- a/parser/rc.apparmor.functions -+++ b/parser/rc.apparmor.functions -@@ -129,7 +129,7 @@ skip_profile() { - "${profile%.pacnew}" != "${profile}" ] ; then - return 2 - fi -- if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then -+ if echo "${profile}" | grep -E -q '^.+\.new-[0-9\.]+_[0-9]+$'; then - return 2 - fi - --- -2.26.2 - diff --git a/package/apparmor/0003-fix-regex-in-rc.apparmor.functions-to-work-with-busy.patch b/package/apparmor/0003-fix-regex-in-rc.apparmor.functions-to-work-with-busy.patch deleted file mode 100644 index c372a86998..0000000000 --- a/package/apparmor/0003-fix-regex-in-rc.apparmor.functions-to-work-with-busy.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 12764faa0a01bcc4e0ffc92ce308985dbad0d954 Mon Sep 17 00:00:00 2001 -From: Adam Duskett <Aduskett@gmail.com> -Date: Thu, 7 May 2020 18:25:29 -0700 -Subject: [PATCH] fix regex in rc.apparmor.functions to work with busybox - -The following regex string in rc.apparmor.functions -"^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" is broken due to -the unescaped {. GNU grep ignores the error. However, the Busybox grep does -not and throws the error "unescaped character {" - -Escape the "{" character to fix this issue. - -Note: Upstream has rewritten large sections of the rc.apparmor.functions file -and the function this patch fixes will no longer be necessary after the next -version is released. - -Signed-off-by: Adam Duskett <Aduskett@gmail.com> ---- - parser/rc.apparmor.functions | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions -index f3108f8..db0697c 100644 ---- a/parser/rc.apparmor.functions -+++ b/parser/rc.apparmor.functions -@@ -140,7 +140,7 @@ force_complain() { - local profile=$1 - - # if profile not in complain mode -- if ! egrep -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" $profile ; then -+ if ! grep -E -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+\{" $profile ; then - local link="${PROFILE_DIR}/force-complain/`basename ${profile}`" - if [ -e "$link" ] ; then - aa_log_warning_msg "found $link, forcing complain mode" --- -2.26.2 - diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index c7caef7beb..ddbe87c569 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,4 +1,6 @@ +# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace +sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz + # locally computed -sha256 90bf86c07ffbe2c22be46d75c7345fad12d5911653c59750a37d59c63ad5d10e apparmor-2.13.4.tar.gz sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE sha256 dd54950fa69a3096fe907a466a454d217ccca9bca77398d5232704766d5a0040 parser/COPYING.GPL diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 51820999eb..6c23e1bb89 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -5,12 +5,13 @@ ################################################################################ # When updating the version here, please also update the libapparmor package -APPARMOR_VERSION_MAJOR = 2.13 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).4 +APPARMOR_VERSION_MAJOR = 3.0 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL +APPARMOR_CPE_ID_VENDOR = canonical APPARMOR_DEPENDENCIES = libapparmor @@ -88,7 +89,7 @@ endef define APPARMOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \ $(TARGET_DIR)/lib/apparmor/apparmor.systemd - $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.service \ + $(INSTALL) -D -m 0644 $(@D)/parser/apparmor.service \ $(TARGET_DIR)/usr/lib/systemd/system/apparmor.service endef |