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

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0-r1.ebuild iptables-1.3.8-r2.ebuild
Date: Fri, 11 Jan 2008 17:47:04
Message-Id: E1JDNy9-0006ut-LM@stork.gentoo.org
1 pva 08/01/11 17:47:01
2
3 Modified: ChangeLog iptables-1.4.0-r1.ebuild
4 iptables-1.3.8-r2.ebuild
5 Log:
6 l7-filter related code cleaned. Fixed build build problem with monolitic kernels and any of imq, l7filter or extesion USE flags enabled, bug 205127, thank Guillaume Castagnino <casta AT xwing.info> for report. iptables-1.2 is long time not in the tree hence removed related obsolete ewarn.
7 (Portage version: 2.1.3.19)
8
9 Revision Changes Path
10 1.160 net-firewall/iptables/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.160&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.160&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.159&r2=1.160
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
19 retrieving revision 1.159
20 retrieving revision 1.160
21 diff -u -r1.159 -r1.160
22 --- ChangeLog 10 Jan 2008 17:59:20 -0000 1.159
23 +++ ChangeLog 11 Jan 2008 17:47:01 -0000 1.160
24 @@ -1,6 +1,12 @@
25 # ChangeLog for net-firewall/iptables
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.159 2008/01/10 17:59:20 nixnut Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.160 2008/01/11 17:47:01 pva Exp $
29 +
30 + 11 Jan 2008; <pva@g.o> iptables-1.4.0-r1.ebuild:
31 + l7-filter related code cleaned. Fixed build build problem with monolitic
32 + kernels and any of imq, l7filter or extesion USE flags enabled, bug 205127,
33 + thank Guillaume Castagnino <casta AT xwing.info> for report. iptables-1.2 is
34 + long time not in the tree hence removed related obsolete ewarn.
35
36 10 Jan 2008; nixnut <nixnut@g.o> iptables-1.3.8-r3.ebuild:
37 Stable on ppc wrt bug 201909
38
39
40
41 1.3 net-firewall/iptables/iptables-1.4.0-r1.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild?rev=1.3&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild?rev=1.3&content-type=text/plain
45 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild?r1=1.2&r2=1.3
46
47 Index: iptables-1.4.0-r1.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v
50 retrieving revision 1.2
51 retrieving revision 1.3
52 diff -u -r1.2 -r1.3
53 --- iptables-1.4.0-r1.ebuild 8 Jan 2008 16:23:30 -0000 1.2
54 +++ iptables-1.4.0-r1.ebuild 11 Jan 2008 17:47:01 -0000 1.3
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2008 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.2 2008/01/08 16:23:30 pva Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.3 2008/01/11 17:47:01 pva Exp $
60
61 inherit eutils toolchain-funcs linux-info
62
63 @@ -39,15 +39,16 @@
64 linux-info_pkg_setup
65 fi
66
67 - if kernel_is ge 2 6 20
68 - then
69 - L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
70 - else
71 - L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
72 - fi
73 - if use l7filter && \
74 - [ ! -f "${L7FILE}" ]; then
75 - die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
76 + if use l7filter ; then
77 + if kernel_is lt 2 6 20 ; then
78 + eerror "Currently there is no l7-filter patch available for iptables-1.4.x"
79 + eerror "and kernel version before 2.6.20."
80 + eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
81 + eerror "or earlier, with l7-filter patch, please, report upstream."
82 + die "No patch available."
83 + fi
84 + [ ! -f "${KERNEL_DIR}/include/linux/netfilter/xt_layer7.h" ] && \
85 + die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this."
86 fi
87 if use imq && \
88 [ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
89 @@ -59,8 +60,7 @@
90
91 src_unpack() {
92 unpack ${P}.tar.bz2
93 - if use l7filter
94 - then
95 + if use l7filter ; then
96 unpack ${L7_P}.tar.gz
97 fi
98 cd "${S}"
99 @@ -94,19 +94,9 @@
100 fi
101
102 if use l7filter ; then
103 - #yes choosing 2.6.20 was deliberate - upstream mistake possibly
104 - if kernel_is ge 2 6 20
105 - then
106 - L7_PATCH=iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
107 - else
108 - eerror "Currently there is no l7-filter patch available for this"
109 - eerror "kernel iptables-1.4 and kernel version pre 2.6.20."
110 - eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
111 - eerror "or earlier, with l7-filter patch, please, report upstream."
112 - die "No patch available."
113 - fi
114 - EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
115 - chmod +x extensions/.layer7-test*
116 + EPATCH_OPTS="-p1" epatch \
117 + "${WORKDIR}"/${L7_P}/iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
118 + chmod +x extensions/.layer7-test
119 fi
120
121 if ! use extensions ; then
122 @@ -141,6 +131,7 @@
123 export KBUILD_OUTPUT=${KERNEL_DIR}
124 diemsg="failure"
125 else
126 + export KERNEL_DIR
127 diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
128 fi
129 export diemsg
130 @@ -196,10 +187,4 @@
131 ewarn " net.ipv6.ip_forward = 1"
132 ewarn "for ipv6."
133 fi
134 - if has_version '=net-firewall/iptables-1.2*' ; then
135 - ewarn
136 - ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
137 - ewarn "rules added with iptables-1.2.x. This is a known issue, please see:"
138 - ewarn "http://bugs.gentoo.org/92535"
139 - fi
140 }
141
142
143
144 1.11 net-firewall/iptables/iptables-1.3.8-r2.ebuild
145
146 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild?rev=1.11&view=markup
147 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild?rev=1.11&content-type=text/plain
148 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild?r1=1.10&r2=1.11
149
150 Index: iptables-1.3.8-r2.ebuild
151 ===================================================================
152 RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v
153 retrieving revision 1.10
154 retrieving revision 1.11
155 diff -u -r1.10 -r1.11
156 --- iptables-1.3.8-r2.ebuild 10 Jan 2008 17:59:20 -0000 1.10
157 +++ iptables-1.3.8-r2.ebuild 11 Jan 2008 17:47:01 -0000 1.11
158 @@ -1,6 +1,6 @@
159 -# Copyright 1999-2007 Gentoo Foundation
160 +# Copyright 1999-2008 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v 1.10 2008/01/10 17:59:20 nixnut Exp $
163 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v 1.11 2008/01/11 17:47:01 pva Exp $
164
165 inherit eutils flag-o-matic toolchain-funcs linux-info
166
167
168
169
170 --
171 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups