net-firewall/ipset: use more general solution for all tool involved into firewall building instead of custom init script.

svn path=/; revision=488

6 files changed, 0 insertions, 300 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
deleted file mode 100644
index 6b0afdf..0000000
--- a/net-firewall/ipset/ChangeLog
+++ /dev/null
@@ -1,124 +0,0 @@
-# ChangeLog for net-firewall/ipset
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.22 2009/02/26 17:01:59 pva Exp $
-
-*ipset-2.4.8 (26 Feb 2009)
-
-  26 Feb 2009; Peter Volkov <pva@gentoo.org>
-  +files/ipset-2.4.8-use-new-hash.patch, ipset-2.4.7.ebuild,
-  +ipset-2.4.8.ebuild:
-  Version bump, bug #260338, thank BoneKracker for report. Disable warnings,
-  fixes bug #259999, thank Aleksey Kunitskiy for report.
-
-  04 Feb 2009; Markus Meier <maekke@gentoo.org> ipset-2.4.7.ebuild:
-  amd64/x86 stable, bug #257483
-
-*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)
-
-  24 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
-  +files/ipset-2.4.2-glibc28-fix.patch, +ipset-2.4.2.ebuild:
-  Bug #243092, version bump.
-
-  14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> ipset-2.3.3a.ebuild:
-  Bug #236138, allow building with non-modular kernels.
-
-*ipset-2.3.3a (14 Aug 2008)
-
-  14 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +ipset-2.3.3a.ebuild:
-  Bug #233763, version bump to resolve glibc-2.8 issues. Upstream also now
-  includes modules buildable without patching the kernel.
-
-*ipset-2.3.1.20080612 (25 Jun 2008)
-
-  25 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
-  +ipset-2.3.1.20080612.ebuild:
-  Version bump per bug #226155.
-
-*ipset-2.3.0.20070828-r2 (14 Nov 2007)
-
-  14 Nov 2007; <pva@gentoo.org> -ipset-2.3.0.20070828-r1.ebuild,
-  +ipset-2.3.0.20070828-r2.ebuild:
-  Fixed LIBDIR to include /; bug 199084 reported by Krzysztof Olędzki
-  <ole+gentoo AT ans.pl>.
-
-  10 Nov 2007; <pva@gentoo.org> -ipset-2.1.0.20050119-r1.ebuild,
-  -ipset-2.2.8.20051203.ebuild, -ipset-2.2.9.20060508.ebuild:
-  Clean old.
-
-  10 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
-  ipset-2.2.9.20070401.ebuild:
-  stable x86, bug 198158
-
-*ipset-2.3.0.20070828-r1 (07 Nov 2007)
-
-  07 Nov 2007; <pva@gentoo.org> -ipset-2.3.0.20070828.ebuild,
-  +ipset-2.3.0.20070828-r1.ebuild:
-  Cleaned ebuild, courtesy of Donnie Berkholz <dberkholz AT gentoo.org>
-
-*ipset-2.3.0.20070828 (05 Nov 2007)
-
-  05 Nov 2007; <pva@gentoo.org> metadata.xml, +ipset-2.3.0.20070828.ebuild:
-  Version bump. Added myself in metadata. Added emerge --config to patch the
-  kernel.
-
-  12 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
-  -ipset-2.1.0.20050119.ebuild:
-  Remove old version that uses check_KV, bug 150058
-
-*ipset-2.2.9.20070401 (10 Apr 2007)
-
-  10 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
-  +ipset-2.2.9.20070401.ebuild:
-  New version from upstream, bug #173218. Please note that while this version
-  will compile without a patched kernel, you still need a patched kernel to
-  use it!.
-
-*ipset-2.2.9.20060508 (25 May 2006)
-
-  25 May 2006; Robin H. Johnson <robbat2@gentoo.org>
-  ipset-2.2.8.20051203.ebuild, +ipset-2.2.9.20060508.ebuild:
-  Bug #126878, upstream seems to have changed the directory name inside the
-  tarball. Also version bump that fixes a return code issue.
-
-  27 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
-  ipset-2.2.8.20051203.ebuild:
-  Adjust description to indicate that this package only provides the userspace
-  portion of ipset. You must still manually patch your kernel to have ipset
-  support.
-
-*ipset-2.2.8.20051203 (12 Dec 2005)
-
-  12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +ipset-2.2.8.20051203.ebuild:
-  Version bump.
-
-  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
-  ipset-2.1.0.20050119-r1.ebuild:
-  Stable on x86, 146 days in ~x86.
-
-  06 May 2005; Sven Wegener <swegener@gentoo.org>
-  ipset-2.1.0.20050119.ebuild, ipset-2.1.0.20050119-r1.ebuild:
-  Removed * postfix from <, <=, >= and > dependencies.
-
-*ipset-2.1.0.20050119-r1 (03 May 2005)
-
-  03 May 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +ipset-2.1.0.20050119-r1.ebuild:
-  Convert to use linux-info eclass.
-
-  26 Apr 2005; Andrej Kacian <ticho@gentoo.org> ipset-2.1.0.20050119.ebuild:
-  Added ~amd64 keyword.
-
-*ipset-2.1.0.20050119 (10 Mar 2005)
-
-  10 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
-  +ipset-2.1.0.20050119.ebuild:
-  Initial commit, ebuild by Robin H. Johnson <robbat2@gentoo.org>.
-
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
deleted file mode 100644
index ac14c65..0000000
--- a/net-firewall/ipset/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ipset.confd 212 RMD160 d48c00a662fc69b79b73cdd03fa3b2a19644f9d6 SHA1 316e58ecd40da38deeb24ff15f4c7f701bc798f6 SHA256 1663a24bd6ebe19602c1ad11aff608b9269ecd98913ce2f7c582e28e727500f0
-AUX ipset.initd 972 RMD160 c4a04ba1d47d352893f0fd611dcf76877e0d8bec SHA1 c350ed53063690b28996af2d1ff2910a1e231bac SHA256 4e5b3208d798faf67df65e6ab3e8e4c19316b2b110e97d51f69ea31609bedb73
-DIST ipset-2.5.0.tar.bz2 67088 RMD160 5d18b6222daf2be64b017e1675036e43ffca1c58 SHA1 150670c0acb6337e478ccee580d6f17048b15fa0 SHA256 de84aa48d515f98cc33982e9092700e116adb8f987a924b1bfa91bc4acca73c7
-EBUILD ipset-2.5.0.ebuild 2679 RMD160 ec08b8b1987b9568b3575527b3eced569232ae2d SHA1 5f6e178bef9e7056df66cc4ed629559edea671a2 SHA256 68c5a185ba73da962b37db5750a617087e3613e5cb5f2fd78a6c21a55bf51cf3
-MISC ChangeLog 4342 RMD160 486d65b21ac968d53fbbd9c7a830aa7447d653ad SHA1 e7e164c3ddff787e1ac8015f0769dd78f39a57f3 SHA256 d1316fa338957b2a6bd41d8f6a1351242009e361f1813790aca6165944d11d0c
-MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5
diff --git a/net-firewall/ipset/files/ipset.confd b/net-firewall/ipset/files/ipset.confd
deleted file mode 100644
index 36dd59d..0000000
--- a/net-firewall/ipset/files/ipset.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/ipset
-
-# Location in which ipset initscript will save set rules on
-# service shutdown or on save command
-IPSET_SAVE="/var/lib/ipset/rules-save"
-
-# Save state on stopping iptables
-SAVE_ON_STOP="yes"
diff --git a/net-firewall/ipset/files/ipset.initd b/net-firewall/ipset/files/ipset.initd
deleted file mode 100755
index 4670db5..0000000
--- a/net-firewall/ipset/files/ipset.initd
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-opts="save reload"
-
-ipset_bin="/sbin/ipset"
-ipset_save=${IPSET_SAVE}
-depend() {
-	before iptables net
-#	use logger
-}
-
-checkconfig() {
-	if [ ! -f ${ipset_save} ] ; then
-		eerror "Not starting ipset.  First create some rules then run:"
-		eerror "/etc/init.d/ipset save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ipset state"
-	${ipset_bin} --restore ${SAVE_RESTORE_OPTIONS} < "${ipset_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	ebegin "Stopping ipset (cleaning all ipsets)"
-	${ipset_bin} -F
-	${ipset_bin} -X
-	eend $?
-}
-
-reload() {
-	ebegin "Flushing ipsets"
-	${ipset_bin} -F
-	${ipset_bin} -X
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ipsets state"
-	touch "${ipset_save}"
-	chmod 0600 "${ipset_save}"
-	${ipset_bin} --save > "${ipset_save}"
-	eend $?
-}
diff --git a/net-firewall/ipset/ipset-2.5.0.ebuild b/net-firewall/ipset/ipset-2.5.0.ebuild
deleted file mode 100644
index 67d2b99..0000000
--- a/net-firewall/ipset/ipset-2.5.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.9-r1.ebuild,v 1.1 2009/03/03 13:15:52 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="~amd64 ~ppc ~x86"
-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
-
-}
-
-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"
-	myconf="${myconf} NO_EXTRA_WARN_FLAGS=yes"
-	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
-
-	keepdir /var/lib/ipset/
-	newconfd "${FILESDIR}"/ipset.confd ipset || die
-	newinitd "${FILESDIR}"/ipset.initd ipset || die
-}
diff --git a/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
deleted file mode 100644
index f38b7dc..0000000
--- a/net-firewall/ipset/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>pva@gentoo.org</email>
-</maintainer>
-</pkgmetadata>