diff options
| -rw-r--r-- | net-firewall/ipset/ChangeLog | 8 | ||||
| -rw-r--r-- | net-firewall/ipset/Manifest | 10 | ||||
| -rw-r--r-- | net-firewall/ipset/ipset-4.1.ebuild | 96 | ||||
| -rw-r--r-- | net-firewall/ipset/ipset-4.2.ebuild | 96 | ||||
| -rw-r--r-- | net-firewall/ipset/ipset-4.5.ebuild (renamed from net-firewall/ipset/ipset-4.3.ebuild) | 2 |
5 files changed, 11 insertions, 201 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog index 0d78517ad4b9..26954d48e7b0 100644 --- a/net-firewall/ipset/ChangeLog +++ b/net-firewall/ipset/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-firewall/ipset # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.40 2010/11/26 19:59:19 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.41 2010/12/21 10:02:00 pva Exp $ + +*ipset-4.5 (21 Dec 2010) + + 21 Dec 2010; Peter Volkov <pva@gentoo.org> -ipset-4.1.ebuild, + -ipset-4.2.ebuild, -ipset-4.3.ebuild, +ipset-4.5.ebuild: + Version bump, drop old. 26 Nov 2010; Christian Faulhammer <fauli@gentoo.org> ipset-4.4.ebuild: stable x86, bug 345019 diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index 6dbcf17a9574..c1638151c530 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -1,13 +1,9 @@ AUX ipset-2.4.7-LDFLAGS.patch 645 RMD160 93e2564e4c1138515a143fa9358d88b7f21f9a6a SHA1 213693f41ba7504b4485669b4f12cfa35f4380ba SHA256 3c64df05ecfcc361e92389e9c4e9a857be5b8097855311a7c3c7f6cf731f458a DIST ipset-2.4.7.tar.bz2 66470 RMD160 6127a3b5ba7fd485e9a95a232ed40bc8ef19ed27 SHA1 dfc3b5ec4e3d13685732049aee9d61495d2a2e69 SHA256 d488a3324327971fd0af8be04d357ad3a5798f92a43b3b177693248b36ca4928 -DIST ipset-4.1.tar.bz2 66123 RMD160 c20a3fc0be187dd5872659b45b7ca0e6ee63e714 SHA1 0b85beb5f21e5183010abef497d16117343fb4f1 SHA256 116ee704355d52919af65379ddb69545e5d4d4602adf2f3765fc649929e7a47a -DIST ipset-4.2.tar.bz2 65839 RMD160 9d24d5540e43dd9fdb11b7c28c660c6533997295 SHA1 40e4b4c80209456084617dd7890391032651a40e SHA256 5f1b9e5245b7998106660a5b29d9580156feda1c669e7214793a90e02e4a1203 -DIST ipset-4.3.tar.bz2 72019 RMD160 f800ff0f199a528d1ada182b2ff6a932273b72e8 SHA1 63530ee8183a67ccba2148fd9c5695c2aaede0a7 SHA256 ec7b75044206d00e98cf7cf25d9ae9022cb9e5a5dbfbe8c5728272e53c334d44 DIST ipset-4.4.tar.bz2 72636 RMD160 464de587beacab53f2ca6a73f5a081ddd0156d16 SHA1 fb86d8b00ed57e13b3ae8dd876f9b45995cabbf3 SHA256 19bb07a39d6c1e705cc0715e9e3ed07f450bc4869e2534169cfd7be59271bfd9 +DIST ipset-4.5.tar.bz2 72428 RMD160 eb986eee5daa5f49be5df0eeb7f09c595b415ee1 SHA1 696a5cd96459c8fb028f0dfb9927a5c4f183d28b SHA256 f94200f39398f90b60633b5fa45f0c327d5915e2c5a68e6c90fcb8ea13be6994 EBUILD ipset-2.4.7.ebuild 2598 RMD160 d301a1f55b887ea8d911e2ae757473c1af08268b SHA1 b831f89ea9b811f14af30f97e05e99ccf22e30f7 SHA256 ba66819160a1638f49afeceffdc6fbb0f8e402eece8bf35382bebc0ec6236efd -EBUILD ipset-4.1.ebuild 2772 RMD160 20c98b54f6ecb8e3cea2fb8954c0a83063f12fd1 SHA1 830cc0c049f00fc317a069b91ed0e2884edc4ded SHA256 264d1d83f258775a231441a17f64199f939353916921eed745fc77b7319b239b -EBUILD ipset-4.2.ebuild 2774 RMD160 1ac1abc15d77cac12e24fae657e1fb1cae276a44 SHA1 929a22199c39bf319469daa36421333d47c1653a SHA256 615998dbd9d302c24cf3d62d215c4da0bc03aada6cab55d6ca51b4e4f006da04 -EBUILD ipset-4.3.ebuild 2842 RMD160 12243ae5dc428aa2d5c748afd53d73307c4cb185 SHA1 c7e6e1d5133821b5f31640a68b36ffb3aac4deed SHA256 97d2d8676f21a839915d0fa6c19276a231278856a4c51fc0d702e707b05f611b EBUILD ipset-4.4.ebuild 2842 RMD160 af7eca424294f5d2474c30c653fc8cf82b4f2ccc SHA1 1bb5864f3a584e50907a8bc29a8bdb2e0be16857 SHA256 f1b971e5ed91a16e94d4f3aca07e42499645b7eabc635bf5537d3671315cd40b -MISC ChangeLog 7372 RMD160 cad5f032f16f3859f1a12e0389aba199808e00d9 SHA1 722a640fa1948111fcc11b737c0f624d417a5b36 SHA256 7aea3c4233ff8318cdd345fe9a1f6b665b896ab76129e19a88ce51c4b819dfe1 +EBUILD ipset-4.5.ebuild 2842 RMD160 77687f852285230bf3783dc331a020f5bc501490 SHA1 04ac18297482dee1b6de84a0f3fb55a73f46cadb SHA256 66cf7b59d9d7529c6c50e8bcd1abe1e9e67724ce8318f50324a296fe0b77ab13 +MISC ChangeLog 7546 RMD160 c659e5117549ca3765f2998938a77e48f4846263 SHA1 9d8adee63b2dede468d1bae67f9e1ea80a8a8687 SHA256 5446edbb40c9e4bbaaebdb68e4bd205799bfdbe97fb5adc33c9361ceed450ab2 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5 diff --git a/net-firewall/ipset/ipset-4.1.ebuild b/net-firewall/ipset/ipset-4.1.ebuild deleted file mode 100644 index 53ce123f15fc..000000000000 --- a/net-firewall/ipset/ipset-4.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.1.ebuild,v 1.5 2010/05/20 10:38:35 pva Exp $ - -EAPI="2" - -inherit eutils versionator toolchain-funcs linux-mod - -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="amd64 ~ppc x86" -IUSE="modules" - -RDEPEND=">=net-firewall/iptables-1.4.4" -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{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \ - ipt_{SET,set}; do - MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})" -done -# sanity -CONFIG_CHECK="NETFILTER" -ERROR_CFG="ipset requires netfilter support in your kernel." - -pkg_setup() { - get_version - - build_modules=0 - if use modules; then - if linux_chkconfig_builtin "MODULES" ; then - if linux_chkconfig_builtin "IP_NF_SET"; then #274577 - einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules" - else - build_modules=1 - einfo "Modular kernel detected, will build kernel modules" - fi - else - einfo "Nonmodular kernel detected, will not build kernel modules" - fi - fi - - [[ ${build_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" - myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes" - export myconf -} - -src_prepare() { - 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 -} - -src_compile() { - einfo "Building userspace" - emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" - - if [[ ${build_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 [[ ${build_modules} -eq 1 ]]; then - einfo "Installing kernel modules" - cd "${S}/kernel" - export KERNELDIR="${KERNEL_DIR}" - linux-mod_src_install - fi -} diff --git a/net-firewall/ipset/ipset-4.2.ebuild b/net-firewall/ipset/ipset-4.2.ebuild deleted file mode 100644 index c82a5d3814a0..000000000000 --- a/net-firewall/ipset/ipset-4.2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.2.ebuild,v 1.1 2010/02/08 18:39:26 pva Exp $ - -EAPI="2" - -inherit eutils versionator toolchain-funcs linux-mod - -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="~amd64 ~ppc ~x86" -IUSE="modules" - -RDEPEND=">=net-firewall/iptables-1.4.4" -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{,_{setlist,{ip,port,macip}map,{ip,net,ipport,ipportip,ipportnet}hash,iptree{,map}}} \ - ipt_{SET,set}; do - MODULE_NAMES="${MODULE_NAMES} ${i}(${MODULE_NAMES_ARG})" -done -# sanity -CONFIG_CHECK="NETFILTER" -ERROR_CFG="ipset requires netfilter support in your kernel." - -pkg_setup() { - get_version - - build_modules=0 - if use modules; then - if linux_chkconfig_builtin "MODULES" ; then - if linux_chkconfig_builtin "IP_NF_SET"; then #274577 - einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules" - else - build_modules=1 - einfo "Modular kernel detected, will build kernel modules" - fi - else - einfo "Nonmodular kernel detected, will not build kernel modules" - fi - fi - - [[ ${build_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" - myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes" - export myconf -} - -src_prepare() { - 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 -} - -src_compile() { - einfo "Building userspace" - emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" - - if [[ ${build_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 [[ ${build_modules} -eq 1 ]]; then - einfo "Installing kernel modules" - cd "${S}/kernel" - export KERNELDIR="${KERNEL_DIR}" - linux-mod_src_install - fi -} diff --git a/net-firewall/ipset/ipset-4.3.ebuild b/net-firewall/ipset/ipset-4.5.ebuild index c7b0051c4114..12f90e41dc28 100644 --- a/net-firewall/ipset/ipset-4.3.ebuild +++ b/net-firewall/ipset/ipset-4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.3.ebuild,v 1.1 2010/08/25 09:13:21 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.5.ebuild,v 1.1 2010/12/21 10:02:00 pva Exp $ EAPI="2" |