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-3.0.ebuild ipset-2.5.0.ebuild
Date: Fri, 05 Jun 2009 15:03:53
Message-Id: E1MCaxT-0003uw-8G@stork.gentoo.org
1 pva 09/06/05 15:03:51
2
3 Modified: ChangeLog
4 Added: ipset-3.0.ebuild
5 Removed: ipset-2.5.0.ebuild
6 Log:
7 Version bump, remove broken version.
8 (Portage version: 2.2_rc33/cvs/Linux i686)
9
10 Revision Changes Path
11 1.28 net-firewall/ipset/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.28&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.28&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.27&r2=1.28
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v
20 retrieving revision 1.27
21 retrieving revision 1.28
22 diff -u -r1.27 -r1.28
23 --- ChangeLog 14 May 2009 23:05:53 -0000 1.27
24 +++ ChangeLog 5 Jun 2009 15:03:51 -0000 1.28
25 @@ -1,6 +1,12 @@
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.27 2009/05/14 23:05:53 robbat2 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.28 2009/06/05 15:03:51 pva Exp $
30 +
31 +*ipset-3.0 (05 Jun 2009)
32 +
33 + 05 Jun 2009; Peter Volkov <pva@g.o> -ipset-2.5.0.ebuild,
34 + +ipset-3.0.ebuild:
35 + Version bump, remove broken version.
36
37 *ipset-2.5.0-r1 (14 May 2009)
38
39
40
41
42 1.1 net-firewall/ipset/ipset-3.0.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-3.0.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-3.0.ebuild?rev=1.1&content-type=text/plain
46
47 Index: ipset-3.0.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-3.0.ebuild,v 1.1 2009/06/05 15:03:51 pva Exp $
52
53 EAPI="2"
54
55 inherit eutils versionator toolchain-funcs linux-mod linux-info
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=""
65
66 RDEPEND=">=net-firewall/iptables-1.4.1"
67 DEPEND="${RDEPEND}"
68
69 # configurable from outside
70 [ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256
71 [ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024
72 BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}"
73 # module fun
74 BUILD_TARGETS="all"
75 MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel"
76 MODULE_NAMES=""
77 for i in ip_set{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \
78 ipt_{SET,set}; do
79 MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})"
80 done
81 # sanity
82 CONFIG_CHECK="NETFILTER"
83 ERROR_CFG="ipset needs netfilter support in your kernel."
84
85 pkg_setup() {
86 get_version
87
88 modules=0
89 msg=''
90 if linux_chkconfig_builtin "MODULES" ; then
91 modules=1
92 msg="Modular kernel detected, will build kernel modules"
93 else
94 msg="Nonmodular kernel detected, will not build kernel modules"
95 fi
96 einfo "${msg}"
97
98 [[ $modules -eq 1 ]] && \
99 linux-mod_pkg_setup
100 myconf="${myconf} PREFIX="
101 myconf="${myconf} LIBDIR=/$(get_libdir)"
102 myconf="${myconf} BINDIR=/sbin"
103 myconf="${myconf} MANDIR=/usr/share/man"
104 myconf="${myconf} INCDIR=/usr/include"
105 myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes"
106 export myconf
107 }
108
109 src_prepare() {
110 sed -i \
111 -e 's/KERNELDIR/(KERNELDIR)/g' \
112 -e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \
113 -e '/^all::/iV ?= 0' \
114 -e '/^all::/iKBUILD_OUTPUT ?=' \
115 -e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \
116 "${S}"/kernel/Makefile
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 }