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