summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2016-03-07 15:52:43 -0500
committerPhilip Tricca <flihp@twobit.us>2016-03-17 02:27:56 +0000
commit338893a7a51ca34f5b18ba4d830f77e4754a4fb7 (patch)
tree9006e2406804e815ae22519569d883baaedabc79
parent81c08f019b1edc4fe97a2e2b5cc7687114e99ec8 (diff)
downloadmeta-selinux-338893a7a51ca34f5b18ba4d830f77e4754a4fb7.tar.gz
libsemanage: uprev to 2.5 (20160223)
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Philip Tricca <flihp@twobit.us>
-rw-r--r--recipes-security/selinux/libsemanage.inc3
-rw-r--r--recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch49
-rw-r--r--recipes-security/selinux/libsemanage_2.5.bb (renamed from recipes-security/selinux/libsemanage_2.4.bb)6
3 files changed, 29 insertions, 29 deletions
diff --git a/recipes-security/selinux/libsemanage.inc b/recipes-security/selinux/libsemanage.inc
index 7742c30..552d54d 100644
--- a/recipes-security/selinux/libsemanage.inc
+++ b/recipes-security/selinux/libsemanage.inc
@@ -11,6 +11,9 @@ inherit lib_package
11DEPENDS += "libsepol libselinux ustr bzip2 python bison-native flex-native" 11DEPENDS += "libsepol libselinux ustr bzip2 python bison-native flex-native"
12DEPENDS_append_class-target += "audit" 12DEPENDS_append_class-target += "audit"
13 13
14# For /usr/libexec/selinux/semanage_migrate_store
15RDEPENDS_${PN} += "python"
16
14PACKAGES += "${PN}-python" 17PACKAGES += "${PN}-python"
15FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" 18FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
16FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" 19FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*"
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 575d3a6..d727acf 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
@@ -12,11 +12,11 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
12 tests/Makefile | 10 +++++++++- 12 tests/Makefile | 10 +++++++++-
13 3 files changed, 31 insertions(+), 2 deletions(-) 13 3 files changed, 31 insertions(+), 2 deletions(-)
14 14
15diff --git a/src/Makefile b/src/Makefile 15Index: libsemanage-2.5/src/Makefile
16index 359d738..24dbf29 100644 16===================================================================
17--- a/src/Makefile 17--- libsemanage-2.5.orig/src/Makefile 2016-02-25 13:20:30.867978414 -0500
18+++ b/src/Makefile 18+++ libsemanage-2.5/src/Makefile 2016-02-25 13:20:30.859978414 -0500
19@@ -28,6 +28,14 @@ ifeq ($(DEBUG),1) 19@@ -28,6 +28,14 @@
20 export LDFLAGS = -g 20 export LDFLAGS = -g
21 endif 21 endif
22 22
@@ -31,7 +31,7 @@ index 359d738..24dbf29 100644
31 LEX = flex 31 LEX = flex
32 LFLAGS = -s 32 LFLAGS = -s
33 YACC = bison 33 YACC = bison
34@@ -92,7 +100,7 @@ $(LIBA): $(OBJS) 34@@ -92,7 +100,7 @@
35 $(RANLIB) $@ 35 $(RANLIB) $@
36 36
37 $(LIBSO): $(LOBJS) 37 $(LIBSO): $(LOBJS)
@@ -40,11 +40,11 @@ index 359d738..24dbf29 100644
40 ln -sf $@ $(TARGET) 40 ln -sf $@ $(TARGET)
41 41
42 $(LIBPC): $(LIBPC).in ../VERSION 42 $(LIBPC): $(LIBPC).in ../VERSION
43diff --git a/src/seusers_local.c b/src/seusers_local.c 43Index: libsemanage-2.5/src/seusers_local.c
44index 63ab40c..8bdc7da 100644 44===================================================================
45--- a/src/seusers_local.c 45--- libsemanage-2.5.orig/src/seusers_local.c 2016-02-25 13:20:30.867978414 -0500
46+++ b/src/seusers_local.c 46+++ libsemanage-2.5/src/seusers_local.c 2016-02-25 13:20:30.863978414 -0500
47@@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t; 47@@ -8,7 +8,11 @@
48 48
49 #include <sepol/policydb.h> 49 #include <sepol/policydb.h>
50 #include <sepol/context.h> 50 #include <sepol/context.h>
@@ -56,7 +56,7 @@ index 63ab40c..8bdc7da 100644
56 #include <errno.h> 56 #include <errno.h>
57 #include "user_internal.h" 57 #include "user_internal.h"
58 #include "seuser_internal.h" 58 #include "seuser_internal.h"
59@@ -51,6 +55,7 @@ static char *semanage_user_roles(semanage_handle_t * handle, const char *sename) 59@@ -51,6 +55,7 @@
60 return roles; 60 return roles;
61 } 61 }
62 62
@@ -64,7 +64,7 @@ index 63ab40c..8bdc7da 100644
64 static int semanage_seuser_audit(semanage_handle_t * handle, 64 static int semanage_seuser_audit(semanage_handle_t * handle,
65 const semanage_seuser_t * seuser, 65 const semanage_seuser_t * seuser,
66 const semanage_seuser_t * previous, 66 const semanage_seuser_t * previous,
67@@ -114,6 +119,7 @@ err: 67@@ -114,6 +119,7 @@
68 free(proles); 68 free(proles);
69 return rc; 69 return rc;
70 } 70 }
@@ -72,7 +72,7 @@ index 63ab40c..8bdc7da 100644
72 72
73 int semanage_seuser_modify_local(semanage_handle_t * handle, 73 int semanage_seuser_modify_local(semanage_handle_t * handle,
74 const semanage_seuser_key_t * key, 74 const semanage_seuser_key_t * key,
75@@ -157,8 +163,11 @@ int semanage_seuser_modify_local(semanage_handle_t * handle, 75@@ -158,8 +164,11 @@
76 (void) semanage_seuser_query(handle, key, &previous); 76 (void) semanage_seuser_query(handle, key, &previous);
77 handle->msg_callback = callback; 77 handle->msg_callback = callback;
78 rc = dbase_modify(handle, dconfig, key, new); 78 rc = dbase_modify(handle, dconfig, key, new);
@@ -84,7 +84,7 @@ index 63ab40c..8bdc7da 100644
84 err: 84 err:
85 if (previous) 85 if (previous)
86 semanage_seuser_free(previous); 86 semanage_seuser_free(previous);
87@@ -174,8 +183,12 @@ int semanage_seuser_del_local(semanage_handle_t * handle, 87@@ -175,8 +184,12 @@
88 dbase_config_t *dconfig = semanage_seuser_dbase_local(handle); 88 dbase_config_t *dconfig = semanage_seuser_dbase_local(handle);
89 rc = dbase_del(handle, dconfig, key); 89 rc = dbase_del(handle, dconfig, key);
90 semanage_seuser_query(handle, key, &seuser); 90 semanage_seuser_query(handle, key, &seuser);
@@ -97,15 +97,15 @@ index 63ab40c..8bdc7da 100644
97 if (seuser) 97 if (seuser)
98 semanage_seuser_free(seuser); 98 semanage_seuser_free(seuser);
99 return rc; 99 return rc;
100diff --git a/tests/Makefile b/tests/Makefile 100Index: libsemanage-2.5/tests/Makefile
101index 418d701..7839db6 100644 101===================================================================
102--- a/tests/Makefile 102--- libsemanage-2.5.orig/tests/Makefile 2016-02-25 13:20:30.867978414 -0500
103+++ b/tests/Makefile 103+++ libsemanage-2.5/tests/Makefile 2016-02-25 13:22:05.171978120 -0500
104@@ -13,7 +13,15 @@ EXECUTABLE = libsemanage-tests 104@@ -13,7 +13,15 @@
105 CC = gcc 105 CC = gcc
106 CFLAGS = -c -g -o0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter 106 CFLAGS += -g -O0 -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
107 INCLUDE = -I$(TESTSRC) -I$(TESTSRC)/../include 107 INCLUDE = -I$(TESTSRC) -I$(TESTSRC)/../include
108-LDFLAGS = -lcunit -lustr -lbz2 -laudit 108-LDFLAGS += -lcunit -lustr -lbz2 -laudit
109+DISABLE_AUDIT ?= n 109+DISABLE_AUDIT ?= n
110+ifeq ($(DISABLE_AUDIT),y) 110+ifeq ($(DISABLE_AUDIT),y)
111+ LIBAUDIT = 111+ LIBAUDIT =
@@ -114,10 +114,7 @@ index 418d701..7839db6 100644
114+ LIBAUDIT = -laudit 114+ LIBAUDIT = -laudit
115+endif 115+endif
116+ 116+
117+LDFLAGS = -lcunit -lustr -lbz2 $(LIBAUDIT) 117+LDFLAGS += -lcunit -lustr -lbz2 $(LIBAUDIT)
118 OBJECTS = $(SOURCES:.c=.o) 118 OBJECTS = $(SOURCES:.c=.o)
119 119
120 all: $(EXECUTABLE) 120 all: $(EXECUTABLE)
121--
1221.7.9.5
123
diff --git a/recipes-security/selinux/libsemanage_2.4.bb b/recipes-security/selinux/libsemanage_2.5.bb
index 4306675..27cbe7d 100644
--- a/recipes-security/selinux/libsemanage_2.4.bb
+++ b/recipes-security/selinux/libsemanage_2.5.bb
@@ -1,10 +1,10 @@
1include selinux_20150202.inc 1include selinux_20160223.inc
2include ${BPN}.inc 2include ${BPN}.inc
3 3
4LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" 4LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
5 5
6SRC_URI[md5sum] = "cd551eb1cc5d20652660bda037972f0d" 6SRC_URI[md5sum] = "eb030c863de1a6b3e2614a5c043c1641"
7SRC_URI[sha256sum] = "1a4cace4ef16786531ec075c0e7b2f961e2fee5dc86c5f983a689058899a6484" 7SRC_URI[sha256sum] = "46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006"
8 8
9SRC_URI += "\ 9SRC_URI += "\
10 file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ 10 file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \