diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-04-14 15:41:48 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2020-04-15 14:58:16 -0400 |
commit | 4ca0557476009b7eda8706b5d2772d70278291de (patch) | |
tree | 8a8743336da74f64c2e0e01f974da512edff86b5 /recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch | |
parent | 65086a9972bf345a72c5c1f40dfb3209e1059ccf (diff) | |
download | meta-selinux-4ca0557476009b7eda8706b5d2772d70278291de.tar.gz |
libsemanage: upgrade to 3.0 (20191204)
* Refresh libsemanage-allow-to-disable-audit-support.patch
* Fix typos in patches.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch')
-rw-r--r-- | recipes-security/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 6ea9c29..c588b61 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 @@ | |||
1 | From 50f8f9f090425d23ecab2bedc949bc65bc4d58dc Mon Sep 17 00:00:00 2001 | 1 | From 1633f72579e3b79d055759256b71e4169627889b Mon Sep 17 00:00:00 2001 |
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
3 | Date: Mon, 20 Jan 2014 03:53:48 -0500 | 3 | Date: Mon, 20 Jan 2014 03:53:48 -0500 |
4 | Subject: [PATCH] libsemanage: allow to disable audit support | 4 | Subject: [PATCH] libsemanage: allow to disable audit support |
@@ -13,7 +13,7 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | |||
13 | 3 files changed, 31 insertions(+), 2 deletions(-) | 13 | 3 files changed, 31 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/src/Makefile b/src/Makefile | 15 | diff --git a/src/Makefile b/src/Makefile |
16 | index 8240c3a..1485d23 100644 | 16 | index 3bd1e20..483e818 100644 |
17 | --- a/src/Makefile | 17 | --- a/src/Makefile |
18 | +++ b/src/Makefile | 18 | +++ b/src/Makefile |
19 | @@ -26,6 +26,14 @@ ifeq ($(DEBUG),1) | 19 | @@ -26,6 +26,14 @@ ifeq ($(DEBUG),1) |
@@ -41,7 +41,7 @@ index 8240c3a..1485d23 100644 | |||
41 | 41 | ||
42 | $(LIBPC): $(LIBPC).in ../VERSION | 42 | $(LIBPC): $(LIBPC).in ../VERSION |
43 | diff --git a/src/seusers_local.c b/src/seusers_local.c | 43 | diff --git a/src/seusers_local.c b/src/seusers_local.c |
44 | index a79e2d3..ce76dee 100644 | 44 | index 3e2761c..8bc6b83 100644 |
45 | --- a/src/seusers_local.c | 45 | --- a/src/seusers_local.c |
46 | +++ b/src/seusers_local.c | 46 | +++ b/src/seusers_local.c |
47 | @@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t; | 47 | @@ -8,7 +8,11 @@ typedef struct semanage_seuser record_t; |
@@ -98,10 +98,10 @@ index a79e2d3..ce76dee 100644 | |||
98 | semanage_seuser_free(seuser); | 98 | semanage_seuser_free(seuser); |
99 | return rc; | 99 | return rc; |
100 | diff --git a/tests/Makefile b/tests/Makefile | 100 | diff --git a/tests/Makefile b/tests/Makefile |
101 | index 324766a..5732ec7 100644 | 101 | index 69f49a3..f914492 100644 |
102 | --- a/tests/Makefile | 102 | --- a/tests/Makefile |
103 | +++ b/tests/Makefile | 103 | +++ b/tests/Makefile |
104 | @@ -3,10 +3,18 @@ SOURCES = $(sort $(wildcard *.c)) | 104 | @@ -4,10 +4,18 @@ CILS = $(sort $(wildcard *.cil)) |
105 | 105 | ||
106 | ########################################################################### | 106 | ########################################################################### |
107 | 107 | ||
@@ -119,8 +119,8 @@ index 324766a..5732ec7 100644 | |||
119 | -override LDLIBS += -lcunit -lbz2 -laudit -lselinux -lsepol | 119 | -override LDLIBS += -lcunit -lbz2 -laudit -lselinux -lsepol |
120 | +override LDLIBS += -lcunit -lbz2 $(LIBAUDIT) -lselinux -lsepol | 120 | +override LDLIBS += -lcunit -lbz2 $(LIBAUDIT) -lselinux -lsepol |
121 | 121 | ||
122 | OBJECTS = $(SOURCES:.c=.o) | 122 | OBJECTS = $(SOURCES:.c=.o) |
123 | 123 | POLICIES = $(CILS:.cil=.policy) | |
124 | -- | 124 | -- |
125 | 2.7.4 | 125 | 2.7.4 |
126 | 126 | ||