summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-06-16 12:32:39 +0000
committerPeter Volkov <pva@gentoo.org>2011-06-16 12:32:39 +0000
commit91e3e0c415fe9a532d575e8aa23e0373b3503c13 (patch)
treeb7b7a965ed949269b9566db686cb0404712c3211 /net-firewall/ipset
parentAdd version 0.75. Use systemd eclass (diff)
downloadhistorical-91e3e0c415fe9a532d575e8aa23e0373b3503c13.tar.gz
historical-91e3e0c415fe9a532d575e8aa23e0373b3503c13.tar.bz2
historical-91e3e0c415fe9a532d575e8aa23e0373b3503c13.zip
Add missing xt_set and ip_set_hash_netiface modules. Drop old.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/ipset')
-rw-r--r--net-firewall/ipset/ChangeLog8
-rw-r--r--net-firewall/ipset/Manifest8
-rw-r--r--net-firewall/ipset/ipset-6.4.ebuild102
-rw-r--r--net-firewall/ipset/ipset-6.6.ebuild106
-rw-r--r--net-firewall/ipset/ipset-6.7-r1.ebuild (renamed from net-firewall/ipset/ipset-6.7.ebuild)6
5 files changed, 12 insertions, 218 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 9e5de8d00548..04ca19516528 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-firewall/ipset
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.46 2011/06/16 11:22:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.47 2011/06/16 12:32:39 pva Exp $
+
+*ipset-6.7-r1 (16 Jun 2011)
+
+ 16 Jun 2011; Peter Volkov <pva@gentoo.org> -ipset-6.4.ebuild,
+ -ipset-6.6.ebuild, -ipset-6.7.ebuild, +ipset-6.7-r1.ebuild:
+ Add missing xt_set and ip_set_hash_netiface modules. Drop old.
*ipset-6.7 (16 Jun 2011)
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 2901ddf779ba..4be0a9ade549 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-4.4.tar.bz2 72636 RMD160 464de587beacab53f2ca6a73f5a081ddd0156d16 SHA1 fb86d8b00ed57e13b3ae8dd876f9b45995cabbf3 SHA256 19bb07a39d6c1e705cc0715e9e3ed07f450bc4869e2534169cfd7be59271bfd9
DIST ipset-4.5.tar.bz2 72428 RMD160 eb986eee5daa5f49be5df0eeb7f09c595b415ee1 SHA1 696a5cd96459c8fb028f0dfb9927a5c4f183d28b SHA256 f94200f39398f90b60633b5fa45f0c327d5915e2c5a68e6c90fcb8ea13be6994
-DIST ipset-6.4.tar.bz2 117283 RMD160 afd73c31b1b578ea414c22bc80befbafe1d11b13 SHA1 828ce9d37bb4861eb47bbd08decac597b8cdcd2d SHA256 25729b75ed28d57b6dfc56c62fadd9919113cffae9af04a93a2688f6b164ba8d
-DIST ipset-6.6.tar.bz2 120109 RMD160 bc5d489d180f464d660bd9649913d05bc2c93852 SHA1 2e1fd99f5706017e72c5ea569ee5c029838b60d4 SHA256 41c6d4a086babc59c63cd08072b5406e3c015a1ec6fc1be27e3b02ec7fe2d3e8
DIST ipset-6.7.tar.bz2 121850 RMD160 3a55f03e6d3a81cd6a721cb8c8c4e4ff08aeac0c SHA1 968bc0e9f1bd248333a4483e5cb2c57cd1788454 SHA256 2422f35020d943729832e74cc1f4d88074f1b8d6f1430d4d492d6f7493cf3f24
EBUILD ipset-4.4.ebuild 2842 RMD160 f5ffe005565e60e51e8f5560ca9cf57284ff9b4f SHA1 e878ddbf78b3d15d45a23e0ea21ba9ac3c4e4ad3 SHA256 7d7df9f7ca95b31107e88bb35a3b31fa12857e2ed8552371e2f5fcd5457819a6
EBUILD ipset-4.5.ebuild 2844 RMD160 f9f96b96636e0f879c8f6450cf44d3e7d52f8d3c SHA1 f6975cc4e5d9f7c16337973d6c3cda006abe7464 SHA256 68d4d644b7415149ab861fb063ac5918fc7e32eca743a312f07da7d52457590b
-EBUILD ipset-6.4.ebuild 2710 RMD160 8e4f5223ba2e1e1772bcb486e042ba1c2e8c6f65 SHA1 f933c1d1e80b195a447ff5a095150f6624ffc160 SHA256 3cad61bb1b4951700f9d52abf5422b9bfc1540e25e5d224deada28feda602a0c
-EBUILD ipset-6.6.ebuild 2888 RMD160 bfb9eaf63654369477c297a409b325430d9a6577 SHA1 fa069e240df0fa29c84eb4c2d4712983ae917d7a SHA256 25b90b882917f984b930b52b8f8fdbca92059a94f85f99931c34f92aaebc8745
-EBUILD ipset-6.7.ebuild 2888 RMD160 e10c25982a11f46fb67ed75b32980a30fea6aab0 SHA1 3f0c657e5494e7e2902ae35fd6419c292340d073 SHA256 7b9621cdf47d6fd3e18f167cc651e29bebee8a42f5ea6fba65cfea4b94244fe2
-MISC ChangeLog 8294 RMD160 68e12683e4b47f23e424f3a68f7699995a461f8b SHA1 e1f76d659d417f97ef81d72251bba159fd4761c0 SHA256 2bb4d197093d3a1eed3b5b181d69280d498a589621e0c8ae1b0f28f11a620129
+EBUILD ipset-6.7-r1.ebuild 2961 RMD160 0ac609c214214d66920526ba8a53d260e802e561 SHA1 55479c7e613f88805a8fcec97de7b952a245bb16 SHA256 b56356e34d104e5e8e92eefbfde8754020c80dbe1a06639ba0d464437f2da4da
+MISC ChangeLog 8515 RMD160 96d45971715a85fc152e4bebc83cfca987a28cca SHA1 7193d57f2a60ef213ecff9f97bfc086baed95a62 SHA256 521dd927f5f18db1f9f766a528893be620221d7f3d24009adfc96f8cec75568b
MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/ipset-6.4.ebuild b/net-firewall/ipset/ipset-6.4.ebuild
deleted file mode 100644
index 36efa6c1d55b..000000000000
--- a/net-firewall/ipset/ipset-6.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.4.ebuild,v 1.3 2011/05/15 11:44:10 pva Exp $
-
-EAPI="4"
-
-inherit autotools linux-info 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 ~x86"
-IUSE="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.4
- net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-# configurable from outside, e.g. /etc/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES=""
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,netport},_list_set}; do
- MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES"
-ERROR_CFG="ipset requires netfilter support in your kernel."
-
-check_header_patch() {
- if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
- eerror "Sorry, but you have to patch kernel sources with the following patch:"
- eerror " # cd ${KV_DIR}"
- eerror " # patch -i ${S}/netlink.patch -p1"
- eerror "You do not need to recompile your kernel."
- die "Unpatched kernel"
- fi
-}
-
-pkg_setup() {
- get_version
-
- build_modules=0
- if use modules; then
- kernel_is -lt 2 6 34 && die "${PN} requires kernel greater then 2.6.34."
- if linux_config_src_exists && 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
- if kernel_is -gt 2 6 39; then
- einfo "This kernel has modules inside, will not build kernel modules"
- else
- einfo "Modular kernel detected, will build kernel modules"
- build_modules=1
- fi
- fi
- else
- einfo "Nonmodular kernel detected, will not build kernel modules"
- fi
- fi
-
- [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
- [[ ${build_modules} -eq 1 ]] && check_header_patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-maxsets=${IP_NF_SET_MAX} \
- --libdir=${EPREFIX}/$(get_libdir) \
- --with-kbuild=${KV_DIR} \
- --disable-static
-}
-
-src_compile() {
- einfo "Building userspace"
- emake
-
- if [[ ${build_modules} -eq 1 ]]; then
- einfo "Building kernel modules"
- set_arch_to_kernel
- emake modules
- fi
-}
-
-src_install() {
- einfo "Installing userspace"
- emake DESTDIR=${D} install
-
- if [[ ${build_modules} -eq 1 ]]; then
- einfo "Installing kernel modules"
- linux-mod_src_install
- fi
- find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/net-firewall/ipset/ipset-6.6.ebuild b/net-firewall/ipset/ipset-6.6.ebuild
deleted file mode 100644
index 9d2feb2ae144..000000000000
--- a/net-firewall/ipset/ipset-6.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.6.ebuild,v 1.1 2011/05/24 13:04:10 pva Exp $
-
-EAPI="4"
-inherit autotools linux-info 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 ~x86"
-IUSE="modules"
-
-RDEPEND=">=net-firewall/iptables-1.4.4
- net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-# configurable from outside, e.g. /etc/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-BUILD_TARGETS="modules"
-MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES=""
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,netport},_list_set}; do
- MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES"
-ERROR_CFG="ipset requires netfilter support in your kernel."
-
-check_header_patch() {
- if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then
- eerror "Sorry, but you have to patch kernel sources with the following patch:"
- eerror " # cd ${KV_DIR}"
- eerror " # patch -i ${S}/netlink.patch -p1"
- eerror "You do not need to recompile your kernel."
- die "Unpatched kernel"
- fi
-}
-
-pkg_setup() {
- get_version
-
- build_modules=0
- if use modules; then
- kernel_is -lt 2 6 34 && die "${PN} requires kernel greater then 2.6.34."
- if linux_config_src_exists && 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
- if kernel_is -gt 2 6 39; then
- einfo "This kernel has modules inside, will not build kernel modules"
- else
- einfo "Modular kernel detected, will build kernel modules"
- build_modules=1
- fi
- fi
- else
- einfo "Nonmodular kernel detected, will not build kernel modules"
- fi
- fi
-
- [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
-}
-
-src_prepare() {
- [[ ${build_modules} -eq 1 ]] && check_header_patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-maxsets=${IP_NF_SET_MAX} \
- --libdir=${EPREFIX}/$(get_libdir) \
- --with-kbuild=${KV_DIR}
-}
-
-src_compile() {
- einfo "Building userspace"
- emake
-
- if [[ ${build_modules} -eq 1 ]]; then
- einfo "Building kernel modules"
- set_arch_to_kernel
- emake modules
- fi
-}
-
-src_install() {
- einfo "Installing userspace"
- emake DESTDIR=${D} install
-
- if [[ ${build_modules} -eq 1 ]]; then
- einfo "Installing kernel modules"
- linux-mod_src_install
- fi
- find "${ED}" \( -name '*.la' -o -name '*.a' \) -exec rm -f '{}' +
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- elog "Note you need to rebuid and run kernel with netlink.patch or you'll get error:"
- elog "Kernel error received: Invalid argument"
-}
diff --git a/net-firewall/ipset/ipset-6.7.ebuild b/net-firewall/ipset/ipset-6.7-r1.ebuild
index 2de44c34de79..13fd83a0b9f2 100644
--- a/net-firewall/ipset/ipset-6.7.ebuild
+++ b/net-firewall/ipset/ipset-6.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.7.ebuild,v 1.1 2011/06/16 11:22:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.7-r1.ebuild,v 1.1 2011/06/16 12:32:39 pva Exp $
EAPI="4"
inherit autotools linux-info linux-mod
@@ -23,8 +23,8 @@ IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
-MODULE_NAMES=""
-for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,netport},_list_set}; do
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net,net{port,iface}},_list_set}; do
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
done
CONFIG_CHECK="NETFILTER IP6_NF_IPTABLES"