* Drop obsolete patch: libsemanage-drop-Wno-unused-but-set-variable.patch
* Refresh patch: libsemanage-allow-to-disable-audit-support.patch Signed-off-by: Yi Zhao <[email protected]> --- ...anage-allow-to-disable-audit-support.patch | 12 ++++---- ...age-drop-Wno-unused-but-set-variable.patch | 28 ------------------- ...{libsemanage_3.0.bb => libsemanage_3.1.bb} | 7 ++--- 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch rename recipes-security/selinux/{libsemanage_3.0.bb => libsemanage_3.1.bb} (60%) diff --git a/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch b/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch index c588b61..ff5cb00 100644 --- a/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch +++ b/recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch @@ -1,4 +1,4 @@ -From 1633f72579e3b79d055759256b71e4169627889b Mon Sep 17 00:00:00 2001 +From e76867515be3bc296174aeb26c7996a0939a2a8c 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 @@ -13,11 +13,11 @@ Signed-off-by: Wenzong Fan <[email protected]> 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 3bd1e20..483e818 100644 +index a0eb374..afc4437 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,6 +26,14 @@ ifeq ($(DEBUG),1) - export LDFLAGS = -g + export LDFLAGS ?= -g endif +DISABLE_AUDIT ?= n @@ -31,7 +31,7 @@ index 3bd1e20..483e818 100644 LEX = flex LFLAGS = -s YACC = bison -@@ -88,7 +96,7 @@ $(LIBA): $(OBJS) +@@ -89,7 +97,7 @@ $(LIBA): $(OBJS) $(RANLIB) $@ $(LIBSO): $(LOBJS) @@ -41,7 +41,7 @@ index 3bd1e20..483e818 100644 $(LIBPC): $(LIBPC).in ../VERSION diff --git a/src/seusers_local.c b/src/seusers_local.c -index 3e2761c..8bc6b83 100644 +index 6508ec0..1b26956 100644 --- a/src/seusers_local.c +++ b/src/seusers_local.c @@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t; @@ -122,5 +122,5 @@ index 69f49a3..f914492 100644 OBJECTS = $(SOURCES:.c=.o) POLICIES = $(CILS:.cil=.policy) -- -2.7.4 +2.17.1 diff --git a/recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch b/recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch deleted file mode 100644 index c9b052c..0000000 --- a/recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 90a2459d1683e53f4a896b977e6b396db562c903 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]> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index e029f09..8240c3a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -55,7 +55,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 - --SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \ -+SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-shadow \ - -Wno-unused-parameter - - override CFLAGS += -I../include -D_GNU_SOURCE --- -2.7.4 - diff --git a/recipes-security/selinux/libsemanage_3.0.bb b/recipes-security/selinux/libsemanage_3.1.bb similarity index 60% rename from recipes-security/selinux/libsemanage_3.0.bb rename to recipes-security/selinux/libsemanage_3.1.bb index 450675b..8e6781f 100644 --- a/recipes-security/selinux/libsemanage_3.0.bb +++ b/recipes-security/selinux/libsemanage_3.1.bb @@ -1,14 +1,13 @@ -require selinux_20191204.inc +require selinux_20200710.inc require ${BPN}.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[md5sum] = "17a2fc780af0a36f2cf27ab7c4e85946" -SRC_URI[sha256sum] = "a497b0720d54eac427f1f3f618eed417e50ed8f4e47ed0f7a1d391bd416e84cf" +SRC_URI[md5sum] = "d16eee8c1dc8cf43f59957d575d6bd29" +SRC_URI[sha256sum] = "22d6c75526e40d1781c30bcf29abf97171bdfe6780923f11c8e1c76a75a21ff8" SRC_URI += "\ file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ - file://libsemanage-drop-Wno-unused-but-set-variable.patch \ 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 \ -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#51899): https://lists.yoctoproject.org/g/yocto/message/51899 Mute This Topic: https://lists.yoctoproject.org/mt/79492067/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
