1 |
pinkbyte 12/11/27 11:36:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ipset-6.16.ebuild ipset-6.15.ebuild |
5 |
Log: |
6 |
Another version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.62 net-firewall/ipset/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.62&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.62&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.61&r2=1.62 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v |
20 |
retrieving revision 1.61 |
21 |
retrieving revision 1.62 |
22 |
diff -u -r1.61 -r1.62 |
23 |
--- ChangeLog 27 Nov 2012 11:30:02 -0000 1.61 |
24 |
+++ ChangeLog 27 Nov 2012 11:36:44 -0000 1.62 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for net-firewall/ipset |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.61 2012/11/27 11:30:02 pinkbyte Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.62 2012/11/27 11:36:44 pinkbyte Exp $ |
30 |
+ |
31 |
+*ipset-6.16 (27 Nov 2012) |
32 |
+*ipset-6.15 (27 Nov 2012) |
33 |
+ |
34 |
+ 27 Nov 2012; Sergey Popov <pinkbyte@g.o> +ipset-6.15.ebuild, |
35 |
+ +ipset-6.16.ebuild: |
36 |
+ Another version bump |
37 |
|
38 |
*ipset-6.14 (27 Nov 2012) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 net-firewall/ipset/ipset-6.16.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.16.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.16.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: ipset-6.16.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.16.ebuild,v 1.1 2012/11/27 11:36:44 pinkbyte Exp $ |
53 |
|
54 |
EAPI="4" |
55 |
inherit autotools linux-info linux-mod |
56 |
|
57 |
DESCRIPTION="IPset tool for iptables, successor to ippool." |
58 |
HOMEPAGE="http://ipset.netfilter.org/" |
59 |
SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~amd64 ~ppc ~x86" |
64 |
IUSE="modules" |
65 |
|
66 |
RDEPEND=">=net-firewall/iptables-1.4.7 |
67 |
net-libs/libmnl" |
68 |
DEPEND="${RDEPEND}" |
69 |
|
70 |
DOCS=( ChangeLog INSTALL README UPGRADE ) |
71 |
|
72 |
# configurable from outside, e.g. /etc/make.conf |
73 |
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
74 |
|
75 |
BUILD_TARGETS="modules" |
76 |
MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
77 |
MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
78 |
for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do |
79 |
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
80 |
done |
81 |
|
82 |
check_header_patch() { |
83 |
if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then |
84 |
eerror "Sorry, but you have to patch kernel sources with the following patch:" |
85 |
eerror " # cd ${KV_DIR}" |
86 |
eerror " # patch -i ${S}/netlink.patch -p1" |
87 |
eerror "You should recompile and run new kernel to avoid runtime errors." |
88 |
die "Unpatched kernel" |
89 |
fi |
90 |
} |
91 |
|
92 |
pkg_setup() { |
93 |
get_version |
94 |
CONFIG_CHECK="NETFILTER" |
95 |
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
96 |
|
97 |
build_modules=0 |
98 |
if use modules; then |
99 |
kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35." |
100 |
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
101 |
if linux_chkconfig_present "IP_NF_SET" || \ |
102 |
linux_chkconfig_present "IP_SET"; then #274577 |
103 |
eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
104 |
eerror "Please either build ipset with modules USE flag disabled" |
105 |
eerror "or rebuild kernel without IP_SET support and make sure" |
106 |
eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
107 |
die "USE=modules and in-kernel ipset support detected." |
108 |
else |
109 |
einfo "Modular kernel detected. Gonna build kernel modules..." |
110 |
build_modules=1 |
111 |
fi |
112 |
else |
113 |
eerror "Nonmodular kernel detected, but USE=modules. Either build" |
114 |
eerror "modular kernel (without IP_SET) or disable USE=modules" |
115 |
die "Nonmodular kernel detected, will not build kernel modules" |
116 |
fi |
117 |
fi |
118 |
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
119 |
} |
120 |
|
121 |
src_prepare() { |
122 |
[[ ${build_modules} -eq 1 ]] && check_header_patch |
123 |
eautoreconf |
124 |
} |
125 |
|
126 |
src_configure() { |
127 |
econf \ |
128 |
$(use_with modules kmod) \ |
129 |
--disable-static \ |
130 |
--with-maxsets=${IP_NF_SET_MAX} \ |
131 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
132 |
--with-ksource="${KV_DIR}" \ |
133 |
--with-kbuild="${KV_OUT_DIR}" |
134 |
} |
135 |
|
136 |
src_compile() { |
137 |
einfo "Building userspace" |
138 |
emake |
139 |
|
140 |
if [[ ${build_modules} -eq 1 ]]; then |
141 |
einfo "Building kernel modules" |
142 |
set_arch_to_kernel |
143 |
emake modules |
144 |
fi |
145 |
} |
146 |
|
147 |
src_install() { |
148 |
einfo "Installing userspace" |
149 |
default |
150 |
prune_libtool_files |
151 |
|
152 |
newinitd "${FILESDIR}"/ipset.initd-r2 ${PN} |
153 |
newconfd "${FILESDIR}"/ipset.confd ${PN} |
154 |
keepdir /var/lib/ipset |
155 |
|
156 |
if [[ ${build_modules} -eq 1 ]]; then |
157 |
einfo "Installing kernel modules" |
158 |
linux-mod_src_install |
159 |
fi |
160 |
} |
161 |
|
162 |
|
163 |
|
164 |
1.1 net-firewall/ipset/ipset-6.15.ebuild |
165 |
|
166 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.15.ebuild?rev=1.1&view=markup |
167 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.15.ebuild?rev=1.1&content-type=text/plain |
168 |
|
169 |
Index: ipset-6.15.ebuild |
170 |
=================================================================== |
171 |
# Copyright 1999-2012 Gentoo Foundation |
172 |
# Distributed under the terms of the GNU General Public License v2 |
173 |
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.15.ebuild,v 1.1 2012/11/27 11:36:44 pinkbyte Exp $ |
174 |
|
175 |
EAPI="4" |
176 |
inherit autotools linux-info linux-mod |
177 |
|
178 |
DESCRIPTION="IPset tool for iptables, successor to ippool." |
179 |
HOMEPAGE="http://ipset.netfilter.org/" |
180 |
SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
181 |
|
182 |
LICENSE="GPL-2" |
183 |
SLOT="0" |
184 |
KEYWORDS="~amd64 ~ppc ~x86" |
185 |
IUSE="modules" |
186 |
|
187 |
RDEPEND=">=net-firewall/iptables-1.4.7 |
188 |
net-libs/libmnl" |
189 |
DEPEND="${RDEPEND}" |
190 |
|
191 |
DOCS=( ChangeLog INSTALL README UPGRADE ) |
192 |
|
193 |
# configurable from outside, e.g. /etc/make.conf |
194 |
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
195 |
|
196 |
BUILD_TARGETS="modules" |
197 |
MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
198 |
MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
199 |
for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do |
200 |
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
201 |
done |
202 |
|
203 |
check_header_patch() { |
204 |
if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then |
205 |
eerror "Sorry, but you have to patch kernel sources with the following patch:" |
206 |
eerror " # cd ${KV_DIR}" |
207 |
eerror " # patch -i ${S}/netlink.patch -p1" |
208 |
eerror "You should recompile and run new kernel to avoid runtime errors." |
209 |
die "Unpatched kernel" |
210 |
fi |
211 |
} |
212 |
|
213 |
pkg_setup() { |
214 |
get_version |
215 |
CONFIG_CHECK="NETFILTER" |
216 |
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
217 |
|
218 |
build_modules=0 |
219 |
if use modules; then |
220 |
kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35." |
221 |
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
222 |
if linux_chkconfig_present "IP_NF_SET" || \ |
223 |
linux_chkconfig_present "IP_SET"; then #274577 |
224 |
eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
225 |
eerror "Please either build ipset with modules USE flag disabled" |
226 |
eerror "or rebuild kernel without IP_SET support and make sure" |
227 |
eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
228 |
die "USE=modules and in-kernel ipset support detected." |
229 |
else |
230 |
einfo "Modular kernel detected. Gonna build kernel modules..." |
231 |
build_modules=1 |
232 |
fi |
233 |
else |
234 |
eerror "Nonmodular kernel detected, but USE=modules. Either build" |
235 |
eerror "modular kernel (without IP_SET) or disable USE=modules" |
236 |
die "Nonmodular kernel detected, will not build kernel modules" |
237 |
fi |
238 |
fi |
239 |
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
240 |
} |
241 |
|
242 |
src_prepare() { |
243 |
[[ ${build_modules} -eq 1 ]] && check_header_patch |
244 |
eautoreconf |
245 |
} |
246 |
|
247 |
src_configure() { |
248 |
econf \ |
249 |
$(use_with modules kmod) \ |
250 |
--disable-static \ |
251 |
--with-maxsets=${IP_NF_SET_MAX} \ |
252 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
253 |
--with-ksource="${KV_DIR}" \ |
254 |
--with-kbuild="${KV_OUT_DIR}" |
255 |
} |
256 |
|
257 |
src_compile() { |
258 |
einfo "Building userspace" |
259 |
emake |
260 |
|
261 |
if [[ ${build_modules} -eq 1 ]]; then |
262 |
einfo "Building kernel modules" |
263 |
set_arch_to_kernel |
264 |
emake modules |
265 |
fi |
266 |
} |
267 |
|
268 |
src_install() { |
269 |
einfo "Installing userspace" |
270 |
default |
271 |
prune_libtool_files |
272 |
|
273 |
newinitd "${FILESDIR}"/ipset.initd-r2 ${PN} |
274 |
newconfd "${FILESDIR}"/ipset.confd ${PN} |
275 |
keepdir /var/lib/ipset |
276 |
|
277 |
if [[ ${build_modules} -eq 1 ]]; then |
278 |
einfo "Installing kernel modules" |
279 |
linux-mod_src_install |
280 |
fi |
281 |
} |