Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.0.ebuild
Date: Thu, 27 Dec 2007 21:48:39
Message-Id: E1J80ab-0004tN-II@stork.gentoo.org
1 vapier 07/12/27 21:48:29
2
3 Modified: ChangeLog iptables-1.4.0.ebuild
4 Log:
5 Punt USE=imq. Use user-custom patch dir in /etc/.
6 (Portage version: 2.1.4_rc11)
7
8 Revision Changes Path
9 1.156 net-firewall/iptables/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.156&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.156&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.155&r2=1.156
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
18 retrieving revision 1.155
19 retrieving revision 1.156
20 diff -u -r1.155 -r1.156
21 --- ChangeLog 24 Dec 2007 11:53:40 -0000 1.155
22 +++ ChangeLog 27 Dec 2007 21:48:28 -0000 1.156
23 @@ -1,6 +1,9 @@
24 # ChangeLog for net-firewall/iptables
25 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.155 2007/12/24 11:53:40 pva Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.156 2007/12/27 21:48:28 vapier Exp $
28 +
29 + 27 Dec 2007; Mike Frysinger <vapier@g.o> iptables-1.4.0.ebuild:
30 + Punt USE=imq. Use user-custom patch dir in /etc/.
31
32 24 Dec 2007; <pva@g.o> iptables-1.4.0.ebuild:
33 Updated l7-filter patches for iptables-1.4.x.
34
35
36
37 1.3 net-firewall/iptables/iptables-1.4.0.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.3&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?rev=1.3&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild?r1=1.2&r2=1.3
42
43 Index: iptables-1.4.0.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v
46 retrieving revision 1.2
47 retrieving revision 1.3
48 diff -u -r1.2 -r1.3
49 --- iptables-1.4.0.ebuild 24 Dec 2007 11:53:40 -0000 1.2
50 +++ iptables-1.4.0.ebuild 27 Dec 2007 21:48:28 -0000 1.3
51 @@ -1,31 +1,28 @@
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.2 2007/12/24 11:53:40 pva Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.3 2007/12/27 21:48:28 vapier Exp $
56
57 inherit eutils toolchain-funcs linux-info
58
59 L7_PV=2.17
60 L7_P=netfilter-layer7-v${L7_PV}
61 -IMQ_PATCH=iptables-1.3.6-imq.diff
62
63 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
64 -HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
65 +HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
66 SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
67 - imq? ( http://www.linuximq.net/patchs/${IMQ_PATCH} )
68 l7filter? ( mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
69
70 LICENSE="GPL-2"
71 SLOT="0"
72 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
73 -IUSE="extensions imq ipv6 l7filter static"
74 +IUSE="extensions ipv6 l7filter static"
75
76 DEPEND="virtual/os-headers
77 - l7filter? ( virtual/linux-sources )
78 - imq? ( virtual/linux-sources )"
79 + l7filter? ( virtual/linux-sources )"
80 RDEPEND=""
81
82 pkg_setup() {
83 - if use l7filter || use imq || use extensions ; then
84 + if use l7filter || use extensions ; then
85 ewarn "WARNING: 3rd party extensions has been enabled."
86 ewarn "This means that iptables will use your currently installed"
87 ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
88 @@ -49,10 +46,6 @@
89 [ ! -f "${L7FILE}" ]; then
90 die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
91 fi
92 - if use imq && \
93 - [ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
94 - die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
95 - fi
96 }
97
98 src_unpack() {
99 @@ -84,15 +77,6 @@
100 fi
101 done
102
103 - if use imq ; then
104 - EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
105 - for OA in extensions/.IMQ-test extensions/.IMQ-test6 ; do
106 - mv ${OA} ${OA}.orig
107 - tr '\015' '\012' < ${OA}.orig > ${OA}
108 - rm ${OA}.orig
109 - done
110 - chmod +x extensions/.IMQ-test*
111 - fi
112 if use l7filter ; then
113 #yes choosing 2.6.20 was deliberate - upstream mistake possibly
114 if kernel_is ge 2 6 20
115 @@ -130,7 +114,7 @@
116 use ipv6 || myconf="${myconf} DO_IPV6=0"
117 use static && myconf="${myconf} NO_SHARED_LIBS=0"
118 export myconf
119 - if ! use l7filter && ! use imq && ! use extensions ; then
120 + if ! use l7filter && ! use extensions ; then
121 export KERNEL_DIR=$(
122 # ugh -- iptables has scripts which check for the existence of
123 # files so we need to give it the right path to our toolchains
124 @@ -141,7 +125,7 @@
125 export KBUILD_OUTPUT=${KERNEL_DIR}
126 diemsg="failure"
127 else
128 - diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
129 + diemsg="failure - with l7filter and/or other miscellanious patches added"
130 fi
131 export diemsg
132 }
133
134
135
136 --
137 gentoo-commits@g.o mailing list