summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-mac/AppArmor/apparmor_3.0.1.bb (renamed from recipes-mac/AppArmor/apparmor_3.0.bb)8
-rw-r--r--recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch2
-rw-r--r--recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch31
-rw-r--r--recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch43
-rw-r--r--recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch36
-rw-r--r--recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch37
-rw-r--r--recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch37
-rw-r--r--recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch34
-rw-r--r--recipes-mac/AppArmor/files/disable_pdf.patch33
9 files changed, 2 insertions, 259 deletions
diff --git a/recipes-mac/AppArmor/apparmor_3.0.bb b/recipes-mac/AppArmor/apparmor_3.0.1.bb
index d9c3e4d..6377683 100644
--- a/recipes-mac/AppArmor/apparmor_3.0.bb
+++ b/recipes-mac/AppArmor/apparmor_3.0.1.bb
@@ -23,16 +23,10 @@ SRC_URI = " \
23 file://apparmor.service \ 23 file://apparmor.service \
24 file://0001-Makefile.am-suppress-perllocal.pod.patch \ 24 file://0001-Makefile.am-suppress-perllocal.pod.patch \
25 file://run-ptest \ 25 file://run-ptest \
26 file://0001-apparmor-fix-manpage-order.patch \
27 file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \ 26 file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \
28 file://0001-libapparmor-add-missing-include-for-socklen_t.patch \
29 file://0002-libapparmor-add-aa_features_new_from_file-to-public-.patch \
30 file://0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch \
31 file://0001-aa_status-Fix-build-issue-with-musl.patch \
32 file://0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch \
33 " 27 "
34 28
35SRCREV = "5d51483bfecf556183558644dc8958135397a7e2" 29SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e"
36S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
37 31
38PARALLEL_MAKE = "" 32PARALLEL_MAKE = ""
diff --git a/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch b/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch
index 791437d..e7abd60 100644
--- a/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch
+++ b/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Revert "profiles: Update 'make check' to select tools based
6 6
7This reverts commit 6016f931ebf7b61e1358f19453ef262d9d184a4e. 7This reverts commit 6016f931ebf7b61e1358f19453ef262d9d184a4e.
8 8
9Upstream-Statue: OE specific 9Upstream-Status: Inappropriate [OE specific]
10These changes cause during packaging with perms changing. 10These changes cause during packaging with perms changing.
11 11
12Signed-off-by: Armin Kuster <akuster808@gmail.com> 12Signed-off-by: Armin Kuster <akuster808@gmail.com>
diff --git a/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch b/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch
deleted file mode 100644
index 239562a..0000000
--- a/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 2bf15cc68f31c9f41962bb60a669ab2b453a039b Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster808@gmail.com>
3Date: Wed, 7 Oct 2020 08:27:11 -0700
4Subject: [PATCH] aa_status: Fix build issue with musl
5
6add limits.h
7
8aa_status.c:269:22: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'?
9| 269 | real_exe = calloc(PATH_MAX + 1, sizeof(char));
10
11Upstream-Status: Pending
12Signed-off-by: Armin Kuster <akuster808@gmail.com>
13---
14 binutils/aa_status.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/binutils/aa_status.c b/binutils/aa_status.c
18index 78b03409..41f1954e 100644
19--- a/binutils/aa_status.c
20+++ b/binutils/aa_status.c
21@@ -10,6 +10,7 @@
22 #include <stdio.h>
23 #include <stdlib.h>
24 #include <string.h>
25+#include <limits.h>
26 #include <sys/types.h>
27 #include <sys/stat.h>
28 #include <sys/wait.h>
29--
302.17.1
31
diff --git a/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch b/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch
deleted file mode 100644
index 9f3dce4..0000000
--- a/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From c9baef0c70122e1be33b627874772e6e9a5d7744 Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster808@gmail.com>
3Date: Fri, 2 Oct 2020 19:43:44 -0700
4Subject: [PATCH] apparmor: fix manpage order
5
6It trys to create a symlink before the man pages are installed.
7
8 ln -sf aa-status.8 /(path}/apparmor/3.0-r0/image/usr/share/man/man8/apparmor_status.8
9 | ln: failed to create symbolic link '{path}/apparmor/3.0-r0/image/usr/share/man/man8/apparmor_status.8': No such file or directory
10
11Upstream-Status: Pending
12Signed-off-by: Armin Kuster <akuster808@gmail.com>
13
14...
15
16install -d /{path}/apparmor/3.0-r0/image/usr/share/man/man8 ; install -m 644 aa-status.8 /{path}/apparmor/3.0-r0/image/usr/share/man/man8;
17
18Signed-off-by: Armin Kuster <akuster@mvista.com>
19---
20 binutils/Makefile | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/binutils/Makefile b/binutils/Makefile
24index 99e54875..3f1d0011 100644
25--- a/binutils/Makefile
26+++ b/binutils/Makefile
27@@ -156,12 +156,12 @@ install-arch: arch
28 install -m 755 -d ${SBINDIR}
29 ln -sf aa-status ${SBINDIR}/apparmor_status
30 install -m 755 ${SBINTOOLS} ${SBINDIR}
31- ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
32
33 .PHONY: install-indep
34 install-indep: indep
35 $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
36 $(MAKE) install_manpages DESTDIR=${DESTDIR}
37+ ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
38
39 ifndef VERBOSE
40 .SILENT: clean
41--
422.17.1
43
diff --git a/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch b/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch
deleted file mode 100644
index 2a56d8b..0000000
--- a/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001
2From: Patrick Steinhardt <ps@pks.im>
3Date: Sat, 3 Oct 2020 20:37:55 +0200
4Subject: [PATCH] libapparmor: add missing include for `socklen_t`
5
6While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't
7include the `<sys/socket.h>` header to make its declaration available.
8While this works on systems using glibc via transitive includes, it
9breaks compilation on musl libc.
10
11Fix the issue by including the header.
12
13Signed-off-by: Patrick Steinhardt <ps@pks.im>
14
15Upstream-Status: Backport
16Signed-off-by: Armin Kuster <akuster808@gmail.com>
17
18---
19 libraries/libapparmor/include/sys/apparmor.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
23index 32892d06..d70eff94 100644
24--- a/libraries/libapparmor/include/sys/apparmor.h
25+++ b/libraries/libapparmor/include/sys/apparmor.h
26@@ -21,6 +21,7 @@
27 #include <stdbool.h>
28 #include <stdint.h>
29 #include <unistd.h>
30+#include <sys/socket.h>
31 #include <sys/types.h>
32
33 #ifdef __cplusplus
34--
352.17.1
36
diff --git a/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch b/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
deleted file mode 100644
index 9f7ad3c..0000000
--- a/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 965bb9c3e464f756b258a7c259a92bce3cde74e7 Mon Sep 17 00:00:00 2001
2From: Armin Kuster <akuster@mvista.com>
3Date: Wed, 7 Oct 2020 20:50:38 -0700
4Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray
5
6In cross build environments, using the hosts cpp gives incorrect
7detection of reallocarray. Change cpp to a variable.
8
9fixes:
10parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)':
11| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope
12| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1);
13
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16Upstream-Status: Pending
17
18---
19 parser/Makefile | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/parser/Makefile b/parser/Makefile
23index acef3d77..8250ac45 100644
24--- a/parser/Makefile
25+++ b/parser/Makefile
26@@ -54,7 +54,7 @@ endif
27 CPPFLAGS += -D_GNU_SOURCE
28
29 STDLIB_INCLUDE:="\#include <stdlib.h>"
30-HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true)
31+HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true)
32
33 WARNINGS = -Wall
34 CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS}
35--
362.17.1
37
diff --git a/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch b/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
deleted file mode 100644
index 333f40f..0000000
--- a/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From c9255a03436e6a91bd4e410601da8d43a341ffc2 Mon Sep 17 00:00:00 2001
2From: Patrick Steinhardt <ps@pks.im>
3Date: Sat, 3 Oct 2020 20:58:45 +0200
4Subject: [PATCH] libapparmor: add `aa_features_new_from_file` to public
5 symbols
6
7With AppArmor release 3.0, a new function `aa_features_new_from_file`
8was added, but not added to the list of public symbols. As a result,
9it's not possible to make use of this function when linking against
10libapparmor.so.
11
12Fix the issue by adding it to the symbol map.
13
14Signed-off-by: Patrick Steinhardt <ps@pks.im>
15
16Upstream-Status: Backport
17Signed-off-by: Armin Kuster <akuster808@gmail.com>
18
19---
20 libraries/libapparmor/src/libapparmor.map | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
24index bbff51f5..1579509a 100644
25--- a/libraries/libapparmor/src/libapparmor.map
26+++ b/libraries/libapparmor/src/libapparmor.map
27@@ -117,6 +117,7 @@ APPARMOR_2.13.1 {
28
29 APPARMOR_3.0 {
30 global:
31+ aa_features_new_from_file;
32 aa_features_write_to_fd;
33 aa_features_value;
34 local:
35--
362.17.1
37
diff --git a/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch b/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch
deleted file mode 100644
index 543c7a1..0000000
--- a/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9a8fee6bf1c79c261374d928b838b5eb9244ee9b Mon Sep 17 00:00:00 2001
2From: Patrick Steinhardt <ps@pks.im>
3Date: Sat, 3 Oct 2020 21:04:57 +0200
4Subject: [PATCH] libapparmor: add _aa_asprintf to private symbols
5
6While `_aa_asprintf` is supposed to be of private visibility, it's used
7by apparmor_parser and thus required to be visible when linking. This
8commit thus adds it to the list of private symbols to make it available
9for linking in apparmor_parser.
10
11Signed-off-by: Patrick Steinhardt <ps@pks.im>
12
13Upstream-Status: Backport
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16---
17 libraries/libapparmor/src/libapparmor.map | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
21index 1579509a..41e541ac 100644
22--- a/libraries/libapparmor/src/libapparmor.map
23+++ b/libraries/libapparmor/src/libapparmor.map
24@@ -127,6 +127,7 @@ APPARMOR_3.0 {
25 PRIVATE {
26 global:
27 _aa_is_blacklisted;
28+ _aa_asprintf;
29 _aa_autofree;
30 _aa_autoclose;
31 _aa_autofclose;
32--
332.17.1
34
diff --git a/recipes-mac/AppArmor/files/disable_pdf.patch b/recipes-mac/AppArmor/files/disable_pdf.patch
deleted file mode 100644
index c6b4bdd..0000000
--- a/recipes-mac/AppArmor/files/disable_pdf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Index: apparmor-2.10.95/parser/Makefile
2===================================================================
3--- apparmor-2.10.95.orig/parser/Makefile
4+++ apparmor-2.10.95/parser/Makefile
5@@ -139,17 +139,6 @@ export Q VERBOSE BUILD_OUTPUT
6 po/${NAME}.pot: ${SRCS} ${HDRS}
7 $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
8
9-techdoc.pdf: techdoc.tex
10- timestamp=$(shell date --utc "+%Y%m%d%H%M%S%z" -r $< );\
11- while pdflatex "\def\fixedpdfdate{$$timestamp}\input $<" ${BUILD_OUTPUT} || exit 1 ; \
12- grep -q "Label(s) may have changed" techdoc.log; \
13- do :; done
14-
15-techdoc/index.html: techdoc.pdf
16- latex2html -show_section_numbers -split 0 -noinfo -nonavigation -noaddress techdoc.tex ${BUILD_OUTPUT}
17-
18-techdoc.txt: techdoc/index.html
19- w3m -dump $< > $@
20
21 # targets arranged this way so that people who don't want full docs can
22 # pick specific targets they want.
23@@ -159,9 +148,7 @@ manpages: $(MANPAGES)
24
25 htmlmanpages: $(HTMLMANPAGES)
26
27-pdf: techdoc.pdf
28-
29-docs: manpages htmlmanpages pdf
30+docs: manpages htmlmanpages
31
32 indep: docs
33 $(Q)$(MAKE) -C po all
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-27 07:56:27 +0000