mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-08 23:51:08 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/{,lib}apparmor: bump to version 4.1.1

Browse Source 
Updating also the companion libapparmor library and removing upstreamed
patch.

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
[Julien:
 - add "{,lib}" in commit log title
 - reorder LIBAPPARMOR_DEPENDENCIES alphabetically
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Angelo Compagnucci
2025-08-15 20:25:18 +02:00
committed by Julien Olivain
parent 7ed0e75af1
commit 7b1e6ec3f7
5 changed files with 10 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/apparmor/apparmor.hash
View File

@@ -1,5 +1,5 @@
# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.7
sha256 64494bd99fa6547a9cbdb4fc6bc732451a02dd19e6eb70eab977b239632151eb apparmor-v3.1.7.tar.gz
# From https://gitlab.com/apparmor/apparmor/-/releases/v4.1.1
sha256 f125aae32964e4e84443fec005f37f37abd5164f30620239c42864655a1b0281 apparmor-v4.1.1.tar.gz
# locally computed
sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE

4
package/apparmor/apparmor.mk
View File

@@ -5,8 +5,8 @@
################################################################################
# When updating the version here, please also update the libapparmor package
APPARMOR_VERSION_MAJOR = 3.1
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).7
APPARMOR_VERSION_MAJOR = 4.1
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1
APPARMOR_SOURCE = apparmor-v$(APPARMOR_VERSION).tar.gz
APPARMOR_SITE = https://gitlab.com/apparmor/apparmor/-/archive/v$(APPARMOR_VERSION)
APPARMOR_DL_SUBDIR = apparmor

44
package/libapparmor/0001-libapparamor-define-a-portable-version-of-gnu-basename.patch
View File

@@ -1,44 +0,0 @@
From 7fb040bde69ebdfce48cf1a01c1a62fd4f8eef0a Mon Sep 17 00:00:00 2001
From: Jules Maselbas <jmaselbas@zdiv.net>
Date: Thu, 16 May 2024 12:01:00 +0200
Subject: [PATCH] libapparamor: Define a portable version of gnu basename
Since musl 1.2.5, basename(3) prototype is only provided in libgen.h
(as mandated by POSIX) and not in strings.h. Also there is a major
difference between the gnu basename and the one defined in libgen.h,
the latter modify the argument string making them incompatible.
Fix this by defining a portable version of basename using strchr.
Upstream: https://gitlab.com/apparmor/apparmor/-/commit/7fb040bde69ebdfce48cf1a01c1a62fd4f8eef0a
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
libraries/libapparmor/testsuite/test_multi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libraries/libapparmor/testsuite/test_multi.c b/libraries/libapparmor/testsuite/test_multi.c
index 578629500..7f37966ec 100644
--- a/libraries/libapparmor/testsuite/test_multi.c
+++ b/libraries/libapparmor/testsuite/test_multi.c
@@ -1,5 +1,3 @@
-#define _GNU_SOURCE /* for glibc's basename version */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -7,6 +5,12 @@
#include <aalogparse.h>
+static const char *basename(const char *path)
+{
+ const char *p = strrchr(path, '/');
+ return p ? p + 1 : path;
+}
+
int print_results(aa_log_record *record);
int main(int argc, char **argv)
--
GitLab

4
package/libapparmor/libapparmor.hash
View File

@@ -1,5 +1,5 @@
# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.7
sha256 64494bd99fa6547a9cbdb4fc6bc732451a02dd19e6eb70eab977b239632151eb apparmor-v3.1.7.tar.gz
# From https://gitlab.com/apparmor/apparmor/-/releases/v4.1.1
sha256 f125aae32964e4e84443fec005f37f37abd5164f30620239c42864655a1b0281 apparmor-v4.1.1.tar.gz
# locally computed
sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE

7
package/libapparmor/libapparmor.mk
View File

@@ -5,19 +5,20 @@
################################################################################
# When updating the version here, please also update the apparmor package
LIBAPPARMOR_VERSION_MAJOR = 3.1
LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).7
LIBAPPARMOR_VERSION_MAJOR = 4.1
LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).1
LIBAPPARMOR_SOURCE = apparmor-v$(LIBAPPARMOR_VERSION).tar.gz
LIBAPPARMOR_SITE = https://gitlab.com/apparmor/apparmor/-/archive/v$(LIBAPPARMOR_VERSION)
LIBAPPARMOR_LICENSE = LGPL-2.1
LIBAPPARMOR_LICENSE_FILES = LICENSE libraries/libapparmor/COPYING.LGPL
LIBAPPARMOR_DEPENDENCIES = host-bison host-flex host-pkgconf
LIBAPPARMOR_DEPENDENCIES = host-autoconf-archive host-bison host-flex host-pkgconf
LIBAPPARMOR_SUBDIR = libraries/libapparmor
LIBAPPARMOR_INSTALL_STAGING = YES
# no configure in tarball
LIBAPPARMOR_AUTORECONF = YES
LIBAPPARMOR_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
# Most AppArmor tools will want to link to the static lib.
# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test