Removing old version and unused patches.

(Portage version: 2.2.0_alpha46/cvs/Linux i686)

5 files changed, 6 insertions, 149 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index c31434b49d42..c7720e297b5c 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.19 2011/07/29 19:36:58 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.20 2011/07/30 20:13:52 gurligebis Exp $
+
+  30 Jul 2011; <gurligebis@gentoo.org> -files/miniupnpd-1.3-iptables_path.diff,
+  -miniupnpd-1.5.ebuild, -files/miniupnpd-1.5-iptables_buildfix.diff,
+  -files/miniupnpd-1.5-iptcrdr.diff:
+  Removing old version and unused patches.
 
 *miniupnpd-1.6 (29 Jul 2011)
 
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff b/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff
deleted file mode 100644
index 05b02efb09b2..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh
---- old/netfilter/iptables_display.sh	2009-04-19 20:17:14.000000000 +0000
-+++ new/netfilter/iptables_display.sh	2009-04-19 20:17:52.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # $Id: iptables_display.sh,v 1.3 2006/11/23 12:32:56 nanard Exp $
--IPTABLES=iptables
-+IPTABLES=/sbin/iptables
- 
- #display all chains relative to miniupnpd
- $IPTABLES -v -n -t nat -L PREROUTING
-diff -aurp old/netfilter/iptables_flush.sh new/netfilter/iptables_flush.sh
---- old/netfilter/iptables_flush.sh	2009-04-19 20:17:14.000000000 +0000
-+++ new/netfilter/iptables_flush.sh	2009-04-19 20:17:52.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # $Id: iptables_flush.sh,v 1.2 2006/11/23 12:32:57 nanard Exp $
--IPTABLES=iptables
-+IPTABLES=/sbin/iptables
- 
- #flush all rules owned by miniupnpd
- $IPTABLES -t nat -F MINIUPNPD
-diff -aurp old/netfilter/iptables_init.sh new/netfilter/iptables_init.sh
---- old/netfilter/iptables_init.sh	2009-04-19 20:17:14.000000000 +0000
-+++ new/netfilter/iptables_init.sh	2009-04-19 20:18:19.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # $Id: iptables_init.sh,v 1.4 2008/04/25 18:15:08 nanard Exp $
--IPTABLES=iptables
-+IPTABLES=/sbin/iptables
- 
- #change this parameters :
- EXTIF=eth0
-@@ -16,5 +16,5 @@ $IPTABLES -t nat -A PREROUTING -i $EXTIF
- #adding the MINIUPNPD chain for filter
- $IPTABLES -t filter -N MINIUPNPD
- #adding the rule to MINIUPNPD
--$IPTABLES -t filter -A FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
-+$IPTABLES -t filter -A FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
- 
-diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.sh
---- old/netfilter/iptables_removeall.sh	2009-04-19 20:17:14.000000000 +0000
-+++ new/netfilter/iptables_removeall.sh	2009-04-19 20:18:27.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # $Id: iptables_removeall.sh,v 1.4 2008/04/25 18:15:09 nanard Exp $
--IPTABLES=iptables
-+IPTABLES=/sbin/iptables
- 
- #change this parameters :
- EXTIF=eth0
-@@ -16,6 +16,6 @@ $IPTABLES -t nat -X MINIUPNPD
- #removing the MINIUPNPD chain for filter
- $IPTABLES -t filter -F MINIUPNPD
- #adding the rule to MINIUPNPD
--$IPTABLES -t filter -D FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
-+$IPTABLES -t filter -D FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
- $IPTABLES -t filter -X MINIUPNPD
- 
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff b/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff
deleted file mode 100644
index ad89e01ec459..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- netfilter/iptcrdr.c   4 Jun 2011 08:57:41 -0000       1.43

-+++ netfilter/iptcrdr.c   20 Jun 2011 14:03:24 -0000      1.44

-@@ -43,6 +43,11 @@

- #define IPTC_HANDLE            iptc_handle_t

- #endif

- 

-+/* IPT_ALIGN was renamed XT_ALIGN in iptables-1.4.11 */

-+#ifndef IPT_ALIGN

-+#define IPT_ALIGN XT_ALIGN

-+#endif

-+

- #include "iptcrdr.h"

- #include "../upnpglobalvars.h"

- 

diff --git a/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff b/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff
deleted file mode 100644
index 677043bdc37b..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- netfilter/iptcrdr.c.old	2010-02-24 14:22:23.000000000 +0100
-+++ netfilter/iptcrdr.c	2010-02-24 14:48:00.000000000 +0100
-@@ -20,6 +20,13 @@
- 
- #if IPTABLES_143
- /* IPTABLES API version >= 1.4.3 */
-+
-+#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
-+#define __must_be_array(a) \
-+	BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0])))
-+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
-+#define LIST_POISON2  ((void *) 0x00200200 )
-+
- #include <net/netfilter/nf_nat.h>
- #define ip_nat_multi_range	nf_nat_multi_range
- #define ip_nat_range		nf_nat_range
diff --git a/net-misc/miniupnpd/miniupnpd-1.5.ebuild b/net-misc/miniupnpd/miniupnpd-1.5.ebuild
deleted file mode 100644
index 7c59d9d52fc4..000000000000
--- a/net-misc/miniupnpd/miniupnpd-1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.5.ebuild,v 1.2 2011/07/02 09:33:02 gurligebis Exp $
-
-EAPI=2
-inherit eutils linux-info toolchain-funcs
-
-MY_PV=1.5
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-firewall/iptables-1.4.6
-	sys-apps/lsb-release
-	>=sys-kernel/linux-headers-2.6.31"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux
-	"
-
-src_prepare() {
-	mv Makefile.linux Makefile
-	epatch "${FILESDIR}/${PN}-1.3-iptables_path.diff"
-	epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
-	epatch "${FILESDIR}/${PN}-1.5-iptcrdr.diff"
-	epatch "${FILESDIR}/${PN}-1.5-iptables_buildfix.diff"
-	sed -i \
-		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I${KERNEL_DIR}/include -D#" \
-		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
-		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
-		-e 's/genuuid||//' \
-		Makefile || die
-	sed -i \
-		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
-		netfilter/iptcrdr.c || die
-	emake config.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	einstall PREFIX="${D}" STRIP="true" || die "einstall failed"
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}