diff --git a/0007-Using-string-type-instead-of-security_context_t-beca.patch b/0007-Using-string-type-instead-of-security_context_t-beca.patch new file mode 100644 index 0000000000000000000000000000000000000000..3074d3f5077f1a6a87770eae45d8c45f1b1c1671 --- /dev/null +++ b/0007-Using-string-type-instead-of-security_context_t-beca.patch @@ -0,0 +1,27 @@ +From 5a8c9b52ad3291feb87c2281e074b2c85c766245 Mon Sep 17 00:00:00 2001 +From: wujing +Date: Fri, 25 Sep 2020 10:21:37 +0800 +Subject: [PATCH] Using string type instead of security_context_t because it is + deprecated + +Signed-off-by: wujing +--- + src/lxc/lsm/selinux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c +index 837a3da3..79697c58 100644 +--- a/src/lxc/lsm/selinux.c ++++ b/src/lxc/lsm/selinux.c +@@ -36,7 +36,7 @@ lxc_log_define(selinux, lsm); + */ + static char *selinux_process_label_get(pid_t pid) + { +- security_context_t ctx; ++ char *ctx; + char *label; + + if (getpidcon_raw(pid, &ctx) < 0) { +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index 4d21287bc5b06f071dc17d81af1c7059dbbc70b4..2fbf9c70e7d529c18f5fa5bd8386de91fd658486 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2020091101 +%global _release 2020092501 Name: lxc Version: 4.0.3 @@ -13,6 +13,7 @@ Patch9003: 0003-format-code-and-verify-mount-mode.patch Patch9004: 0004-Removes-the-definition-of-the-thread-attributes-obje.patch Patch9005: 0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch Patch9006: 0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch +Patch9007: 0007-Using-string-type-instead-of-security_context_t-beca.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -185,6 +186,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Fri Sep 25 2020 openEuler Buildteam - 4.0.3-2020092501 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: Code optimization + * Fri Sep 11 2020 openEuler Buildteam - 4.0.3-2020091101 - Type:enhancement - ID:NA