| 1 |
pva 10/08/25 09:13:21 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: ipset-4.3.ebuild |
| 5 |
Log: |
| 6 |
Version bump, fixes 2.6.35 kernel compatibility issue, bug 332687, thank fkhp and Oleksandr Kovalenko for report. |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.37 net-firewall/ipset/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.37&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.37&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.36&r2=1.37 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v |
| 19 |
retrieving revision 1.36 |
| 20 |
retrieving revision 1.37 |
| 21 |
diff -u -r1.36 -r1.37 |
| 22 |
--- ChangeLog 20 May 2010 10:38:35 -0000 1.36 |
| 23 |
+++ ChangeLog 25 Aug 2010 09:13:21 -0000 1.37 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for net-firewall/ipset |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.36 2010/05/20 10:38:35 pva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.37 2010/08/25 09:13:21 pva Exp $ |
| 29 |
+ |
| 30 |
+*ipset-4.3 (25 Aug 2010) |
| 31 |
+ |
| 32 |
+ 25 Aug 2010; Peter Volkov <pva@g.o> +ipset-4.3.ebuild: |
| 33 |
+ Version bump, fixes 2.6.35 kernel compatibility issue, bug 332687, thank |
| 34 |
+ fkhp and Oleksandr Kovalenko for report. |
| 35 |
|
| 36 |
20 May 2010; Peter Volkov <pva@g.o> ipset-4.1.ebuild: |
| 37 |
amd64 stable, bug 304037. |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 net-firewall/ipset/ipset-4.3.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-4.3.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-4.3.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: ipset-4.3.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2010 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.3.ebuild,v 1.1 2010/08/25 09:13:21 pva Exp $ |
| 51 |
|
| 52 |
EAPI="2" |
| 53 |
|
| 54 |
inherit eutils versionator toolchain-funcs linux-mod |
| 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 |
|
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 63 |
IUSE="modules" |
| 64 |
|
| 65 |
RDEPEND=">=net-firewall/iptables-1.4.4" |
| 66 |
DEPEND="${RDEPEND}" |
| 67 |
|
| 68 |
# configurable from outside |
| 69 |
[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256 |
| 70 |
[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024 |
| 71 |
BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}" |
| 72 |
# module fun |
| 73 |
BUILD_TARGETS="all" |
| 74 |
MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel" |
| 75 |
MODULE_NAMES="" |
| 76 |
for i in ip_set{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \ |
| 77 |
ipt_{SET,set}; do |
| 78 |
MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})" |
| 79 |
done |
| 80 |
# sanity |
| 81 |
CONFIG_CHECK="NETFILTER" |
| 82 |
ERROR_CFG="ipset requires netfilter support in your kernel." |
| 83 |
|
| 84 |
pkg_setup() { |
| 85 |
get_version |
| 86 |
|
| 87 |
build_modules=0 |
| 88 |
if use modules; then |
| 89 |
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
| 90 |
if linux_chkconfig_builtin "IP_NF_SET"; then #274577 |
| 91 |
einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules" |
| 92 |
else |
| 93 |
build_modules=1 |
| 94 |
einfo "Modular kernel detected, will build kernel modules" |
| 95 |
fi |
| 96 |
else |
| 97 |
einfo "Nonmodular kernel detected, will not build kernel modules" |
| 98 |
fi |
| 99 |
fi |
| 100 |
|
| 101 |
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
| 102 |
myconf="${myconf} PREFIX=" |
| 103 |
myconf="${myconf} LIBDIR=/$(get_libdir)" |
| 104 |
myconf="${myconf} BINDIR=/sbin" |
| 105 |
myconf="${myconf} MANDIR=/usr/share/man" |
| 106 |
myconf="${myconf} INCDIR=/usr/include" |
| 107 |
myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes" |
| 108 |
export myconf |
| 109 |
} |
| 110 |
|
| 111 |
src_prepare() { |
| 112 |
sed -i \ |
| 113 |
-e 's/KERNELDIR/(KERNELDIR)/g' \ |
| 114 |
-e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \ |
| 115 |
-e '/^all::/iV ?= 0' \ |
| 116 |
-e '/^all::/iKBUILD_OUTPUT ?=' \ |
| 117 |
-e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \ |
| 118 |
"${S}"/kernel/Makefile |
| 119 |
} |
| 120 |
|
| 121 |
src_compile() { |
| 122 |
einfo "Building userspace" |
| 123 |
emake \ |
| 124 |
CC="$(tc-getCC)" \ |
| 125 |
COPT_FLAGS="${CFLAGS}" \ |
| 126 |
LDFLAGS="${LDFLAGS}" \ |
| 127 |
${myconf} \ |
| 128 |
binaries || die "failed to build" |
| 129 |
|
| 130 |
if [[ ${build_modules} -eq 1 ]]; then |
| 131 |
einfo "Building kernel modules" |
| 132 |
cd "${S}/kernel" |
| 133 |
export KERNELDIR="${KERNEL_DIR}" |
| 134 |
linux-mod_src_compile || die "failed to build modules" |
| 135 |
fi |
| 136 |
} |
| 137 |
|
| 138 |
src_install() { |
| 139 |
einfo "Installing userspace" |
| 140 |
emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package" |
| 141 |
|
| 142 |
if [[ ${build_modules} -eq 1 ]]; then |
| 143 |
einfo "Installing kernel modules" |
| 144 |
cd "${S}/kernel" |
| 145 |
export KERNELDIR="${KERNEL_DIR}" |
| 146 |
linux-mod_src_install |
| 147 |
fi |
| 148 |
} |
Archives