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.7.ebuild
Date: Sat, 31 Jan 2009 16:20:29
Message-Id: E1LTIa1-0004rA-V3@stork.gentoo.org
1 pva 09/01/31 16:20:25
2
3 Modified: ChangeLog
4 Added: ipset-2.4.7.ebuild
5 Log:
6 Version bump. Respect LDFLAGS, #246016, thank Olivier Huber. Probably fixes compatibility issue with 2.6.28, #254207, thank Jochen Schlick.
7 (Portage version: 2.2_rc23/cvs/Linux i686)
8
9 Revision Changes Path
10 1.20 net-firewall/ipset/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.20&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.20&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.19&r2=1.20
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v
19 retrieving revision 1.19
20 retrieving revision 1.20
21 diff -u -r1.19 -r1.20
22 --- ChangeLog 24 Oct 2008 21:28:25 -0000 1.19
23 +++ ChangeLog 31 Jan 2009 16:20:25 -0000 1.20
24 @@ -1,6 +1,13 @@
25 # ChangeLog for net-firewall/ipset
26 -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.19 2008/10/24 21:28:25 robbat2 Exp $
28 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.20 2009/01/31 16:20:25 pva Exp $
30 +
31 +*ipset-2.4.7 (31 Jan 2009)
32 +
33 + 31 Jan 2009; Peter Volkov <pva@g.o>
34 + +files/ipset-2.4.7-LDFLAGS.patch, +ipset-2.4.7.ebuild:
35 + Version bump. Respect LDFLAGS, #246016, thank Olivier Huber. Probably
36 + fixes compatibility issue with 2.6.28, #254207, thank Jochen Schlick.
37
38 *ipset-2.4.2 (24 Oct 2008)
39
40
41
42
43 1.1 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.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild?rev=1.1&content-type=text/plain
47
48 Index: ipset-2.4.7.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.7.ebuild,v 1.1 2009/01/31 16:20:25 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="~x86 ~amd64 ~ppc"
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}/${P}-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 export myconf
117 }
118
119 src_compile() {
120 einfo "Building userspace"
121 emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"
122
123 if [[ $modules -eq 1 ]]; then
124 einfo "Building kernel modules"
125 cd "${S}/kernel"
126 export KERNELDIR="${KERNEL_DIR}"
127 linux-mod_src_compile || die "failed to build modules"
128 fi
129 }
130
131 src_install() {
132 einfo "Installing userspace"
133 emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
134
135 if [[ $modules -eq 1 ]]; then
136 einfo "Installing kernel modules"
137 cd "${S}/kernel"
138 export KERNELDIR="${KERNEL_DIR}"
139 linux-mod_src_install
140 fi
141 }