1 |
commit: f8698a457a75d4cfc7a8cc71d7ad1c98d3c60bbc |
2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 4 13:59:24 2018 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 4 14:20:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8698a45 |
7 |
|
8 |
sec-policy/selinux-base-policy: postinst should not die |
9 |
|
10 |
postinst is not allowed to die and it breaks catalyst stage building. |
11 |
|
12 |
commit f03eee7017c288deabdfc593079397d480ea473a fixed this for some |
13 |
versions, this fixes all the other ebuilds too that were missed. |
14 |
|
15 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
16 |
|
17 |
.../selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild | 6 +++--- |
18 |
.../selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild | 6 +++--- |
19 |
.../selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild | 6 +++--- |
20 |
.../selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild | 6 +++--- |
21 |
.../selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild | 6 +++--- |
22 |
.../selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild | 2 +- |
23 |
.../selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild | 2 +- |
24 |
.../selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild | 4 ++-- |
25 |
sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 6 +++--- |
26 |
9 files changed, 22 insertions(+), 22 deletions(-) |
27 |
|
28 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild |
29 |
index 6782cb71930..159a4384e56 100644 |
30 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild |
31 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild |
32 |
@@ -1,4 +1,4 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
+# Copyright 1999-2018 Gentoo Foundation |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
EAPI="6" |
38 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
39 |
for i in ${POLICY_TYPES}; do |
40 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
41 |
|
42 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
43 |
+ cd /usr/share/selinux/${i} |
44 |
|
45 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
46 |
+ semodule -s ${i} ${COMMAND} |
47 |
done |
48 |
|
49 |
# Relabel depending packages |
50 |
|
51 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild |
52 |
index dfe1dece31a..5627947be22 100644 |
53 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild |
54 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild |
55 |
@@ -1,4 +1,4 @@ |
56 |
-# Copyright 1999-2017 Gentoo Foundation |
57 |
+# Copyright 1999-2018 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
|
60 |
EAPI="6" |
61 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
62 |
for i in ${POLICY_TYPES}; do |
63 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
64 |
|
65 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
66 |
+ cd /usr/share/selinux/${i} |
67 |
|
68 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
69 |
+ semodule -s ${i} ${COMMAND} |
70 |
done |
71 |
|
72 |
# Relabel depending packages |
73 |
|
74 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild |
75 |
index dfe1dece31a..5627947be22 100644 |
76 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild |
77 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild |
78 |
@@ -1,4 +1,4 @@ |
79 |
-# Copyright 1999-2017 Gentoo Foundation |
80 |
+# Copyright 1999-2018 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
|
83 |
EAPI="6" |
84 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
85 |
for i in ${POLICY_TYPES}; do |
86 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
87 |
|
88 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
89 |
+ cd /usr/share/selinux/${i} |
90 |
|
91 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
92 |
+ semodule -s ${i} ${COMMAND} |
93 |
done |
94 |
|
95 |
# Relabel depending packages |
96 |
|
97 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild |
98 |
index dfe1dece31a..5627947be22 100644 |
99 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild |
100 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild |
101 |
@@ -1,4 +1,4 @@ |
102 |
-# Copyright 1999-2017 Gentoo Foundation |
103 |
+# Copyright 1999-2018 Gentoo Foundation |
104 |
# Distributed under the terms of the GNU General Public License v2 |
105 |
|
106 |
EAPI="6" |
107 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
108 |
for i in ${POLICY_TYPES}; do |
109 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
110 |
|
111 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
112 |
+ cd /usr/share/selinux/${i} |
113 |
|
114 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
115 |
+ semodule -s ${i} ${COMMAND} |
116 |
done |
117 |
|
118 |
# Relabel depending packages |
119 |
|
120 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild |
121 |
index c3e96688105..27177f64715 100644 |
122 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild |
123 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild |
124 |
@@ -1,4 +1,4 @@ |
125 |
-# Copyright 1999-2017 Gentoo Foundation |
126 |
+# Copyright 1999-2018 Gentoo Foundation |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
|
129 |
EAPI="6" |
130 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
131 |
for i in ${POLICY_TYPES}; do |
132 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
133 |
|
134 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
135 |
+ cd /usr/share/selinux/${i} |
136 |
|
137 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
138 |
+ semodule -s ${i} ${COMMAND} |
139 |
done |
140 |
|
141 |
# Relabel depending packages |
142 |
|
143 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
144 |
index 8ef5919d347..27177f64715 100644 |
145 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
146 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
147 |
@@ -104,7 +104,7 @@ pkg_postinst() { |
148 |
for i in ${POLICY_TYPES}; do |
149 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
150 |
|
151 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
152 |
+ cd /usr/share/selinux/${i} |
153 |
|
154 |
semodule -s ${i} ${COMMAND} |
155 |
done |
156 |
|
157 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
158 |
index 33d98c80502..e58899c1855 100644 |
159 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
160 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
161 |
@@ -104,7 +104,7 @@ pkg_postinst() { |
162 |
for i in ${POLICY_TYPES}; do |
163 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
164 |
|
165 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
166 |
+ cd /usr/share/selinux/${i} |
167 |
|
168 |
semodule -s ${i} ${COMMAND} |
169 |
done |
170 |
|
171 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild |
172 |
index 5dadfcb0904..e58899c1855 100644 |
173 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild |
174 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild |
175 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
176 |
for i in ${POLICY_TYPES}; do |
177 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
178 |
|
179 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
180 |
+ cd /usr/share/selinux/${i} |
181 |
|
182 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
183 |
+ semodule -s ${i} ${COMMAND} |
184 |
done |
185 |
|
186 |
# Relabel depending packages |
187 |
|
188 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild |
189 |
index 111bd573773..e58899c1855 100644 |
190 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild |
191 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild |
192 |
@@ -1,4 +1,4 @@ |
193 |
-# Copyright 1999-2017 Gentoo Foundation |
194 |
+# Copyright 1999-2018 Gentoo Foundation |
195 |
# Distributed under the terms of the GNU General Public License v2 |
196 |
|
197 |
EAPI="6" |
198 |
@@ -104,9 +104,9 @@ pkg_postinst() { |
199 |
for i in ${POLICY_TYPES}; do |
200 |
einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" |
201 |
|
202 |
- cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
203 |
+ cd /usr/share/selinux/${i} |
204 |
|
205 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
206 |
+ semodule -s ${i} ${COMMAND} |
207 |
done |
208 |
|
209 |
# Relabel depending packages |