CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsemanage: upgrade to 3.1 (20200710)

Browse Source 
* 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 <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
This commit is contained in:
Yi Zhao 2021-01-07 11:43:35 +08:00 committed by Joe MacDonald
parent 1bd98fe493
commit eb8c4da63f
3 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch
View File

@ -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 <wenzong.fan@windriver.com>
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 <wenzong.fan@windriver.com>
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

28
recipes-security/selinux/libsemanage/libsemanage-drop-Wno-unused-but-set-variable.patch
View File

@ -1,28 +0,0 @@
From 90a2459d1683e53f4a896b977e6b396db562c903 Mon Sep 17 00:00:00 2001
From: Randy MacLeod <Randy.MacLeod@windriver.com>
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 <Randy.MacLeod@windriver.com>
---
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

7
recipes-security/selinux/libsemanage_3.0.bb → recipes-security/selinux/libsemanage_3.1.bb
View File

@ -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 \