Removing old version and unused patches.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux i686

6 files changed, 10 insertions, 158 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/Manifest b/net-misc/miniupnpd/Manifest
index d192403c190b..63b4e5cec425 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -2,22 +2,17 @@
 Hash: SHA1
 
 AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7e6781bb SHA1 c0d9538e2c47421e9688b4f2d6a51941fe800999 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5
-AUX miniupnpd-1.3-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
-AUX miniupnpd-1.5-iptables_buildfix.diff 385 RMD160 71a8be15991cac43747142c15f2a05ae4a40532e SHA1 68c3cf38b74c04aaeee3e53ae98a97d235dbcddd SHA256 e45364117dd5b6cc64935bc0398678941df9e7ea63f520ce4709c2fbc01415b2
-AUX miniupnpd-1.5-iptcrdr.diff 618 RMD160 a6df16d7d31c6bb8f7e75b5f5fd4480258808a6f SHA1 182efbd7ef4a1c27c055b7c7673aa4a159f70361 SHA256 a307065ba8bb76127939083e169f1d209a3db6549a99e7abe46611805b48713c
 AUX miniupnpd-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
 AUX miniupnpd-init.d 614 RMD160 28bcb84f9488659df5c895d51cdfc6d0e3d22c4f SHA1 89deee2ac9b6eb40844b39eb4aec56cf0c34865f SHA256 5632ffcc31a149d6bf117d9b33fbeb478c2ff30e5878e9752bf3a42befa9c1c5
 AUX miniupnpd-nf_nat-fix.diff 1784 RMD160 3d7a420653a76f4adab6307e3f775ef673a4f930 SHA1 51ecbe42771a258b4436b16f05c16cfcd537d864 SHA256 370eefe9a81e3dc17e1a41adbcb085bd496f1a41d929bcfd26638b7b2e3fb96c
-DIST miniupnpd-1.5.tar.gz 98993 RMD160 22813f9b8d31e4d4906b7dbfd516889dbc70f270 SHA1 6762b69ab9d0bb9158318b436957227cb4dbb2a9 SHA256 402db10f46d23ffcafbb655ad7333daf1271fb115f92aa293e22cc974fa8da30
 DIST miniupnpd-1.6.tar.gz 124917 RMD160 11ef50d02983d19e7d6eaa07eea5eb77f76cce04 SHA1 d8469ba820487fcbf5260556ec2974dd9db69f40 SHA256 a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
-EBUILD miniupnpd-1.5.ebuild 1637 RMD160 9dfb28c79955d05617a7a2403ea4ee8d7e8e712e SHA1 78b81086fbb61daf58f518014eb95e5f7a4520b2 SHA256 be2157ced08eff767467d013a08bf0a4b02b6ee6c8b8a90d3960c232588cc971
 EBUILD miniupnpd-1.6.ebuild 1510 RMD160 bee61271d7abaa94abd9577f4c3c21f3138ac1ce SHA1 63eab69df78efea9c21477f4f215b9bd2adc5220 SHA256 1779e26b4138b1e30b62dfb167f27a2e66fe0fae0d8a6014b2356d6fa73eb021
-MISC ChangeLog 4969 RMD160 9a78dea42e671dda029162b4f8605b7a00d49409 SHA1 26d1a32eae114f7d0508be4a48767ad3f3de778c SHA256 99e1f988a20f0b956dda18fcce9752d705d0ecdaa3b7143751cae36eed603d80
+MISC ChangeLog 5200 RMD160 a6c3f09e88bf932c7685cb02b754f13be296754a SHA1 7972cc8bdbf1c4213dd1a79056faa95a4c25cae7 SHA256 f806338d054fa60421862663068f0d9a80b13c3236d0775dfc5ee95cf17b8651
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4zC8AACgkQsR7PQhRXYEkWLQCfReKVTl6T/5MpjOFF3KcYiFqR
-rG0An0LBjXvlVO/qrcvpLyF4k4IxwnHm
-=n2K3
+iEYEARECAAYFAk40ZeUACgkQsR7PQhRXYElNPwCeJLYxp0PTdjC/oHLDxk2pqdo9
+ug8An2dzewmzXqavgpzACcN5rhwyrHm2
+=+P+j
 -----END PGP SIGNATURE-----
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"
-}