1 |
commit: 54a8322d1885f7f1bfe2718fb731d6e195f86466 |
2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 2 23:17:16 2022 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 2 23:24:21 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a8322d |
7 |
|
8 |
sys-apps/policycoreutils: Specify policy root path correctly |
9 |
|
10 |
Commit df72ab351f482dea63d27e447b2a93549a742ecd added support for |
11 |
rebuilding the policy in a crossdev environment but the root needs to be |
12 |
specified with -p instead of -S. |
13 |
The policy dir (-S) defaults to (-p) + /var/lib/selinux/ + (-s). |
14 |
Thanks to Feandil for reporting this issue. |
15 |
|
16 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
17 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
18 |
|
19 |
sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild | 4 ++-- |
20 |
sys-apps/policycoreutils/policycoreutils-3.2.ebuild | 4 ++-- |
21 |
sys-apps/policycoreutils/policycoreutils-3.3.ebuild | 4 ++-- |
22 |
sys-apps/policycoreutils/policycoreutils-9999.ebuild | 4 ++-- |
23 |
4 files changed, 8 insertions(+), 8 deletions(-) |
24 |
|
25 |
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild |
26 |
index e995a286771b..eea202ba8299 100644 |
27 |
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild |
28 |
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild |
29 |
@@ -1,4 +1,4 @@ |
30 |
-# Copyright 1999-2021 Gentoo Authors |
31 |
+# Copyright 1999-2022 Gentoo Authors |
32 |
# Distributed under the terms of the GNU General Public License v2 |
33 |
|
34 |
EAPI="7" |
35 |
@@ -163,6 +163,6 @@ pkg_postinst() { |
36 |
# There have been some changes to the policy store, rebuilding now. |
37 |
# https://marc.info/?l=selinux&m=143757277819717&w=2 |
38 |
einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." |
39 |
- semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
40 |
+ semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
41 |
done |
42 |
} |
43 |
|
44 |
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild |
45 |
index 1c90708b2731..456189b1aac5 100644 |
46 |
--- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild |
47 |
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2021 Gentoo Authors |
50 |
+# Copyright 1999-2022 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
EAPI="7" |
54 |
@@ -157,6 +157,6 @@ pkg_postinst() { |
55 |
# There have been some changes to the policy store, rebuilding now. |
56 |
# https://marc.info/?l=selinux&m=143757277819717&w=2 |
57 |
einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." |
58 |
- semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
59 |
+ semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
60 |
done |
61 |
} |
62 |
|
63 |
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild |
64 |
index 1c90708b2731..456189b1aac5 100644 |
65 |
--- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild |
66 |
+++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild |
67 |
@@ -1,4 +1,4 @@ |
68 |
-# Copyright 1999-2021 Gentoo Authors |
69 |
+# Copyright 1999-2022 Gentoo Authors |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
|
72 |
EAPI="7" |
73 |
@@ -157,6 +157,6 @@ pkg_postinst() { |
74 |
# There have been some changes to the policy store, rebuilding now. |
75 |
# https://marc.info/?l=selinux&m=143757277819717&w=2 |
76 |
einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." |
77 |
- semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
78 |
+ semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
79 |
done |
80 |
} |
81 |
|
82 |
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild |
83 |
index 6b00366fe883..e6ee13c43070 100644 |
84 |
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild |
85 |
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild |
86 |
@@ -1,4 +1,4 @@ |
87 |
-# Copyright 1999-2021 Gentoo Authors |
88 |
+# Copyright 1999-2022 Gentoo Authors |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
|
91 |
EAPI="7" |
92 |
@@ -157,6 +157,6 @@ pkg_postinst() { |
93 |
# There have been some changes to the policy store, rebuilding now. |
94 |
# https://marc.info/?l=selinux&m=143757277819717&w=2 |
95 |
einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." |
96 |
- semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
97 |
+ semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" |
98 |
done |
99 |
} |