!315 drop security_context_t
From: @zh_xiaoyu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian
This commit is contained in:
commit
10f063512e
29
0011-drop-security_context_t.patch
Normal file
29
0011-drop-security_context_t.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From bcc3084c9230486c3a7d40cff633d581f6a1a990 Mon Sep 17 00:00:00 2001
|
||||||
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||||
|
Date: Tue, 26 Jul 2022 14:27:11 +0800
|
||||||
|
Subject: [PATCH] drop security_context_t
|
||||||
|
|
||||||
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||||||
|
---
|
||||||
|
src/lxc/lsm/selinux.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
|
||||||
|
index bd4f449..c24d238 100644
|
||||||
|
--- a/src/lxc/lsm/selinux.c
|
||||||
|
+++ b/src/lxc/lsm/selinux.c
|
||||||
|
@@ -36,7 +36,11 @@ lxc_log_define(selinux, lsm);
|
||||||
|
*/
|
||||||
|
static char *selinux_process_label_get(pid_t pid)
|
||||||
|
{
|
||||||
|
+#ifdef HAVE_ISULAD
|
||||||
|
+ char *ctx;
|
||||||
|
+#else
|
||||||
|
security_context_t ctx;
|
||||||
|
+#endif
|
||||||
|
char *label;
|
||||||
|
|
||||||
|
if (getpidcon_raw(pid, &ctx) < 0) {
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
|||||||
%global _release 2022072502
|
%global _release 2022072601
|
||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 4.0.3
|
Version: 4.0.3
|
||||||
@ -18,6 +18,7 @@ Patch0007: 0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch
|
|||||||
Patch0008: 0008-refactor-patch-code-of-json.patch
|
Patch0008: 0008-refactor-patch-code-of-json.patch
|
||||||
Patch0009: 0009-fix-HOME-env-of-container-unset-error.patch
|
Patch0009: 0009-fix-HOME-env-of-container-unset-error.patch
|
||||||
Patch0010: 0010-check-yajl-only-when-have-isulad.patch
|
Patch0010: 0010-check-yajl-only-when-have-isulad.patch
|
||||||
|
Patch0011: 0011-drop-security_context_t.patch
|
||||||
|
|
||||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||||
BuildRequires: pkgconfig(libseccomp)
|
BuildRequires: pkgconfig(libseccomp)
|
||||||
@ -189,6 +190,12 @@ make check
|
|||||||
%{_mandir}/*/man7/%{name}*
|
%{_mandir}/*/man7/%{name}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 26 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072601
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: drop security_context_t
|
||||||
|
|
||||||
* Mon Jul 25 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072502
|
* Mon Jul 25 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022072502
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -8,3 +8,4 @@
|
|||||||
0008-refactor-patch-code-of-json.patch
|
0008-refactor-patch-code-of-json.patch
|
||||||
0009-fix-HOME-env-of-container-unset-error.patch
|
0009-fix-HOME-env-of-container-unset-error.patch
|
||||||
0010-check-yajl-only-when-have-isulad.patch
|
0010-check-yajl-only-when-have-isulad.patch
|
||||||
|
0011-drop-security_context_t.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user