Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/ipset: ChangeLog ipset-2.4.2.ebuild
Date: Fri, 24 Oct 2008 21:28:29
Message-Id: E1KtUCn-0003TO-Tl@stork.gentoo.org
1 robbat2 08/10/24 21:28:25
2
3 Modified: ChangeLog
4 Added: ipset-2.4.2.ebuild
5 Log:
6 Bug #243092, version bump.
7 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-07512-g969907a x86_64)
8
9 Revision Changes Path
10 1.19 net-firewall/ipset/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.19&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.19&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.18&r2=1.19
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v
19 retrieving revision 1.18
20 retrieving revision 1.19
21 diff -p -w -b -B -u -u -r1.18 -r1.19
22 --- ChangeLog 14 Oct 2008 07:21:01 -0000 1.18
23 +++ ChangeLog 24 Oct 2008 21:28:25 -0000 1.19
24 @@ -1,6 +1,12 @@
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.18 2008/10/14 07:21:01 robbat2 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.19 2008/10/24 21:28:25 robbat2 Exp $
29 +
30 +*ipset-2.4.2 (24 Oct 2008)
31 +
32 + 24 Oct 2008; Robin H. Johnson <robbat2@g.o>
33 + +files/ipset-2.4.2-glibc28-fix.patch, +ipset-2.4.2.ebuild:
34 + Bug #243092, version bump.
35
36 14 Oct 2008; Robin H. Johnson <robbat2@g.o> ipset-2.3.3a.ebuild:
37 Bug #236138, allow building with non-modular kernels.
38
39
40
41 1.1 net-firewall/ipset/ipset-2.4.2.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.4.2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: ipset-2.4.2.ebuild
47 ===================================================================
48 # Copyright 1999-2008 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.2.ebuild,v 1.1 2008/10/24 21:28:25 robbat2 Exp $
51
52 inherit eutils versionator toolchain-funcs linux-mod linux-info
53
54 DESCRIPTION="IPset tool for iptables, successor to ippool."
55 HOMEPAGE="http://ipset.netfilter.org/"
56 SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
57 LICENSE="GPL-2"
58 SLOT="0"
59 KEYWORDS="~x86 ~amd64 ~ppc"
60 IUSE=""
61 RDEPEND=">=net-firewall/iptables-1.4.1"
62 DEPEND="${RDEPEND}"
63
64 # configurable from outside
65 [ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256
66 [ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024
67 BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}"
68 # module fun
69 BUILD_TARGETS="all"
70 MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel"
71 MODULE_NAMES=""
72 for i in ip_set{,_{{ip,port,macip}map,{ip,net,ipport}hash,iptree{,map}}} \
73 ipt_{SET,set}; do
74 MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
75 done
76 # sanity
77 CONFIG_CHECK="NETFILTER"
78 ERROR_CFG="ipset needs netfilter support in your kernel."
79
80 src_unpack() {
81 unpack ${A}
82 sed -i \
83 -e 's/KERNELDIR/(KERNELDIR)/g' \
84 -e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
85 -e '/^all::/iV ?= 0' \
86 -e '/^all::/iKBUILD_OUTPUT ?=' \
87 -e 's/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/' \
88 "${S}"/kernel/Makefile
89 sed -i \
90 -e '/asm.semaphore.h/d' \
91 "${S}"/kernel/ip_set.c
92
93 epatch "${FILESDIR}"/ipset-2.4.2-glibc28-fix.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 }