1 |
pva 09/02/26 17:01:59 |
2 |
|
3 |
Modified: ChangeLog ipset-2.4.7.ebuild |
4 |
Added: ipset-2.4.8.ebuild |
5 |
Log: |
6 |
Version bump, bug #260338, thank BoneKracker for report. Disable warnings, fixes bug #259999, thank Aleksey Kunitskiy for report. |
7 |
(Portage version: 2.2_rc23/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.22 net-firewall/ipset/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.22&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.22&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.21&r2=1.22 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v |
19 |
retrieving revision 1.21 |
20 |
retrieving revision 1.22 |
21 |
diff -u -r1.21 -r1.22 |
22 |
--- ChangeLog 4 Feb 2009 21:42:48 -0000 1.21 |
23 |
+++ ChangeLog 26 Feb 2009 17:01:59 -0000 1.22 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for net-firewall/ipset |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.21 2009/02/04 21:42:48 maekke Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.22 2009/02/26 17:01:59 pva Exp $ |
29 |
+ |
30 |
+*ipset-2.4.8 (26 Feb 2009) |
31 |
+ |
32 |
+ 26 Feb 2009; Peter Volkov <pva@g.o> |
33 |
+ +files/ipset-2.4.8-use-new-hash.patch, ipset-2.4.7.ebuild, |
34 |
+ +ipset-2.4.8.ebuild: |
35 |
+ Version bump, bug #260338, thank BoneKracker for report. Disable warnings, |
36 |
+ fixes bug #259999, thank Aleksey Kunitskiy for report. |
37 |
|
38 |
04 Feb 2009; Markus Meier <maekke@g.o> ipset-2.4.7.ebuild: |
39 |
amd64/x86 stable, bug #257483 |
40 |
|
41 |
|
42 |
|
43 |
1.3 net-firewall/ipset/ipset-2.4.7.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild?rev=1.3&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild?rev=1.3&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild?r1=1.2&r2=1.3 |
48 |
|
49 |
Index: ipset-2.4.7.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild,v |
52 |
retrieving revision 1.2 |
53 |
retrieving revision 1.3 |
54 |
diff -u -r1.2 -r1.3 |
55 |
--- ipset-2.4.7.ebuild 4 Feb 2009 21:42:48 -0000 1.2 |
56 |
+++ ipset-2.4.7.ebuild 26 Feb 2009 17:01:59 -0000 1.3 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2009 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild,v 1.2 2009/02/04 21:42:48 maekke Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild,v 1.3 2009/02/26 17:01:59 pva Exp $ |
62 |
|
63 |
inherit eutils versionator toolchain-funcs linux-mod linux-info |
64 |
|
65 |
@@ -32,15 +32,17 @@ |
66 |
|
67 |
src_unpack() { |
68 |
unpack ${A} |
69 |
+ cd "${S}" |
70 |
+ |
71 |
sed -i \ |
72 |
-e 's/KERNELDIR/(KERNELDIR)/g' \ |
73 |
-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \ |
74 |
-e '/^all::/iV ?= 0' \ |
75 |
-e '/^all::/iKBUILD_OUTPUT ?=' \ |
76 |
-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \ |
77 |
- "${S}"/kernel/Makefile |
78 |
+ kernel/Makefile |
79 |
|
80 |
- cd "${S}" |
81 |
+ sed -i -e 's/^WARN_FLAGS/DONT_WARN_FLAGS/' Makefile |
82 |
epatch "${FILESDIR}/${P}-LDFLAGS.patch" |
83 |
} |
84 |
|
85 |
|
86 |
|
87 |
|
88 |
1.1 net-firewall/ipset/ipset-2.4.8.ebuild |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.8.ebuild?rev=1.1&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.8.ebuild?rev=1.1&content-type=text/plain |
92 |
|
93 |
Index: ipset-2.4.8.ebuild |
94 |
=================================================================== |
95 |
# Copyright 1999-2009 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.8.ebuild,v 1.1 2009/02/26 17:01:59 pva Exp $ |
98 |
|
99 |
inherit eutils versionator toolchain-funcs linux-mod linux-info |
100 |
|
101 |
DESCRIPTION="IPset tool for iptables, successor to ippool." |
102 |
HOMEPAGE="http://ipset.netfilter.org/" |
103 |
SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
104 |
LICENSE="GPL-2" |
105 |
SLOT="0" |
106 |
KEYWORDS="~amd64 ~ppc ~x86" |
107 |
IUSE="" |
108 |
RDEPEND=">=net-firewall/iptables-1.4.1" |
109 |
DEPEND="${RDEPEND}" |
110 |
|
111 |
# configurable from outside |
112 |
[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256 |
113 |
[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024 |
114 |
BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}" |
115 |
# module fun |
116 |
BUILD_TARGETS="all" |
117 |
MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel" |
118 |
MODULE_NAMES="" |
119 |
for i in ip_set{,_{{ip,port,macip}map,{ip,net,ipport}hash,iptree{,map}}} \ |
120 |
ipt_{SET,set}; do |
121 |
MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})" |
122 |
done |
123 |
# sanity |
124 |
CONFIG_CHECK="NETFILTER" |
125 |
ERROR_CFG="ipset needs netfilter support in your kernel." |
126 |
|
127 |
src_unpack() { |
128 |
unpack ${A} |
129 |
sed -i \ |
130 |
-e 's/KERNELDIR/(KERNELDIR)/g' \ |
131 |
-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \ |
132 |
-e '/^all::/iV ?= 0' \ |
133 |
-e '/^all::/iKBUILD_OUTPUT ?=' \ |
134 |
-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \ |
135 |
"${S}"/kernel/Makefile |
136 |
|
137 |
cd "${S}" |
138 |
epatch "${FILESDIR}/${PN}-2.4.7-LDFLAGS.patch" |
139 |
epatch "${FILESDIR}/${PN}-2.4.8-use-new-hash.patch" |
140 |
} |
141 |
|
142 |
pkg_setup() { |
143 |
get_version |
144 |
|
145 |
modules=0 |
146 |
msg='' |
147 |
if linux_chkconfig_builtin "MODULES" ; then |
148 |
modules=1 |
149 |
msg="Modular kernel detected, will build kernel modules" |
150 |
else |
151 |
msg="Nonmodular kernel detected, will not build kernel modules" |
152 |
fi |
153 |
einfo "${msg}" |
154 |
|
155 |
[[ $modules -eq 1 ]] && \ |
156 |
linux-mod_pkg_setup |
157 |
myconf="${myconf} PREFIX=" |
158 |
myconf="${myconf} LIBDIR=/$(get_libdir)" |
159 |
myconf="${myconf} BINDIR=/sbin" |
160 |
myconf="${myconf} MANDIR=/usr/share/man" |
161 |
myconf="${myconf} INCDIR=/usr/include" |
162 |
myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes" |
163 |
export myconf |
164 |
} |
165 |
|
166 |
src_compile() { |
167 |
einfo "Building userspace" |
168 |
emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" |
169 |
|
170 |
if [[ $modules -eq 1 ]]; then |
171 |
einfo "Building kernel modules" |
172 |
cd "${S}/kernel" |
173 |
export KERNELDIR="${KERNEL_DIR}" |
174 |
linux-mod_src_compile || die "failed to build modules" |
175 |
fi |
176 |
} |
177 |
|
178 |
src_install() { |
179 |
einfo "Installing userspace" |
180 |
emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package" |
181 |
|
182 |
if [[ $modules -eq 1 ]]; then |
183 |
einfo "Installing kernel modules" |
184 |
cd "${S}/kernel" |
185 |
export KERNELDIR="${KERNEL_DIR}" |
186 |
linux-mod_src_install |
187 |
fi |
188 |
} |