Gentoo Archives: gentoo-commits

From: "Dominik Stadler (centic)" <centic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/firehol: firehol-1.250-r1.ebuild firehol-1.250.ebuild firehol-1.256.ebuild firehol-1.250-r2.ebuild ChangeLog firehol-1.256-r1.ebuild
Date: Mon, 05 Nov 2007 14:08:06
Message-Id: E1Ip2cM-0003hv-W5@stork.gentoo.org
1 centic 07/11/05 14:07:54
2
3 Modified: firehol-1.250-r1.ebuild firehol-1.250.ebuild
4 firehol-1.256.ebuild firehol-1.250-r2.ebuild
5 ChangeLog
6 Added: firehol-1.256-r1.ebuild
7 Log:
8 Bug 195378, fix check for zcat, Bug 172000, add check for kernel configuration, also add missing quotes as reported by repoman
9 (Portage version: 2.1.3.15)
10
11 Revision Changes Path
12 1.4 net-firewall/firehol/firehol-1.250-r1.ebuild
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild?r1=1.3&r2=1.4
17
18 Index: firehol-1.250-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- firehol-1.250-r1.ebuild 13 Jul 2007 07:21:37 -0000 1.3
25 +++ firehol-1.250-r1.ebuild 5 Nov 2007 14:07:54 -0000 1.4
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2007 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v 1.3 2007/07/13 07:21:37 mr_bones_ Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r1.ebuild,v 1.4 2007/11/05 14:07:54 centic Exp $
31
32 inherit eutils
33
34 @@ -39,11 +39,11 @@
35 # backport from firehol-CVS.
36 src_unpack() {
37 unpack ${A}
38 - cd ${S} || die
39 - epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
40 - epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
41 - epatch ${FILESDIR}/${P}-groupwith.patch || die
42 - epatch ${FILESDIR}/${P}-printf.patch || die
43 + cd "${S}" || die
44 + epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
45 + epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
46 + epatch "${FILESDIR}/${P}-groupwith.patch" || die
47 + epatch "${FILESDIR}/${P}-printf.patch" || die
48 }
49
50 src_install() {
51 @@ -53,7 +53,7 @@
52 insinto /etc/firehol/examples
53 doins examples/* || die
54
55 - newconfd ${FILESDIR}/firehol.conf.d firehol || die
56 + newconfd "${FILESDIR}/firehol.conf.d firehol" || die
57
58 dodoc ChangeLog README TODO WhatIsNew || die
59 dohtml doc/*.html doc/*.css || die
60 @@ -63,7 +63,7 @@
61
62 doman man/*.1 man/*.5 || die
63
64 - newinitd ${FILESDIR}/firehol.initrd firehol || die
65 + newinitd "${FILESDIR}/firehol.initrd firehol" || die
66 }
67
68 pkg_postinst() {
69
70
71
72 1.6 net-firewall/firehol/firehol-1.250.ebuild
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild?rev=1.6&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild?rev=1.6&content-type=text/plain
76 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild?r1=1.5&r2=1.6
77
78 Index: firehol-1.250.ebuild
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild,v
81 retrieving revision 1.5
82 retrieving revision 1.6
83 diff -u -r1.5 -r1.6
84 --- firehol-1.250.ebuild 13 Jul 2007 07:21:37 -0000 1.5
85 +++ firehol-1.250.ebuild 5 Nov 2007 14:07:54 -0000 1.6
86 @@ -1,6 +1,6 @@
87 # Copyright 1999-2007 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild,v 1.5 2007/07/13 07:21:37 mr_bones_ Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250.ebuild,v 1.6 2007/11/05 14:07:54 centic Exp $
91
92 inherit eutils
93
94 @@ -39,10 +39,10 @@
95 # backport from firehol-CVS.
96 src_unpack() {
97 unpack ${A}
98 - cd ${S} || die
99 - epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
100 - epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
101 - epatch ${FILESDIR}/${P}-printf.patch || die
102 + cd "${S}" || die
103 + epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
104 + epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
105 + epatch "${FILESDIR}/${P}-printf.patch" || die
106 }
107
108 src_install() {
109 @@ -52,7 +52,7 @@
110 insinto /etc/firehol/examples
111 doins examples/* || die
112
113 - newconfd ${FILESDIR}/firehol.conf.d firehol || die
114 + newconfd "${FILESDIR}/firehol.conf.d firehol" || die
115
116 dodoc ChangeLog README TODO WhatIsNew || die
117 dohtml doc/*.html doc/*.css || die
118 @@ -62,7 +62,7 @@
119
120 doman man/*.1 man/*.5 || die
121
122 - newinitd ${FILESDIR}/firehol.initrd firehol || die
123 + newinitd "${FILESDIR}/firehol.initrd firehol" || die
124 }
125
126 pkg_postinst() {
127
128
129
130 1.3 net-firewall/firehol/firehol-1.256.ebuild
131
132 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild?rev=1.3&view=markup
133 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild?rev=1.3&content-type=text/plain
134 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild?r1=1.2&r2=1.3
135
136 Index: firehol-1.256.ebuild
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild,v
139 retrieving revision 1.2
140 retrieving revision 1.3
141 diff -u -r1.2 -r1.3
142 --- firehol-1.256.ebuild 13 Jul 2007 07:21:37 -0000 1.2
143 +++ firehol-1.256.ebuild 5 Nov 2007 14:07:54 -0000 1.3
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2007 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild,v 1.2 2007/07/13 07:21:37 mr_bones_ Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256.ebuild,v 1.3 2007/11/05 14:07:54 centic Exp $
149
150 inherit eutils
151
152 @@ -39,8 +39,8 @@
153 # backport from firehol-CVS.
154 src_unpack() {
155 unpack ${A}
156 - cd ${S} || die
157 - epatch ${FILESDIR}/${P}-printf.patch || die
158 + cd "${S}" || die
159 + epatch "${FILESDIR}/${P}-printf.patch" || die
160 }
161
162 src_install() {
163 @@ -50,7 +50,7 @@
164 insinto /etc/firehol/examples
165 doins examples/* || die
166
167 - newconfd ${FILESDIR}/firehol.conf.d firehol || die
168 + newconfd "${FILESDIR}/firehol.conf.d firehol" || die
169
170 dodoc ChangeLog README TODO WhatIsNew || die
171 dohtml doc/*.html doc/*.css || die
172 @@ -60,7 +60,7 @@
173
174 doman man/*.1 man/*.5 || die
175
176 - newinitd ${FILESDIR}/firehol.initrd firehol || die
177 + newinitd "${FILESDIR}/firehol.initrd firehol" || die
178 }
179
180 pkg_postinst() {
181
182
183
184 1.4 net-firewall/firehol/firehol-1.250-r2.ebuild
185
186 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild?rev=1.4&view=markup
187 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild?rev=1.4&content-type=text/plain
188 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild?r1=1.3&r2=1.4
189
190 Index: firehol-1.250-r2.ebuild
191 ===================================================================
192 RCS file: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild,v
193 retrieving revision 1.3
194 retrieving revision 1.4
195 diff -u -r1.3 -r1.4
196 --- firehol-1.250-r2.ebuild 13 Jul 2007 07:21:37 -0000 1.3
197 +++ firehol-1.250-r2.ebuild 5 Nov 2007 14:07:54 -0000 1.4
198 @@ -1,6 +1,6 @@
199 # Copyright 1999-2007 Gentoo Foundation
200 # Distributed under the terms of the GNU General Public License v2
201 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild,v 1.3 2007/07/13 07:21:37 mr_bones_ Exp $
202 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.250-r2.ebuild,v 1.4 2007/11/05 14:07:54 centic Exp $
203
204 inherit eutils
205
206 @@ -39,11 +39,11 @@
207 # backport from firehol-CVS.
208 src_unpack() {
209 unpack ${A}
210 - cd ${S} || die
211 - epatch ${FILESDIR}/firehol-1.226-to-228.patch || die
212 - epatch ${FILESDIR}/firehol-1.226-to-250.patch || die
213 + cd "${S}" || die
214 + epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
215 + epatch "${FILESDIR}/firehol-1.226-to-250.patch" || die
216 # invalid, see Bug 176862 epatch ${FILESDIR}/${P}-groupwith.patch || die
217 - epatch ${FILESDIR}/${P}-printf.patch || die
218 + epatch "${FILESDIR}/${P}-printf.patch" || die
219 }
220
221 src_install() {
222 @@ -53,7 +53,7 @@
223 insinto /etc/firehol/examples
224 doins examples/* || die
225
226 - newconfd ${FILESDIR}/firehol.conf.d firehol || die
227 + newconfd "${FILESDIR}/firehol.conf.d firehol" || die
228
229 dodoc ChangeLog README TODO WhatIsNew || die
230 dohtml doc/*.html doc/*.css || die
231 @@ -63,7 +63,7 @@
232
233 doman man/*.1 man/*.5 || die
234
235 - newinitd ${FILESDIR}/firehol.initrd firehol || die
236 + newinitd "${FILESDIR}/firehol.initrd firehol" || die
237 }
238
239 pkg_postinst() {
240
241
242
243 1.32 net-firewall/firehol/ChangeLog
244
245 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/ChangeLog?rev=1.32&view=markup
246 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/ChangeLog?rev=1.32&content-type=text/plain
247 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/ChangeLog?r1=1.31&r2=1.32
248
249 Index: ChangeLog
250 ===================================================================
251 RCS file: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v
252 retrieving revision 1.31
253 retrieving revision 1.32
254 diff -u -r1.31 -r1.32
255 --- ChangeLog 1 Jun 2007 14:03:10 -0000 1.31
256 +++ ChangeLog 5 Nov 2007 14:07:54 -0000 1.32
257 @@ -1,6 +1,14 @@
258 # ChangeLog for net-firewall/firehol
259 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
260 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.31 2007/06/01 14:03:10 centic Exp $
261 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.32 2007/11/05 14:07:54 centic Exp $
262 +
263 +*firehol-1.256-r1 (02 Nov 2007)
264 +
265 + 02 Nov 2007; Dominik Stadler <centic@g.o> firehol-1.250.ebuild,
266 + firehol-1.250-r1.ebuild, firehol-1.250-r2.ebuild, firehol-1.256.ebuild,
267 + +firehol-1.256-r1.ebuild:
268 + Bug 195378, fix check for zcat, Bug 172000, add check for kernel
269 + configuration, also add missing quotes as reported by repoman
270
271 *firehol-1.256 (01 Jun 2007)
272
273
274
275
276 1.1 net-firewall/firehol/firehol-1.256-r1.ebuild
277
278 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild?rev=1.1&view=markup
279 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild?rev=1.1&content-type=text/plain
280
281 Index: firehol-1.256-r1.ebuild
282 ===================================================================
283 # Copyright 1999-2007 Gentoo Foundation
284 # Distributed under the terms of the GNU General Public License v2
285 # $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild,v 1.1 2007/11/05 14:07:54 centic Exp $
286
287 inherit eutils linux-info
288
289 DESCRIPTION="iptables firewall generator"
290 HOMEPAGE="http://firehol.sourceforge.net/"
291 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
292
293 LICENSE="GPL-2"
294 SLOT="0"
295 IUSE=""
296 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
297
298 DEPEND="sys-apps/iproute2"
299 RDEPEND="net-firewall/iptables
300 sys-apps/iproute2
301 virtual/modutils
302 || (
303 net-misc/wget
304 net-misc/curl
305 )"
306
307 #S="${WORKDIR}/${PN}-1.226"
308
309 pkg_setup() {
310 # Bug 81600 fail if iproute2 is built with minimal
311 if built_with_use sys-apps/iproute2 minimal; then
312 eerror "Firehol requires iproute2 to be emerged without"
313 eerror "the USE-Flag \"minimal\"."
314 eerror "Re-emerge iproute2 with"
315 eerror "USE=\"-minimal\" emerge sys-apps/iproute2"
316 die "sys-apps/iproute2 without USE=\"minimal\" needed"
317 fi
318
319 # perform checks for kernel config from eclass linux-info
320 # for now we just print warnings as I am not sure if these
321 # are required always...
322 CONFIG_CHECK="~NF_CONNTRACK_ENABLED ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
323 linux-info_pkg_setup
324 }
325
326 # patch for embedded Gentoo - GNAP
327 # backport from firehol-CVS.
328 src_unpack() {
329 unpack ${A}
330 cd "${S}" || die
331 # not needed any more according to http://bugs.gentoo.org/show_bug.cgi?id=172000#c15
332 #epatch ${FILESDIR}/${P}-printf.patch || die
333
334 # Bug 195378, binary is called zcat instead of gzcat, fixed upstream in later releases
335 sed -i -e 's/gzcat/zcat/g' firehol.sh || die
336 sed -i -e 's/GZCAT/ZCAT/g' firehol.sh || die
337 }
338
339 src_install() {
340 newsbin firehol.sh firehol
341
342 dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
343 insinto /etc/firehol/examples
344 doins examples/* || die
345
346 newconfd "${FILESDIR}/firehol.conf.d firehol" || die
347
348 dodoc ChangeLog README TODO WhatIsNew || die
349 dohtml doc/*.html doc/*.css || die
350
351 docinto scripts
352 dodoc get-iana.sh adblock.sh || die
353
354 doman man/*.1 man/*.5 || die
355
356 newinitd "${FILESDIR}/firehol.initrd firehol" || die
357 }
358
359 pkg_postinst() {
360 elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
361 elog "See /etc/firehol/examples for configuration examples."
362 #
363 # Install a default configuration if none is available yet
364 if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
365 einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
366 cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
367 fi
368 }
369
370
371
372 --
373 gentoo-commits@g.o mailing list