remove old versions

(Portage version: 2.2_rc42/cvs/Linux i686)

6 files changed, 7 insertions, 371 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 9b765ffbd162..6ef7d2cff558 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.43 2009/09/04 23:17:49 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.44 2009/09/29 19:30:17 bangert Exp $
+
+  29 Sep 2009; Thilo Bangert <bangert@gentoo.org>
+  -files/firehol-1.226-to-228.patch, -firehol-1.250-r2.ebuild,
+  -files/firehol-1.250-printf.patch, -firehol-1.256-r1.ebuild,
+  -firehol-1.273.ebuild:
+  remove old versions
 
   04 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/firehol-1.250-groupwith.patch, -files/firehol-1.256-printf.patch:
diff --git a/net-firewall/firehol/files/firehol-1.226-to-228.patch b/net-firewall/firehol/files/firehol-1.226-to-228.patch
deleted file mode 100644
index a94dcfed4e23..000000000000
--- a/net-firewall/firehol/files/firehol-1.226-to-228.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-===================================================================
-RCS file: /cvsroot/firehol/firehol/firehol.sh,v
-retrieving revision 1.226
-retrieving revision 1.228
-diff -u -r1.226 -r1.228
---- firehol/firehol/firehol.sh	2005/01/25 21:28:19	1.226
-+++ firehol/firehol/firehol.sh	2005/02/09 22:36:24	1.228
-@@ -74,6 +74,27 @@
- 	return 0
- }
- 
-+# Check for a command during runtime.
-+# Currently the following commands are required only when needed:
-+#
-+# wget or curl (either is fine)
-+# gzcat
-+#
-+require_cmd() {
-+	for x in $1
-+	do
-+		eval var=`echo ${x} | tr 'a-z' 'A-Z'`_CMD
-+		eval val=\$\{${var}\}
-+		if [ -z "${val}" ]
-+		then
-+			which_cmd -n "${var}" "${x}"
-+			test $? -eq 0 && return 0
-+		fi
-+	done
-+	
-+	return 1
-+}
-+
- which_cmd CAT_CMD cat
- which_cmd CUT_CMD cut
- which_cmd CHOWN_CMD chown
-@@ -103,7 +124,6 @@
- which_cmd TR_CMD tr
- which_cmd UNAME_CMD uname
- which_cmd UNIQ_CMD uniq
--which_cmd -n WGET_CMD wget || which_cmd CURL_CMD curl
- 
- # Make sure our generated files cannot be accessed by anyone else.
- umask 077
-@@ -1778,6 +1798,8 @@
- firehol_wget() {
- 	local url="${1}"
- 	
-+	require_cmd wget curl || error "Cannot find 'wget' or 'curl' in the path."
-+	
- 	if [ ! -z "${WGET_CMD}" ]
- 	then
- 		${WGET_CMD} -O - "${url}" 2>/dev/null
-@@ -1828,6 +1850,9 @@
- 		done
- 		
- 		test ${count} -eq 0 && softwarning "No ECN SHAME IPs found." && return 1
-+	else
-+		softwarning "TCP_ECN is not enabled in the kernel. ECN_SHAME helper is ignored."
-+		return 0
- 	fi
- 	return 0
- }
-@@ -2563,12 +2588,21 @@
- # new firewall has been activated. Here we just keep a list of the required
- # kernel modules.
- 
-+# optionaly require command gzcat
-+require_cmd gzcat
-+
- KERNEL_CONFIG=
- if [ -f "/proc/config" ]
- then
- 	KERNEL_CONFIG="/proc/config"
- 	${CAT_CMD} /proc/config >${FIREHOL_DIR}/kcfg
- 	source ${FIREHOL_DIR}/kcfg
-+	${RM_CMD} -f ${FIREHOL_DIR}/kcfg	
-+elif [ -f "/proc/config.gz" -a ! -z "${GZCAT_CMD}" ]
-+then
-+	KERNEL_CONFIG="/proc/config.gz"
-+	${GZCAT_CMD} /proc/config.gz >${FIREHOL_DIR}/kcfg
-+	source ${FIREHOL_DIR}/kcfg
- 	${RM_CMD} -f ${FIREHOL_DIR}/kcfg
- 	
- elif [ -f "/lib/modules/`${UNAME_CMD} -r`/build/.config" ]
-@@ -2600,7 +2634,6 @@
- 	echo >&2 " "
- fi
- 
--
- # activation-phase command to check for the existance of
- # a kernel configuration directive. It returns:
- # 0 = module is already in the kernel
diff --git a/net-firewall/firehol/files/firehol-1.250-printf.patch b/net-firewall/firehol/files/firehol-1.250-printf.patch
deleted file mode 100644
index 1222e15de65d..000000000000
--- a/net-firewall/firehol/files/firehol-1.250-printf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- firehol.sh	2006-12-27 14:34:58.000000000 +0100
-+++ firehol.new	2006-12-27 14:53:16.000000000 +0100
-@@ -2412,7 +2412,7 @@
- 		printf "runcmd '${check}' '${FIREHOL_LINEID}' " >>${FIREHOL_OUTPUT}
- 	fi
- 	
--	printf "%q " "$@" >>${FIREHOL_OUTPUT}
-+	printf "%b " "$@" >>${FIREHOL_OUTPUT}
- 	printf "\n" >>${FIREHOL_OUTPUT}
- 	
- 	if [ ${FIREHOL_EXPLAIN} -eq 1 ]
-@@ -4885,7 +4885,7 @@
- 	echo >&2 "WARNING"
- 	echo >&2 "WHAT   : ${work_function}"
- 	echo >&2 "WHY    :" "$@"
--	printf >&2 "COMMAND: "; printf >&2 "%q " "${work_realcmd[@]}"; echo >&2
-+	printf >&2 "COMMAND: "; printf >&2 "%b " "${work_realcmd[@]}"; echo >&2
- 	echo >&2 "SOURCE : line ${FIREHOL_LINEID} of ${FIREHOL_CONFIG}"
- 	echo >&2
- 	
-@@ -4906,7 +4906,7 @@
- 	echo >&2 "ERROR #: ${work_error}"
- 	echo >&2 "WHAT   : ${work_function}"
- 	echo >&2 "WHY    :" "$@"
--	printf >&2 "COMMAND: "; printf >&2 "%q " "${work_realcmd[@]}"; echo >&2
-+	printf >&2 "COMMAND: "; printf >&2 "%b " "${work_realcmd[@]}"; echo >&2
- 	echo >&2 "SOURCE : line ${FIREHOL_LINEID} of ${FIREHOL_CONFIG}"
- 	echo >&2
- 	
-@@ -4960,7 +4960,7 @@
- 	echo >&2 "WHAT    : A runtime command failed to execute (returned error ${ret})."
- 	echo >&2 "SOURCE  : line ${line} of ${FIREHOL_CONFIG}"
- 	printf >&2 "COMMAND : "
--	printf >&2 "%q " "$@"
-+	printf >&2 "%b " "$@"
- 	printf >&2 "\n"
- 	echo >&2 "OUTPUT  : "
- 	echo >&2
-@@ -5157,7 +5157,7 @@
- 			*)	;;
- 		esac
- 		
--		printf "%q " "${work_realcmd[@]}"
-+		printf "%b " "${work_realcmd[@]}"
- 		printf "\n\n"
- 	) >>${FIREHOL_OUTPUT}
- }
diff --git a/net-firewall/firehol/firehol-1.250-r2.ebuild b/net-firewall/firehol/firehol-1.250-r2.ebuild
deleted file mode 100644
index eea126cf1040..000000000000
--- a/net-firewall/firehol/firehol-1.250-r2.ebuild
+++ /dev/null
@@ -1,79 +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/firehol/firehol-1.250-r2.ebuild,v 1.6 2009/01/25 01:11:35 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-1.226.tar.bz2
-	mirror://gentoo/${PN}-1.226-to-250.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-DEPEND="sys-apps/iproute2"
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-S="${WORKDIR}/${PN}-1.226"
-
-pkg_setup() {
-	# Bug 81600 fail if iproute2 is built with minimal
-	if built_with_use sys-apps/iproute2 minimal; then
-		eerror "Firehol requires iproute2 to be emerged without"
-		eerror "the USE-Flag \"minimal\"."
-		eerror "Re-emerge iproute2 with"
-		eerror "USE=\"-minimal\" emerge sys-apps/iproute2"
-		die "sys-apps/iproute2 without USE=\"minimal\" needed"
-	fi
-}
-
-# patch for embedded Gentoo - GNAP
-# backport from firehol-CVS.
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	epatch "${FILESDIR}/firehol-1.226-to-228.patch" || die
-	epatch "${WORKDIR}/firehol-1.226-to-250.patch" || die
-	# invalid, see Bug 176862 epatch ${FILESDIR}/${P}-groupwith.patch || die
-	epatch "${FILESDIR}/${P}-printf.patch" || die
-}
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	newconfd "${FILESDIR}/firehol.conf.d" firehol || die
-
-	dodoc ChangeLog README TODO WhatIsNew || die
-	dohtml doc/*.html doc/*.css  || die
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh || die
-
-	doman man/*.1 man/*.5 || die
-
-	newinitd "${FILESDIR}/firehol.initrd" firehol || die
-}
-
-pkg_postinst() {
-	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	elog "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}
diff --git a/net-firewall/firehol/firehol-1.256-r1.ebuild b/net-firewall/firehol/firehol-1.256-r1.ebuild
deleted file mode 100644
index 1aab7d563745..000000000000
--- a/net-firewall/firehol/firehol-1.256-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild,v 1.3 2008/09/27 13:37:48 betelgeuse Exp $
-
-EAPI=2
-
-inherit eutils linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="sys-apps/iproute2"
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-#S="${WORKDIR}/${PN}-1.226"
-
-pkg_setup() {
-	# perform checks for kernel config from eclass linux-info
-	# for now we just print warnings as I am not sure if these
-	# are required always...
-	CONFIG_CHECK="~NF_CONNTRACK_ENABLED ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
-	linux-info_pkg_setup
-}
-
-# patch for embedded Gentoo - GNAP
-# backport from firehol-CVS.
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	# not needed any more according to http://bugs.gentoo.org/show_bug.cgi?id=172000#c15
-	#epatch ${FILESDIR}/${P}-printf.patch || die
-
-	# Bug 195378, binary is called zcat instead of gzcat, fixed upstream in later releases
-	sed -i -e 's/gzcat/zcat/g' firehol.sh || die
-	sed -i -e 's/GZCAT/ZCAT/g' firehol.sh || die
-}
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	newconfd "${FILESDIR}/firehol.conf.d" firehol || die
-
-	dodoc ChangeLog README TODO WhatIsNew || die
-	dohtml doc/*.html doc/*.css  || die
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh || die
-
-	doman man/*.1 man/*.5 || die
-
-	newinitd "${FILESDIR}/firehol.initrd" firehol || die
-}
-
-pkg_postinst() {
-	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	elog "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}
diff --git a/net-firewall/firehol/firehol-1.273.ebuild b/net-firewall/firehol/firehol-1.273.ebuild
deleted file mode 100644
index 11a0150f0f67..000000000000
--- a/net-firewall/firehol/firehol-1.273.ebuild
+++ /dev/null
@@ -1,73 +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/firehol/firehol-1.273.ebuild,v 1.2 2009/03/09 16:54:00 armin76 Exp $
-
-EAPI=2
-
-inherit eutils linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-
-DEPEND="sys-apps/iproute2"
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal]
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-pkg_setup() {
-	# perform checks for kernel config from eclass linux-info
-	# for now we just print warnings as I am not sure if these
-	# are required always...
-	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK \
-		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT \
-		~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT \
-		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
-	get_version
-	if [ ${KV_PATCH} -ge 25 ]; then
-		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
-	else
-		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
-	fi
-	linux-info_pkg_setup
-}
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	newconfd "${FILESDIR}/firehol.conf.d" firehol || die
-
-	dodoc ChangeLog README TODO WhatIsNew || die
-	dohtml doc/*.html doc/*.css  || die
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh || die
-
-	doman man/*.1 man/*.5 || die
-
-	newinitd "${FILESDIR}/firehol.initrd" firehol || die
-}
-
-pkg_postinst() {
-	elog "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	elog "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}