Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sven Vermeulen (swift)" <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/sepolgen: ChangeLog sepolgen-1.1.9-r1.ebuild sepolgen-1.1.9-r4.ebuild sepolgen-1.1.9-r3.ebuild sepolgen-1.1.9-r2.ebuild
Date: Mon, 30 Sep 2013 18:38:19
Message-Id: 20130930183810.5CE402004C@flycatcher.gentoo.org
1 swift 13/09/30 18:38:10
2
3 Modified: ChangeLog sepolgen-1.1.9-r1.ebuild
4 sepolgen-1.1.9-r4.ebuild sepolgen-1.1.9-r3.ebuild
5 sepolgen-1.1.9-r2.ebuild
6 Log:
7 Fix circular dep on selinux-base
8
9 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
10
11 Revision Changes Path
12 1.37 dev-python/sepolgen/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/ChangeLog?rev=1.37&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/ChangeLog?rev=1.37&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/ChangeLog?r1=1.36&r2=1.37
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v
21 retrieving revision 1.36
22 retrieving revision 1.37
23 diff -u -r1.36 -r1.37
24 --- ChangeLog 25 Sep 2013 18:36:00 -0000 1.36
25 +++ ChangeLog 30 Sep 2013 18:38:10 -0000 1.37
26 @@ -1,6 +1,11 @@
27 # ChangeLog for dev-python/sepolgen
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.36 2013/09/25 18:36:00 swift Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.37 2013/09/30 18:38:10 swift Exp $
31 +
32 + 30 Sep 2013; Sven Vermeulen <swift@g.o> sepolgen-1.1.9-r1.ebuild,
33 + sepolgen-1.1.9-r2.ebuild, sepolgen-1.1.9-r3.ebuild, sepolgen-1.1.9-r4.ebuild:
34 + Drop selinux-base dependency again, creates circular dep :-( Instead check if
35 + file exists and, if not, fall back to POLICY_TYPES content
36
37 25 Sep 2013; Sven Vermeulen <swift@g.o> sepolgen-1.1.9-r2.ebuild,
38 sepolgen-1.1.9-r3.ebuild, sepolgen-1.1.9-r4.ebuild:
39
40
41
42 1.3 dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild?rev=1.3&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild?rev=1.3&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild?r1=1.2&r2=1.3
47
48 Index: sepolgen-1.1.9-r1.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v
51 retrieving revision 1.2
52 retrieving revision 1.3
53 diff -u -r1.2 -r1.3
54 --- sepolgen-1.1.9-r1.ebuild 18 May 2013 18:03:42 -0000 1.2
55 +++ sepolgen-1.1.9-r1.ebuild 30 Sep 2013 18:38:10 -0000 1.3
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2013 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.2 2013/05/18 18:03:42 swift Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $
61
62 EAPI="3"
63 PYTHON_DEPEND="*"
64 @@ -56,9 +56,20 @@
65 python_execute_function installation
66
67 # Create sepolgen.conf with different devel location definition
68 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
69 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
70 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
71 + if [[ -f /etc/selinux/config ]];
72 + then
73 + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
74 + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
75 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
76 + else
77 + local selinuxtype="${POLICY_TYPES%% *}";
78 + if [[ -n "${selinuxtype}" ]];
79 + then
80 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
81 + else
82 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf;
83 + fi
84 + fi
85 }
86
87 pkg_postinst() {
88
89
90
91 1.3 dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild?rev=1.3&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild?rev=1.3&content-type=text/plain
95 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild?r1=1.2&r2=1.3
96
97 Index: sepolgen-1.1.9-r4.ebuild
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild,v
100 retrieving revision 1.2
101 retrieving revision 1.3
102 diff -u -r1.2 -r1.3
103 --- sepolgen-1.1.9-r4.ebuild 25 Sep 2013 18:36:00 -0000 1.2
104 +++ sepolgen-1.1.9-r4.ebuild 30 Sep 2013 18:38:10 -0000 1.3
105 @@ -1,6 +1,6 @@
106 # Copyright 1999-2013 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild,v 1.2 2013/09/25 18:36:00 swift Exp $
109 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $
110
111 EAPI="5"
112 PYTHON_COMPAT=( python2_7 )
113 @@ -19,7 +19,6 @@
114
115 DEPEND=">=sys-libs/libselinux-2.0[python]
116 app-admin/setools[python]
117 - sec-policy/selinux-base
118 ${PYTHON_DEPS}"
119 RDEPEND="${DEPEND}"
120
121 @@ -57,7 +56,18 @@
122 python_foreach_impl installation
123
124 # Create sepolgen.conf with different devel location definition
125 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
126 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
127 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
128 + if [[ -f /etc/selinux/config ]];
129 + then
130 + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
131 + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
132 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
133 + else
134 + local selinuxtype="${POLICY_TYPES%% *}";
135 + if [[ -n "${selinuxtype}" ]];
136 + then
137 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
138 + else
139 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf;
140 + fi
141 + fi
142 }
143
144
145
146 1.3 dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild
147
148 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild?rev=1.3&view=markup
149 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild?rev=1.3&content-type=text/plain
150 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild?r1=1.2&r2=1.3
151
152 Index: sepolgen-1.1.9-r3.ebuild
153 ===================================================================
154 RCS file: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v
155 retrieving revision 1.2
156 retrieving revision 1.3
157 diff -u -r1.2 -r1.3
158 --- sepolgen-1.1.9-r3.ebuild 25 Sep 2013 18:36:00 -0000 1.2
159 +++ sepolgen-1.1.9-r3.ebuild 30 Sep 2013 18:38:10 -0000 1.3
160 @@ -1,6 +1,6 @@
161 # Copyright 1999-2013 Gentoo Foundation
162 # Distributed under the terms of the GNU General Public License v2
163 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.2 2013/09/25 18:36:00 swift Exp $
164 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $
165
166 EAPI="5"
167 PYTHON_COMPAT=( python2_7 )
168 @@ -19,7 +19,6 @@
169
170 DEPEND=">=sys-libs/libselinux-2.0[python]
171 app-admin/setools[python]
172 - sec-policy/selinux-base
173 ${PYTHON_DEPS}"
174 RDEPEND="${DEPEND}"
175
176 @@ -57,7 +56,18 @@
177 python_foreach_impl installation
178
179 # Create sepolgen.conf with different devel location definition
180 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
181 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
182 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
183 + if [[ -f /etc/selinux/config ]];
184 + then
185 + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
186 + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
187 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
188 + else
189 + local selinuxtype="${POLICY_TYPES%% *}";
190 + if [[ -n "${selinuxtype}" ]];
191 + then
192 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
193 + else
194 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf;
195 + fi
196 + fi
197 }
198
199
200
201 1.4 dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild
202
203 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild?rev=1.4&view=markup
204 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild?rev=1.4&content-type=text/plain
205 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild?r1=1.3&r2=1.4
206
207 Index: sepolgen-1.1.9-r2.ebuild
208 ===================================================================
209 RCS file: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v
210 retrieving revision 1.3
211 retrieving revision 1.4
212 diff -u -r1.3 -r1.4
213 --- sepolgen-1.1.9-r2.ebuild 25 Sep 2013 18:36:00 -0000 1.3
214 +++ sepolgen-1.1.9-r2.ebuild 30 Sep 2013 18:38:10 -0000 1.4
215 @@ -1,6 +1,6 @@
216 # Copyright 1999-2013 Gentoo Foundation
217 # Distributed under the terms of the GNU General Public License v2
218 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.3 2013/09/25 18:36:00 swift Exp $
219 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.4 2013/09/30 18:38:10 swift Exp $
220
221 EAPI="3"
222 PYTHON_DEPEND="*"
223 @@ -20,8 +20,7 @@
224 IUSE=""
225
226 DEPEND=">=sys-libs/libselinux-2.0[python]
227 - app-admin/setools[python]
228 - sec-policy/selinux-base"
229 + app-admin/setools[python]"
230 RDEPEND="${DEPEND}"
231
232 src_prepare() {
233 @@ -59,9 +58,20 @@
234 python_execute_function installation
235
236 # Create sepolgen.conf with different devel location definition
237 - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
238 - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
239 - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
240 + if [[ -f /etc/selinux/config ]];
241 + then
242 + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
243 + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
244 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
245 + else
246 + local selinuxtype="${POLICY_TYPES%% *}";
247 + if [[ -n "${selinuxtype}" ]];
248 + then
249 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf;
250 + else
251 + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf;
252 + fi
253 + fi
254 }
255
256 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups