diff options
author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2018-06-18 16:42:55 +0300 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-08-13 11:20:32 -0400 |
commit | fdb477049cf9150f7b93d7f1954af15bd0ed3f97 (patch) | |
tree | a98376d0808ba33cf9e6bbdfcc6f533a68e6a7d0 | |
parent | 0b59889548f12f85d76a763abb9ccb2da4d6f7d3 (diff) | |
download | meta-selinux-fdb477049cf9150f7b93d7f1954af15bd0ed3f97.tar.gz |
libselinux: refresh patches to remove fuzz
Recent versions of bitbake starting with sumo issue a warning if patches are
applied with any fuzz (in the future it will be an errer).
Patches were regenerated using:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
5 files changed, 38 insertions, 37 deletions
diff --git a/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch index 72b97df..725141f 100644 --- a/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +++ b/recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 63d2c02a4dfa5ccd5d62a9f80b6a50cbb9946fbb Mon Sep 17 00:00:00 2001 | 1 | From 3f633e310851cb029cb4f38d9e11a3aaef8d1099 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Thu, 18 Feb 2016 02:39:16 +0000 | 3 | Date: Thu, 18 Feb 2016 02:39:16 +0000 |
4 | Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc | 4 | Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc |
@@ -6,23 +6,21 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | src/Makefile | 2 +- | 11 | src/Makefile | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 13 | ||
13 | diff --git a/src/Makefile b/src/Makefile | 14 | diff --git a/src/Makefile b/src/Makefile |
14 | index 1920029..06d291d 100644 | 15 | index a89c0f7..f304032 100644 |
15 | --- a/src/Makefile | 16 | --- a/src/Makefile |
16 | +++ b/src/Makefile | 17 | +++ b/src/Makefile |
17 | @@ -115,7 +115,7 @@ $(LIBSO): $(LOBJS) | 18 | @@ -148,7 +148,7 @@ $(LIBSO): $(LOBJS) |
18 | ln -sf $@ $(TARGET) | 19 | ln -sf $@ $(TARGET) |
19 | 20 | ||
20 | $(LIBPC): $(LIBPC).in ../VERSION | 21 | $(LIBPC): $(LIBPC).in ../VERSION |
21 | - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ | 22 | - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ |
22 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ | 23 | + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ |
23 | 24 | ||
24 | selinuxswig_python_exception.i: ../include/selinux/selinux.h | 25 | selinuxswig_python_exception.i: ../include/selinux/selinux.h |
25 | bash exception.sh > $@ | 26 | bash -e exception.sh > $@ || (rm -f $@ ; false) |
26 | -- | ||
27 | 2.5.0 | ||
28 | |||
diff --git a/recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch b/recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch index 1fa1fba..ad18cf5 100644 --- a/recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch +++ b/recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9a843a025fb0eaad537eb9dce28da539cf2cb9c2 Mon Sep 17 00:00:00 2001 | 1 | From d0aaf391ab30b253aa22ef6547a039bcac840fc6 Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe.macdonald@windriver.com> | 2 | From: Joe MacDonald <joe.macdonald@windriver.com> |
3 | Date: Tue, 15 Oct 2013 10:14:41 -0400 | 3 | Date: Tue, 15 Oct 2013 10:14:41 -0400 |
4 | Subject: [PATCH 2/3] libselinux: define FD_CLOEXEC as necessary | 4 | Subject: [PATCH] libselinux: define FD_CLOEXEC as necessary |
5 | 5 | ||
6 | In truly old systems, even FD_CLOEXEC may not be defined. Produce a | 6 | In truly old systems, even FD_CLOEXEC may not be defined. Produce a |
7 | warning and duplicate the #define for FD_CLOEXEC found in | 7 | warning and duplicate the #define for FD_CLOEXEC found in |
@@ -10,15 +10,16 @@ asm-generic/fcntl.h on more modern platforms. | |||
10 | Uptream-Status: Inappropriate | 10 | Uptream-Status: Inappropriate |
11 | 11 | ||
12 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> | 12 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | libselinux/src/setrans_client.c | 5 +++++ | 15 | src/setrans_client.c | 5 +++++ |
15 | 1 file changed, 5 insertions(+) | 16 | 1 file changed, 5 insertions(+) |
16 | 17 | ||
17 | diff --git a/src/setrans_client.c b/src/setrans_client.c | 18 | diff --git a/src/setrans_client.c b/src/setrans_client.c |
18 | index f9065bd..e07a779 100644 | 19 | index fa188a8..a94f02c 100644 |
19 | --- a/src/setrans_client.c | 20 | --- a/src/setrans_client.c |
20 | +++ b/src/setrans_client.c | 21 | +++ b/src/setrans_client.c |
21 | @@ -38,6 +38,11 @@ static pthread_key_t destructor_key; | 22 | @@ -39,6 +39,11 @@ static pthread_key_t destructor_key; |
22 | static int destructor_key_initialized = 0; | 23 | static int destructor_key_initialized = 0; |
23 | static __thread char destructor_initialized; | 24 | static __thread char destructor_initialized; |
24 | 25 | ||
@@ -30,6 +31,3 @@ index f9065bd..e07a779 100644 | |||
30 | /* | 31 | /* |
31 | * setransd_open | 32 | * setransd_open |
32 | * | 33 | * |
33 | -- | ||
34 | 1.7.10.4 | ||
35 | |||
diff --git a/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch b/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch index 9deb67d..d58e4eb 100644 --- a/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch +++ b/recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch | |||
@@ -1,17 +1,26 @@ | |||
1 | Subject: libselinux: drop flag: -Wno-unused-but-set-variable | 1 | From 865b8c40b331235ce2c9df1fcbbb3876c9b79338 Mon Sep 17 00:00:00 2001 |
2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
3 | Date: Tue, 30 Apr 2013 17:28:34 -0400 | ||
4 | Subject: [PATCH] libselinux: drop flag: -Wno-unused-but-set-variable | ||
2 | 5 | ||
3 | Upstream status: inappropriate (older compilers only). | 6 | Upstream status: inappropriate (older compilers only). |
4 | 7 | ||
5 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | 8 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
6 | 9 | ||
7 | --- libselinux-2.1.12.orig/src/Makefile | 10 | --- |
8 | +++ libselinux-2.1.12/src/Makefile | 11 | src/Makefile | 2 +- |
9 | @@ -79,7 +79,7 @@ | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | |||
14 | diff --git a/src/Makefile b/src/Makefile | ||
15 | index 2408fae..a89c0f7 100644 | ||
16 | --- a/src/Makefile | ||
17 | +++ b/src/Makefile | ||
18 | @@ -96,7 +96,7 @@ PCRE_LDLIBS ?= -lpcre | ||
10 | 19 | ||
11 | override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS) | 20 | override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) |
12 | 21 | ||
13 | -SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ | 22 | -SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ |
14 | +SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-parameter \ | 23 | +SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-parameter \ |
15 | -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations | 24 | -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations |
16 | 25 | ||
17 | RANLIB=ranlib | 26 | RANLIB ?= ranlib |
diff --git a/recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch b/recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch index a041dd3..6394bf0 100644 --- a/recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch +++ b/recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0a8c1c5f3d866d3a3c0f95653416f5f72587ce3a Mon Sep 17 00:00:00 2001 | 1 | From 802d224953294463fa9bc793e46f664ecfea057a Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe.macdonald@windriver.com> | 2 | From: Joe MacDonald <joe.macdonald@windriver.com> |
3 | Date: Fri, 11 Oct 2013 09:56:25 -0400 | 3 | Date: Fri, 11 Oct 2013 09:56:25 -0400 |
4 | Subject: [PATCH 2/2] libselinux: make O_CLOEXEC optional | 4 | Subject: [PATCH] libselinux: make O_CLOEXEC optional |
5 | 5 | ||
6 | Various commits in the selinux tree in the current release added O_CLOEXEC | 6 | Various commits in the selinux tree in the current release added O_CLOEXEC |
7 | to open() calls in an attempt to address file descriptor leaks as | 7 | to open() calls in an attempt to address file descriptor leaks as |
@@ -18,6 +18,7 @@ Uptream-Status: Inappropriate [O_CLOEXEC has been in Linux since 2007 and POSIX | |||
18 | 18 | ||
19 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> | 19 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> |
20 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 20 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
21 | |||
21 | --- | 22 | --- |
22 | src/procattr.c | 16 ++++++++++++++-- | 23 | src/procattr.c | 16 ++++++++++++++-- |
23 | src/sestatus.c | 8 +++++++- | 24 | src/sestatus.c | 8 +++++++- |
@@ -25,7 +26,7 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | |||
25 | 3 files changed, 28 insertions(+), 4 deletions(-) | 26 | 3 files changed, 28 insertions(+), 4 deletions(-) |
26 | 27 | ||
27 | diff --git a/src/procattr.c b/src/procattr.c | 28 | diff --git a/src/procattr.c b/src/procattr.c |
28 | index 7efcd7e..3007876 100644 | 29 | index 48dd8af..8bf8432 100644 |
29 | --- a/src/procattr.c | 30 | --- a/src/procattr.c |
30 | +++ b/src/procattr.c | 31 | +++ b/src/procattr.c |
31 | @@ -79,7 +79,13 @@ static int openattr(pid_t pid, const char *attr, int flags) | 32 | @@ -79,7 +79,13 @@ static int openattr(pid_t pid, const char *attr, int flags) |
@@ -78,7 +79,7 @@ index ed29dc5..0cb15b6 100644 | |||
78 | goto error; | 79 | goto error; |
79 | 80 | ||
80 | diff --git a/src/stringrep.c b/src/stringrep.c | 81 | diff --git a/src/stringrep.c b/src/stringrep.c |
81 | index 2dbec2b..de2a70b 100644 | 82 | index 2d83f96..17e9232 100644 |
82 | --- a/src/stringrep.c | 83 | --- a/src/stringrep.c |
83 | +++ b/src/stringrep.c | 84 | +++ b/src/stringrep.c |
84 | @@ -105,7 +105,13 @@ static struct discover_class_node * discover_class(const char *s) | 85 | @@ -105,7 +105,13 @@ static struct discover_class_node * discover_class(const char *s) |
@@ -96,6 +97,3 @@ index 2dbec2b..de2a70b 100644 | |||
96 | if (fd < 0) | 97 | if (fd < 0) |
97 | goto err4; | 98 | goto err4; |
98 | 99 | ||
99 | -- | ||
100 | 2.7.4 | ||
101 | |||
diff --git a/recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch b/recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch index 14f0ce9..febced7 100644 --- a/recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch +++ b/recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 193d42c8312cb8b189745696065b3aa5bbcc6968 Mon Sep 17 00:00:00 2001 | 1 | From e630805d15a3b8d09330353f87a7e4a9fcc9998a Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe.macdonald@windriver.com> | 2 | From: Joe MacDonald <joe.macdonald@windriver.com> |
3 | Date: Tue, 15 Oct 2013 10:07:43 -0400 | 3 | Date: Tue, 15 Oct 2013 10:07:43 -0400 |
4 | Subject: [PATCH 1/3] libselinux: make SOCK_CLOEXEC optional | 4 | Subject: [PATCH] libselinux: make SOCK_CLOEXEC optional |
5 | 5 | ||
6 | libselinux/src/setrans_client.c checks for the existence of SOCK_CLOEXEC | 6 | libselinux/src/setrans_client.c checks for the existence of SOCK_CLOEXEC |
7 | before using it, however libselinux/src/avc_internal.c does not. Since | 7 | before using it, however libselinux/src/avc_internal.c does not. Since |
@@ -12,12 +12,13 @@ way. | |||
12 | Uptream-Status: Inappropriate | 12 | Uptream-Status: Inappropriate |
13 | 13 | ||
14 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> | 14 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | libselinux/src/avc_internal.c | 8 +++++++- | 17 | src/avc_internal.c | 8 +++++++- |
17 | 1 file changed, 7 insertions(+), 1 deletion(-) | 18 | 1 file changed, 7 insertions(+), 1 deletion(-) |
18 | 19 | ||
19 | diff --git a/src/avc_internal.c b/libselinux/src/avc_internal.c | 20 | diff --git a/src/avc_internal.c b/src/avc_internal.c |
20 | index f735e73..eb0599a 100644 | 21 | index 49cecc9..148cc83 100644 |
21 | --- a/src/avc_internal.c | 22 | --- a/src/avc_internal.c |
22 | +++ b/src/avc_internal.c | 23 | +++ b/src/avc_internal.c |
23 | @@ -60,7 +60,13 @@ int avc_netlink_open(int blocking) | 24 | @@ -60,7 +60,13 @@ int avc_netlink_open(int blocking) |
@@ -35,6 +36,3 @@ index f735e73..eb0599a 100644 | |||
35 | if (fd < 0) { | 36 | if (fd < 0) { |
36 | rc = fd; | 37 | rc = fd; |
37 | goto out; | 38 | goto out; |
38 | -- | ||
39 | 1.7.10.4 | ||
40 | |||