refresh patches to fix QA warnings
cover refresh patches to fix QA warnings
Yi Zhao (3):
libselinux: refresh patches to fix QA warning
libsemanage: refresh patches to fix QA warning
selinux-python: refresh patches to fix QA warning
...c-Makefile-fix-includedir-in-libselinux.pc.patch | 14 ++++++-------- .../libselinux-define-FD_CLOEXEC-as-necessary.patch | 14 ++++++-------- ...ibselinux-drop-Wno-unused-but-set-variable.patch | 21 +++++++++++++++------ .../libselinux-make-O_CLOEXEC-optional.patch | 12 +++++------- .../libselinux-make-SOCK_CLOEXEC-optional.patch | 14 ++++++-------- ...c-Makefile-fix-includedir-in-libselinux.pc.patch | 16 +++++++--------- ...libsemanage-Fix-execve-segfaults-on-Ubuntu.patch | 20 +++++++++----------- ...libsemanage-allow-to-disable-audit-support.patch | 8 +++----- ...libsemanage-define-FD_CLOEXEC-as-necessary.patch | 20 +++++++++----------- ...manage-disable-expand-check-on-policy-load.patch | 13 +++++++------ ...bsemanage-drop-Wno-unused-but-set-variable.patch | 19 ++++++++++++++----- .../libsemanage/libsemanage-fix-path-nologin.patch | 15 ++++++++------- recipes-security/selinux/libsemanage_2.7.bb | 2 +- recipes-security/selinux/libsemanage_git.bb | 2 +- .../fix-TypeError-for-seobject.py.patch | 17 +++++++++-------- .../selinux-python/fix-sepolicy-install-path.patch | 21 ++++++++++++--------- .../process-ValueError-for-sepolicy-seobject.patch | 12 +++++------- 17 files changed, 123 insertions(+), 117 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 libselinux: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning.
Signed-off-by Yi Zhao <[email protected]>
--- ...c-Makefile-fix-includedir-in-libselinux.pc.patch | 14 ++++++-------- .../libselinux-define-FD_CLOEXEC-as-necessary.patch | 14 ++++++-------- ...ibselinux-drop-Wno-unused-but-set-variable.patch | 21 +++++++++++++++------ .../libselinux-make-O_CLOEXEC-optional.patch | 12 +++++------- .../libselinux-make-SOCK_CLOEXEC-optional.patch | 14 ++++++-------- 5 files changed, 38 insertions(+), 37 deletions(-)
recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +6 -8
@@ -1,4 +1,4 @@ -From 63d2c02a4dfa5ccd5d62a9f80b6a50cbb9946fbb Mon Sep 17 00:00:00 2001 +From c5bec43d3fae49e36997884448fc533462028b67 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 18 Feb 2016 02:39:16 +0000 Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc
@@ -6,23 +6,21 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 1920029..06d291d 100644 +index a89c0f7..f304032 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -115,7 +115,7 @@ $(LIBSO): $(LOBJS) - ln -sf $@ $(TARGET) +@@ -148,7 +148,7 @@ $(LIBSO): $(LOBJS) + ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ selinuxswig_python_exception.i: ../include/selinux/selinux.h - bash exception.sh > $@ --- -2.5.0 - + bash -e exception.sh > $@ || (rm -f $@ ; false)
recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch +6 -8
@@ -1,7 +1,7 @@ -From 9a843a025fb0eaad537eb9dce28da539cf2cb9c2 Mon Sep 17 00:00:00 2001 +From 967beb17658f3f879a2b8640e40c0675e814a257 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Tue, 15 Oct 2013 10:14:41 -0400 -Subject: [PATCH 2/3] libselinux: define FD_CLOEXEC as necessary +Subject: [PATCH] libselinux: define FD_CLOEXEC as necessary In truly old systems, even FD_CLOEXEC may not be defined. Produce a warning and duplicate the #define for FD_CLOEXEC found in
@@ -10,15 +10,16 @@ asm-generic/fcntl.h on more modern platforms. Uptream-Status: Inappropriate Signed-off-by: Joe MacDonald <[email protected]> + --- - libselinux/src/setrans_client.c | 5 +++++ + src/setrans_client.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/setrans_client.c b/src/setrans_client.c -index f9065bd..e07a779 100644 +index fa188a8..a94f02c 100644 --- a/src/setrans_client.c +++ b/src/setrans_client.c -@@ -38,6 +38,11 @@ static pthread_key_t destructor_key; +@@ -39,6 +39,11 @@ static pthread_key_t destructor_key; static int destructor_key_initialized = 0; static __thread char destructor_initialized;
@@ -30,6 +31,3 @@ index f9065bd..e07a779 100644 /* * setransd_open * --- -1.7.10.4 -
recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch +15 -6
@@ -1,17 +1,26 @@ -Subject: libselinux: drop flag: -Wno-unused-but-set-variable +From 1312096e1d9d5c9963f18208ced54b63b7e5d9a7 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod <[email protected]> +Date: Tue, 30 Apr 2013 17:28:34 -0400 +Subject: [PATCH] libselinux: drop flag: -Wno-unused-but-set-variable Upstream status: inappropriate (older compilers only). Signed-off-by: Randy MacLeod <[email protected]> ---- libselinux-2.1.12.orig/src/Makefile -+++ libselinux-2.1.12/src/Makefile -@@ -79,7 +79,7 @@ +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 2408fae..a89c0f7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -96,7 +96,7 @@ PCRE_LDLIBS ?= -lpcre - override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS) + override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) -SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ +SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-parameter \ -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations - RANLIB=ranlib + RANLIB ?= ranlib
recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch +5 -7
@@ -1,7 +1,7 @@ -From 0a8c1c5f3d866d3a3c0f95653416f5f72587ce3a Mon Sep 17 00:00:00 2001 +From dec50b2504dedc0d13b24b7e7815cc1294249215 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Fri, 11 Oct 2013 09:56:25 -0400 -Subject: [PATCH 2/2] libselinux: make O_CLOEXEC optional +Subject: [PATCH] libselinux: make O_CLOEXEC optional Various commits in the selinux tree in the current release added O_CLOEXEC 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 Signed-off-by: Joe MacDonald <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> + --- src/procattr.c | 16 ++++++++++++++-- src/sestatus.c | 8 +++++++-
@@ -25,7 +26,7 @@ Signed-off-by: Wenzong Fan <[email protected]> 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/procattr.c b/src/procattr.c -index 7efcd7e..3007876 100644 +index 48dd8af..8bf8432 100644 --- a/src/procattr.c +++ b/src/procattr.c @@ -79,7 +79,13 @@ static int openattr(pid_t pid, const char *attr, int flags)
@@ -78,7 +79,7 @@ index ed29dc5..0cb15b6 100644 goto error; diff --git a/src/stringrep.c b/src/stringrep.c -index 2dbec2b..de2a70b 100644 +index 2d83f96..17e9232 100644 --- a/src/stringrep.c +++ b/src/stringrep.c @@ -105,7 +105,13 @@ static struct discover_class_node * discover_class(const char *s)
@@ -96,6 +97,3 @@ index 2dbec2b..de2a70b 100644 if (fd < 0) goto err4; --- -2.7.4 -
recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch +6 -8
@@ -1,7 +1,7 @@ -From 193d42c8312cb8b189745696065b3aa5bbcc6968 Mon Sep 17 00:00:00 2001 +From 667f8670560d122ba9cff96e1b3ac9e9fad201eb Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Tue, 15 Oct 2013 10:07:43 -0400 -Subject: [PATCH 1/3] libselinux: make SOCK_CLOEXEC optional +Subject: [PATCH] libselinux: make SOCK_CLOEXEC optional libselinux/src/setrans_client.c checks for the existence of SOCK_CLOEXEC before using it, however libselinux/src/avc_internal.c does not. Since
@@ -12,12 +12,13 @@ way. Uptream-Status: Inappropriate Signed-off-by: Joe MacDonald <[email protected]> + --- - libselinux/src/avc_internal.c | 8 +++++++- + src/avc_internal.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/src/avc_internal.c b/libselinux/src/avc_internal.c -index f735e73..eb0599a 100644 +diff --git a/src/avc_internal.c b/src/avc_internal.c +index 49cecc9..148cc83 100644 --- a/src/avc_internal.c +++ b/src/avc_internal.c @@ -60,7 +60,13 @@ int avc_netlink_open(int blocking)
@@ -35,6 +36,3 @@ index f735e73..eb0599a 100644 if (fd < 0) { rc = fd; goto out; --- -1.7.10.4 -
Signature · 1 line
2.7.4
PATCH 2/3 libsemanage: refresh patches to fix QA warning
In reply to Yi ZhaoRefresh patches with devtool command to fix do_patch warning.
Signed-off-by Yi Zhao <[email protected]>
--- ...rc-Makefile-fix-includedir-in-libselinux.pc.patch | 16 +++++++--------- .../libsemanage-Fix-execve-segfaults-on-Ubuntu.patch | 20 +++++++++----------- .../libsemanage-allow-to-disable-audit-support.patch | 8 +++----- .../libsemanage-define-FD_CLOEXEC-as-necessary.patch | 20 +++++++++----------- ...emanage-disable-expand-check-on-policy-load.patch | 13 +++++++------ ...ibsemanage-drop-Wno-unused-but-set-variable.patch | 19 ++++++++++++++----- .../libsemanage/libsemanage-fix-path-nologin.patch | 15 ++++++++------- recipes-security/selinux/libsemanage_2.7.bb | 2 +- recipes-security/selinux/libsemanage_git.bb | 2 +- 9 files changed, 59 insertions(+), 56 deletions(-)
recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +7 -9
@@ -1,4 +1,4 @@ -From 63d2c02a4dfa5ccd5d62a9f80b6a50cbb9946fbb Mon Sep 17 00:00:00 2001 +From a7dd288d5bc0e3c92b760701c634b27bf5054007 Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> Date: Thu, 18 Feb 2016 02:39:16 +0000 Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc
@@ -6,23 +6,21 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc Upstream-Status: Pending Signed-off-by: Robert Yang <[email protected]> + --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 1920029..06d291d 100644 +index e8831ab..d3d4644 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -115,7 +115,7 @@ $(LIBSO): $(LOBJS) - ln -sf $@ $(TARGET) +@@ -103,7 +103,7 @@ $(LIBSO): $(LOBJS) + ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION - sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ + sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ - selinuxswig_python_exception.i: ../include/selinux/selinux.h - bash exception.sh > $@ --- -2.5.0 - + semanageswig_python_exception.i: ../include/semanage/semanage.h + bash -e exception.sh > $@ || (rm -f $@ ; false)
recipes-security/selinux/libsemanage/libsemanage-Fix-execve-segfaults-on-Ubuntu.patch +9 -11
@@ -1,4 +1,4 @@ -From 35aa581aa734d8d93dc5e08bc02d32fa3b50fae2 Mon Sep 17 00:00:00 2001 +From 982004f666ba99db050195d90ded083fa74587b9 Mon Sep 17 00:00:00 2001 From: Xin Ouyang <[email protected]> Date: Mon, 26 Mar 2012 15:15:16 +0800 Subject: [PATCH] libsemanage: Fix execve segfaults on Ubuntu.
@@ -8,23 +8,21 @@ this may cause segfaults on Ubuntu. Such as "make load" while building refpolicy. http://oss.tresys.com/pipermail/refpolicy/2011-December/004859.html + --- - src/semanage_store.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/semanage_store.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/semanage_store.c b/src/semanage_store.c -index a223aa7..c0af87d 100644 +index 6158d08..1923f0f 100644 --- a/src/semanage_store.c +++ b/src/semanage_store.c -@@ -1015,7 +1015,7 @@ static int semanage_exec_prog(semanage_handle_t * sh, - } else if (forkval == 0) { +@@ -1405,7 +1405,7 @@ static int semanage_exec_prog(semanage_handle_t * sh, + if (forkval == 0) { /* child process. file descriptors will be closed * because they were set as close-on-exec. */ - execve(e->path, argv, NULL); + execv(e->path, argv); _exit(EXIT_FAILURE); /* if execve() failed */ - } else { - /* parent process. wait for child to finish */ --- -1.7.5.4 - + } +
recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch +3 -5
@@ -1,4 +1,4 @@ -From 7d23189c4541124469aad24fe1719f2a24b4ca48 Mon Sep 17 00:00:00 2001 +From 3efc3911d922cd0935d91a28d857a20dc8cc1753 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <[email protected]> Date: Mon, 20 Jan 2014 03:53:48 -0500 Subject: [PATCH] libsemanage: allow to disable audit support
@@ -6,6 +6,7 @@ Subject: [PATCH] libsemanage: allow to disable audit support Upstream-Status: Pending Signed-off-by: Wenzong Fan <[email protected]> + --- src/Makefile | 10 +++++++++- src/seusers_local.c | 13 +++++++++++++
@@ -13,7 +14,7 @@ Signed-off-by: Wenzong Fan <[email protected]> 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index fdb178f..43e1266 100644 +index d457208..e8831ab 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,6 +29,14 @@ ifeq ($(DEBUG),1)
@@ -121,6 +122,3 @@ index 2ef8d30..50d582a 100644 OBJECTS = $(SOURCES:.c=.o) --- -2.13.0 -
recipes-security/selinux/libsemanage/libsemanage-define-FD_CLOEXEC-as-necessary.patch +9 -11
@@ -1,7 +1,7 @@ -From e783080f30e00d00800ff3491d88c62b2a1c637b Mon Sep 17 00:00:00 2001 +From 171fc95c3dcec602cf65a36094e54b08b228bf76 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Tue, 15 Oct 2013 10:17:38 -0400 -Subject: [PATCH 3/3] libsemanage: define FD_CLOEXEC as necessary +Subject: [PATCH] libsemanage: define FD_CLOEXEC as necessary In truly old systems, even FD_CLOEXEC may not be defined. Produce a warning and duplicate the #define for FD_CLOEXEC found in
@@ -10,15 +10,16 @@ asm-generic/fcntl.h on more modern platforms. Uptream-Status: Inappropriate Signed-off-by: Joe MacDonald <[email protected]> + --- - libsemanage/src/semanage_store.c | 5 +++++ + src/semanage_store.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c -index 57ef49f..488a14a 100644 ---- a/libsemanage/src/semanage_store.c -+++ b/libsemanage/src/semanage_store.c -@@ -65,6 +65,11 @@ static const char *DISABLESTR="disabled"; +diff --git a/src/semanage_store.c b/src/semanage_store.c +index 1923f0f..f7a8760 100644 +--- a/src/semanage_store.c ++++ b/src/semanage_store.c +@@ -66,6 +66,11 @@ typedef struct dbase_policydb dbase_t; #define TRUE 1
@@ -30,6 +31,3 @@ index 57ef49f..488a14a 100644 enum semanage_file_defs { SEMANAGE_ROOT, SEMANAGE_TRANS_LOCK, --- -1.7.10.4 -
recipes-security/selinux/libsemanage/libsemanage-disable-expand-check-on-policy-load.patch +7 -6
@@ -1,4 +1,4 @@ -From b8c5b743c0e0435b1b89eb93c2b846bda7f132f5 Mon Sep 17 00:00:00 2001 +From f60a660f3e9efcec63f66fb9f6d9c636d1022227 Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Wed, 7 May 2014 11:36:27 -0400 Subject: [PATCH] libsemanage: disable expand-check on policy load
@@ -12,14 +12,15 @@ Upstream-Status: Denied [upstream developers want to preserve the default checking: http://marc.info/?l=selinux&m=121794804217721&w=2] Signed-off-by: Joe MacDonald <[email protected]> + --- - src/semanage.conf | 4 ++++ + src/semanage.conf | 4 ++++ 1 file changed, 4 insertions(+) -Index: libsemanage-2.4/src/semanage.conf -=================================================================== ---- libsemanage-2.4.orig/src/semanage.conf -+++ libsemanage-2.4/src/semanage.conf +diff --git a/src/semanage.conf b/src/semanage.conf +index dc8d46b..254f156 100644 +--- a/src/semanage.conf ++++ b/src/semanage.conf @@ -39,3 +39,7 @@ module-store = direct # By default, semanage will generate policies for the SELinux target. # To build policies for Xen, uncomment the following line.
recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch +14 -5
@@ -1,12 +1,21 @@ -Subject: libselinux: drop flag: -Wno-unused-but-set-variable +From e5aea57de30c969770bd518e2a703e656202a877 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod <[email protected]> +Date: Tue, 30 Apr 2013 23:15:57 -0400 +Subject: [PATCH] libselinux: drop flag: -Wno-unused-but-set-variable Upstream status: inappropriate (older compilers only). Signed-off-by: Randy MacLeod <[email protected]> ---- libsemanage-2.1.9.orig/src/Makefile -+++ libsemanage-2.1.9/src/Makefile -@@ -57,7 +57,7 @@ +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index fdb178f..d457208 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -58,7 +58,7 @@ OBJS= $(patsubst %.c,%.o,$(SRCS)) conf-scan.o conf-parse.o LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
@@ -14,4 +23,4 @@ Signed-off-by: Randy MacLeod <[email protected]> +SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-shadow \ -Wno-unused-parameter - override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE + override CFLAGS += -I../include -D_GNU_SOURCE
recipes-security/selinux/libsemanage/libsemanage-fix-path-nologin.patch +8 -7
@@ -1,3 +1,6 @@ +From 21f1fee58b9467e9351d8de25d75d541c22d36e9 Mon Sep 17 00:00:00 2001 +From: Xin Ouyang <[email protected]> +Date: Fri, 8 Feb 2013 15:16:07 +0800 Subject: [PATCH] libsemange: fix incorrect path for nologin shadow package of oe-core and Debian has installed nologin into
@@ -7,15 +10,16 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Xin Ouyang <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> + --- - src/genhomedircon.c | 4 ++-- + src/genhomedircon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/genhomedircon.c b/src/genhomedircon.c -index f3b9b5c..4f4865a 100644 +index b9a74b7..d574ee2 100644 --- a/src/genhomedircon.c +++ b/src/genhomedircon.c -@@ -58,7 +58,7 @@ +@@ -60,7 +60,7 @@ /* other paths */ #define PATH_SHELLS_FILE "/etc/shells"
@@ -24,7 +28,7 @@ index f3b9b5c..4f4865a 100644 /* comments written to context file */ #define COMMENT_FILE_CONTEXT_HEADER "#\n#\n# " \ -@@ -393,7 +393,7 @@ static semanage_list_t *get_home_dirs(genhomedircon_settings_t * s) +@@ -395,7 +395,7 @@ static semanage_list_t *get_home_dirs(genhomedircon_settings_t * s) /* NOTE: old genhomedircon printed a warning on match */ if (hand.matched) {
@@ -33,6 +37,3 @@ index f3b9b5c..4f4865a 100644 } else { if (semanage_list_push(&homedir_list, path)) goto fail; --- -1.7.9.5 -
recipes-security/selinux/libsemanage_2.7.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI += "\ file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ file://libsemanage-fix-path-nologin.patch \ file://libsemanage-drop-Wno-unused-but-set-variable.patch \ - file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ + file://libsemanage-define-FD_CLOEXEC-as-necessary.patch \ file://libsemanage-allow-to-disable-audit-support.patch \ file://libsemanage-disable-expand-check-on-policy-load.patch \ file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \
recipes-security/selinux/libsemanage_git.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI += "\ file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ file://libsemanage-fix-path-nologin.patch \ file://libsemanage-drop-Wno-unused-but-set-variable.patch \ - file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ + file://libsemanage-define-FD_CLOEXEC-as-necessary.patch \ file://libsemanage-allow-to-disable-audit-support.patch \ file://libsemanage-disable-expand-check-on-policy-load.patch \ file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \
Signature · 1 line
2.7.4
PATCH 3/3 selinux-python: refresh patches to fix QA warning
In reply to Yi ZhaoRefresh patches with devtool command to fix do_patch warning
Signed-off-by Yi Zhao <[email protected]>
--- .../fix-TypeError-for-seobject.py.patch | 17 +++++++++-------- .../selinux-python/fix-sepolicy-install-path.patch | 21 ++++++++++++--------- .../process-ValueError-for-sepolicy-seobject.patch | 12 +++++------- 3 files changed, 26 insertions(+), 24 deletions(-)
recipes-security/selinux/selinux-python/fix-TypeError-for-seobject.py.patch +9 -8
@@ -1,4 +1,4 @@ -From a66c50c0e8cd3799fc2819835b872ab62419f684 Mon Sep 17 00:00:00 2001 +From 98c2944ffa3e35095187e1df9ff33498bbd0fa54 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <[email protected]> Date: Tue, 1 Apr 2014 02:53:36 -0400 Subject: [PATCH] policycoreutils: fix TypeError for seobject.py
@@ -7,18 +7,19 @@ File "/usr/lib64/python2.7/site-packages/seobject.py", line 109, in log message += " sename=" + sename TypeError: cannot concatenate 'str' and 'NoneType' objects -Uptream-Status: pending +Uptream-Status: Pending Signed-off-by: Wenzong Fan <[email protected]> + --- - semanage/seobject.py | 2 +- + semanage/seobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: policycoreutils-2.5/semanage/seobject.py -=================================================================== ---- policycoreutils-2.5.orig/semanage/seobject.py 2016-02-25 13:41:38.035974459 -0500 -+++ policycoreutils-2.5/semanage/seobject.py 2016-02-25 13:43:42.075974072 -0500 -@@ -121,7 +121,7 @@ +diff --git a/semanage/seobject.py b/semanage/seobject.py +index 70fd192..23ab77e 100644 +--- a/semanage/seobject.py ++++ b/semanage/seobject.py +@@ -146,7 +146,7 @@ except: def log(self, msg, name="", sename="", serole="", serange="", oldsename="", oldserole="", oldserange=""): message = " %s name=%s" % (msg, name)
recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch +12 -9
@@ -1,18 +1,24 @@ +From 69e8697cd2ae48710ff8190bad3e61d2fd115b99 Mon Sep 17 00:00:00 2001 +From: Xin Ouyang <[email protected]> +Date: Mon, 23 Sep 2013 21:17:59 +0800 Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy +Uptream-Status: Pending + Signed-off-by: Xin Ouyang <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> + --- - sepolicy/Makefile | 4 +++- + sepolicy/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 2b8716c..70f4bdd 100644 +index 5a56e6c..82c3e36 100644 --- a/sepolicy/Makefile +++ b/sepolicy/Makefile -@@ -12,6 +12,8 @@ BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions - SHAREDIR ?= $(PREFIX)/share/sandbox - override CFLAGS = -I$(PREFIX)/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared +@@ -12,6 +12,8 @@ SHAREDIR ?= $(PREFIX)/share/sandbox + CFLAGS ?= -Wall -Werror -Wextra -W + override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared +PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') +
@@ -20,7 +26,7 @@ index 2b8716c..70f4bdd 100644 all: python-build @@ -30,7 +32,7 @@ test: - @python test_sepolicy.py -v + @$(PYTHON) test_sepolicy.py -v install: - $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
@@ -28,6 +34,3 @@ index 2b8716c..70f4bdd 100644 [ -d $(BINDIR) ] || mkdir -p $(BINDIR) install -m 755 sepolicy.py $(BINDIR)/sepolicy (cd $(BINDIR); ln -sf sepolicy sepolgen) --- -1.7.9.5 -
recipes-security/selinux/selinux-python/process-ValueError-for-sepolicy-seobject.patch +5 -7
@@ -1,4 +1,4 @@ -From b8e07bd0643b581ac33c96a1f94ae17c8df80ffd Mon Sep 17 00:00:00 2001 +From 1a8bd0ca13746b5241af5736dee9a25ab360652b Mon Sep 17 00:00:00 2001 From: Wenzong Fan <[email protected]> Date: Sun, 30 Mar 2014 22:25:59 -0400 Subject: [PATCH] semanage: process ValueError for sepolicy, seobject
@@ -7,15 +7,16 @@ The sepolicy, seobject modules raise many unprocessed ValueError, just process them in semanage to make the script proivdes error message but not error trace. -Uptream-Status: pending +Uptream-Status: Pending Signed-off-by: Wenzong Fan <[email protected]> + --- semanage/semanage | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/semanage/semanage b/semanage/semanage -index 19a6c51..c0083c6 100644 +index 313537c..2977dd0 100644 --- a/semanage/semanage +++ b/semanage/semanage @@ -25,8 +25,14 @@
@@ -34,7 +35,7 @@ index 19a6c51..c0083c6 100644 PROGNAME = "policycoreutils" try: import gettext -@@ -67,9 +73,6 @@ usage_interface_dict = {' --add': ('-t TYPE', '-r RANGE', 'interface'), ' --modi +@@ -73,9 +79,6 @@ usage_interface_dict = {' --add': ('-t TYPE', '-r RANGE', 'interface'), ' --modi usage_boolean = "semanage boolean [-h] [-n] [-N] [-S STORE] [" usage_boolean_dict = {' --modify': ('(', '--on', '|', '--off', ')', 'boolean'), ' --list': ('-C',), ' --extract': ('',), ' --deleteall': ('',)}
@@ -44,6 +45,3 @@ index 19a6c51..c0083c6 100644 class CheckRole(argparse.Action): def __call__(self, parser, namespace, value, option_string=None): --- -2.7.4 -
Signature · 1 line
2.7.4