diff options
| -rw-r--r-- | net-firewall/ipset/ChangeLog | 11 | ||||
| -rw-r--r-- | net-firewall/ipset/Manifest | 5 | ||||
| -rw-r--r-- | net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch | 21 | ||||
| -rw-r--r-- | net-firewall/ipset/ipset-2.4.7.ebuild | 92 |
4 files changed, 126 insertions, 3 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog index 251213ad5a59..673935bc6103 100644 --- a/net-firewall/ipset/ChangeLog +++ b/net-firewall/ipset/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-firewall/ipset -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.19 2008/10/24 21:28:25 robbat2 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.20 2009/01/31 16:20:25 pva Exp $ + +*ipset-2.4.7 (31 Jan 2009) + + 31 Jan 2009; Peter Volkov <pva@gentoo.org> + +files/ipset-2.4.7-LDFLAGS.patch, +ipset-2.4.7.ebuild: + Version bump. Respect LDFLAGS, #246016, thank Olivier Huber. Probably + fixes compatibility issue with 2.6.28, #254207, thank Jochen Schlick. *ipset-2.4.2 (24 Oct 2008) diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index 26d1fc3b1268..7eb0583cc046 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -1,8 +1,10 @@ AUX ipset-2.4.2-glibc28-fix.patch 2797 RMD160 765f4fe80ee2ac0a5109726790af161aa313e095 SHA1 5b59c99d823067a6553b0d7b1e03989035d068eb SHA256 c3faf45b7a05bd4ebb9d6c633459cd6fadf6c5d43cd6169414ade509d2608769 +AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6a SHA1 213693f41ba7504b4485669b4f12cfa35f4380ba SHA256 3c64df05ecfcc361e92389e9c4e9a857be5b8097855311a7c3c7f6cf731f458a DIST ipset-2.3.0-20070828.tar.bz2 29442 RMD160 f87edd407fdda85d8fefb8ca31865a22a65753a4 SHA1 b831b0a0f6a7987b2eda8f7b1545da8b191673e8 SHA256 216f9bc128c2d0afab549baf1586ab9f2359e32fd1ccfe5ed0dc57e193d8f66a DIST ipset-2.3.1-20080612.tar.bz2 31821 RMD160 9de9f2e781e6b5256e868acabb24445b58c72c76 SHA1 b6a9ec4272d8e47ad2addde61ca1e91fd2dbe078 SHA256 86bbe1116e26ed0e33b0944f0f9314ab3321699e93ed29e10c2dc72b9d1721b8 DIST ipset-2.3.3a.tar.bz2 59876 RMD160 1f38bb569d970a6f4161feacb48f0636c77399e9 SHA1 b20ba40bf46024570a62465fa5a71881d535aaf7 SHA256 b671d707ec83fd7d75b1107154a919b065346bcf650131e22c0f7286971ce6ee DIST ipset-2.4.2.tar.bz2 65862 RMD160 8c86e7eea45449809cc993de0baca7095c566aa9 SHA1 a97a195cb3b55b7a7417faa63241b8dc5d6b622f SHA256 5e8b2bf50dc3147efc1652a8f38e600b85dc1917d0430d5c9b42de0d80519889 +DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928 DIST ipset-20070401.tar.bz2 28279 RMD160 a51faccf276b5c90a83de1e3a0c5af9d2a93975e SHA1 b2ac74384513f4c235bb55e02dc6931f501dd9d5 SHA256 0a0c8b96c979148d652bc4b9b6ce601144abecc8c3aceba50f898c58edab1c90 DIST patch-o-matic-ng-20070401.tar.bz2 142585 RMD160 34e5c2ad672b7384867d2953bc889c9526ebb754 SHA1 b8cad77065a97d3fd8f1740fd75736eac2c0117f SHA256 8176cfdc36bcf015a2a662589e96bdf23d85240c8ef1f14cad76eb08777700f0 DIST patch-o-matic-ng-20071021.tar.bz2 136199 RMD160 3e211f5a2c930d582d0d7e4d47b1f6313b68e302 SHA1 303295dc853dd3947ae4e2c98c3b1ab69c276cf8 SHA256 558d3f1cb35e92faedc067bb34073f77db065c7a5c88ce1d4d6ea5588266e3ae @@ -12,5 +14,6 @@ EBUILD ipset-2.3.0.20070828-r2.ebuild 2263 RMD160 d85e331bf7f67489dad5e20119db97 EBUILD ipset-2.3.1.20080612.ebuild 2277 RMD160 40030a62ebb0b99a9bed13922b83787d379551ea SHA1 1df16cbf2f777bd7e064a3a5b2f6adaed5edf00a SHA256 36dd86162d140190c6cf9d2034d28c5d64a33ed1e7c85f154e89fd81f22fcd8a EBUILD ipset-2.3.3a.ebuild 2564 RMD160 72eb03f8baa17e89d487d96db12e1f54fff69a12 SHA1 73ef5e17609ebf4b877f4bdf75936aaa52b4a44a SHA256 02efd65e0add02d9e9088aecabf040cdf312b9132c977198d321d4036bbf063d EBUILD ipset-2.4.2.ebuild 2616 RMD160 744a45070b5341cb8d26165088eca20ce1e655e0 SHA1 75dea2364ffb0910bd487bc1f2ff66d194db1c5c SHA256 b8ed0e0a6a2d0e2fdb40bacbac3d75703c7a3fc03e7a69e277b8a33f57b4ca3b -MISC ChangeLog 3678 RMD160 08f335dee0c8b47c32771d34890df43e01f62f30 SHA1 64037e9041efcf00a3d901aac21a7995a548dd8c SHA256 68c2ce4cda36c3c518a404ed1a87c1b845bda83599b60a7671233d62310390f7 +EBUILD ipset-2.4.7.ebuild 2560 RMD160 111d0888880c29b9078efd5a9a3625861eb01b4d SHA1 6e5ae8ead4caba021bc5c53eb0ac1f92f2c4f6de SHA256 061e83f81db218cb161c12ee03c1abab5ae85daf4ed155ea0f67d57923783154 +MISC ChangeLog 3949 RMD160 514459ea6dd3286b54f4939925f08cf715888fdd SHA1 601d15a7922d977f4e2cd1ee22c3a987ae4e8b80 SHA256 256740ceb131c5ad8b30e657a1f30a3f5b008d85ed4b30b05c6e9119fbae2950 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5 diff --git a/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch b/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch new file mode 100644 index 000000000000..9f8bcaf9e22f --- /dev/null +++ b/net-firewall/ipset/files/ipset-2.4.7-LDFLAGS.patch @@ -0,0 +1,21 @@ +=== modified file 'Makefile' +--- Makefile 2009-01-30 16:53:06 +0000 ++++ Makefile 2009-01-30 20:13:44 +0000 +@@ -105,14 +105,14 @@ + $(CC) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $< + + ipset: ipset.o +- $(CC) $(CFLAGS) -rdynamic -o $@ $^ -ldl ++ $(CC) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ $^ -ldl + + #Pooltypes + ipset_%.o: ipset_%.c ipset.h + $(CC) $(SH_CFLAGS) -o $@ -c $< + + libipset_%.so: ipset_%.o +- $(CC) -shared -o $@ $< ++ $(CC) -shared $(LDFLAGS) -o $@ $< + + $(DESTDIR)$(LIBDIR)/ipset/libipset_%.so: libipset_%.so + @[ -d $(DESTDIR)$(LIBDIR)/ipset ] || mkdir -p $(DESTDIR)$(LIBDIR)/ipset + diff --git a/net-firewall/ipset/ipset-2.4.7.ebuild b/net-firewall/ipset/ipset-2.4.7.ebuild new file mode 100644 index 000000000000..f29fe219fb8f --- /dev/null +++ b/net-firewall/ipset/ipset-2.4.7.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.4.7.ebuild,v 1.1 2009/01/31 16:20:25 pva Exp $ + +inherit eutils versionator toolchain-funcs linux-mod linux-info + +DESCRIPTION="IPset tool for iptables, successor to ippool." +HOMEPAGE="http://ipset.netfilter.org/" +SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="" +RDEPEND=">=net-firewall/iptables-1.4.1" +DEPEND="${RDEPEND}" + +# configurable from outside +[ -z "${IP_NF_SET_MAX}" ] && IP_NF_SET_MAX=256 +[ -z "${IP_NF_SET_HASHSIZE}" ] && IP_NF_SET_HASHSIZE=1024 +BUILD_PARAMS="IP_NF_SET_MAX=$IP_NF_SET_MAX IP_NF_SET_HASHSIZE=${IP_NF_SET_HASHSIZE}" +# module fun +BUILD_TARGETS="all" +MODULE_NAMES_ARG="kernel/net/ipv4/netfilter:${S}/kernel" +MODULE_NAMES="" +for i in ip_set{,_{{ip,port,macip}map,{ip,net,ipport}hash,iptree{,map}}} \ + ipt_{SET,set}; do + MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})" +done +# sanity +CONFIG_CHECK="NETFILTER" +ERROR_CFG="ipset needs netfilter support in your kernel." + +src_unpack() { + unpack ${A} + sed -i \ + -e 's/KERNELDIR/(KERNELDIR)/g' \ + -e 's/^(\?KERNEL_\?DIR.*/KERNELDIR ?= /' \ + -e '/^all::/iV ?= 0' \ + -e '/^all::/iKBUILD_OUTPUT ?=' \ + -e '/$(MAKE)/{s/$@/ V=$(V) KBUILD_OUTPUT=$(KBUILD_OUTPUT) modules/}' \ + "${S}"/kernel/Makefile + + cd "${S}" + epatch "${FILESDIR}/${P}-LDFLAGS.patch" +} + +pkg_setup() { + get_version + + modules=0 + msg='' + if linux_chkconfig_builtin "MODULES" ; then + modules=1 + msg="Modular kernel detected, will build kernel modules" + else + msg="Nonmodular kernel detected, will not build kernel modules" + fi + einfo "${msg}" + + [[ $modules -eq 1 ]] && \ + linux-mod_pkg_setup + myconf="${myconf} PREFIX=" + myconf="${myconf} LIBDIR=/$(get_libdir)" + myconf="${myconf} BINDIR=/sbin" + myconf="${myconf} MANDIR=/usr/share/man" + myconf="${myconf} INCDIR=/usr/include" + export myconf +} + +src_compile() { + einfo "Building userspace" + emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" + + if [[ $modules -eq 1 ]]; then + einfo "Building kernel modules" + cd "${S}/kernel" + export KERNELDIR="${KERNEL_DIR}" + linux-mod_src_compile || die "failed to build modules" + fi +} + +src_install() { + einfo "Installing userspace" + emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package" + + if [[ $modules -eq 1 ]]; then + einfo "Installing kernel modules" + cd "${S}/kernel" + export KERNELDIR="${KERNEL_DIR}" + linux-mod_src_install + fi +} |