@@ -1,4 +1,4 @@
-From 2111f86dce8defd9bebd9b43008339e3b5af0aa7 Mon Sep 17 00:00:00 2001
+From a91134e98ba4b3b6645d12bb68a07976b60f86c8 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Mon, 26 Mar 2012 15:15:16 +0800
Subject: [PATCH] libsemanage: Fix execve segfaults on Ubuntu.
@@ -17,7 +17,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/semanage_store.c b/src/semanage_store.c
-index 14a0957..0a9200e 100644
+index 27c5d34..519f298 100644
--- a/src/semanage_store.c
+++ b/src/semanage_store.c
@@ -1470,7 +1470,7 @@ static int semanage_exec_prog(semanage_handle_t * sh,
@@ -1,4 +1,4 @@
-From 5718384543ff06ad4032e90291f9e4398a2749c4 Mon Sep 17 00:00:00 2001
+From c96010440e7a2a87787a535fd0f9ccf26a2b4a5e 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,10 +13,10 @@ 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 71c2a1d..52f335e 100644
+index d525996..2f5e159 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -26,6 +26,14 @@ ifeq ($(DEBUG),1)
+@@ -27,6 +27,14 @@ ifeq ($(DEBUG),1)
export LDFLAGS ?= -g
endif
@@ -31,17 +31,17 @@ index 71c2a1d..52f335e 100644
LEX = flex
LFLAGS = -s
YACC = bison
-@@ -89,7 +97,7 @@ $(LIBA): $(OBJS)
+@@ -90,7 +98,7 @@ $(LIBA): $(OBJS)
$(RANLIB) $@
$(LIBSO): $(LOBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol $(LIBAUDIT) -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
+- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol $(LIBAUDIT) -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
ln -sf $@ $(TARGET)
$(LIBPC): $(LIBPC).in ../VERSION
diff --git a/src/seusers_local.c b/src/seusers_local.c
-index 6508ec0..1b26956 100644
+index 795a33d..6539cdf 100644
--- a/src/seusers_local.c
+++ b/src/seusers_local.c
@@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t;
@@ -56,7 +56,7 @@ index 6508ec0..1b26956 100644
#include <errno.h>
#include "user_internal.h"
#include "seuser_internal.h"
-@@ -55,6 +59,7 @@ static char *semanage_user_roles(semanage_handle_t * handle, const char *sename)
+@@ -56,6 +60,7 @@ static char *semanage_user_roles(semanage_handle_t * handle, const char *sename)
return roles;
}
@@ -64,7 +64,7 @@ index 6508ec0..1b26956 100644
static int semanage_seuser_audit(semanage_handle_t * handle,
const semanage_seuser_t * seuser,
const semanage_seuser_t * previous,
-@@ -119,6 +124,7 @@ err:
+@@ -120,6 +125,7 @@ err:
free(proles);
return rc;
}
@@ -72,7 +72,7 @@ index 6508ec0..1b26956 100644
int semanage_seuser_modify_local(semanage_handle_t * handle,
const semanage_seuser_key_t * key,
-@@ -163,8 +169,11 @@ int semanage_seuser_modify_local(semanage_handle_t * handle,
+@@ -164,8 +170,11 @@ int semanage_seuser_modify_local(semanage_handle_t * handle,
(void) semanage_seuser_query(handle, key, &previous);
handle->msg_callback = callback;
rc = dbase_modify(handle, dconfig, key, new);
@@ -84,7 +84,7 @@ index 6508ec0..1b26956 100644
err:
if (previous)
semanage_seuser_free(previous);
-@@ -180,8 +189,12 @@ int semanage_seuser_del_local(semanage_handle_t * handle,
+@@ -181,8 +190,12 @@ int semanage_seuser_del_local(semanage_handle_t * handle,
dbase_config_t *dconfig = semanage_seuser_dbase_local(handle);
rc = dbase_del(handle, dconfig, key);
semanage_seuser_query(handle, key, &seuser);
@@ -1,4 +1,4 @@
-From dd52bfb66d710473aeb75c5fe92d5cf0a66b637e Mon Sep 17 00:00:00 2001
+From 7af73c1684ce0e30ce0cd58b51708bde1e3a1984 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe@deserted.net>
Date: Wed, 7 May 2014 11:36:27 -0400
Subject: [PATCH] libsemanage: disable expand-check on policy load
similarity index 100%
rename from recipes-security/selinux/libsemanage_3.5.bb
rename to recipes-security/selinux/libsemanage_3.6.bb
* Refresh patches Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...anage-Fix-execve-segfaults-on-Ubuntu.patch | 4 ++-- ...anage-allow-to-disable-audit-support.patch | 22 +++++++++---------- ...-disable-expand-check-on-policy-load.patch | 2 +- ...{libsemanage_3.5.bb => libsemanage_3.6.bb} | 0 4 files changed, 14 insertions(+), 14 deletions(-) rename recipes-security/selinux/{libsemanage_3.5.bb => libsemanage_3.6.bb} (100%)