Bumping to 1.7_pre20111118 and adding support for new ifconfig output format.

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

3 files changed, 99 insertions, 1 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 147c210b6adf..a291a62a3c39 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2011/10/17 12:03:01 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.22 2011/12/28 14:58:45 gurligebis Exp $
+
+*miniupnpd-1.7_pre20111118 (28 Dec 2011)
+
+  28 Dec 2011; <gurligebis@gentoo.org> +miniupnpd-1.7_pre20111118.ebuild,
+  +files/miniupnpd-nettools_newoutput.patch:
+  Bumping to 1.7_pre20111118 and adding support for new ifconfig output format.
 
   17 Oct 2011; <gurligebis@gentoo.org> files/miniupnpd-init.d:
   Adding use minissdpd to depend section in init.d script, fixing bug #387337.
diff --git a/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch b/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch
new file mode 100644
index 000000000000..42e7f167a42d
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch
@@ -0,0 +1,36 @@
+diff -aurp netfilter/iptables_init_and_clean.sh netfilter/iptables_init_and_clean.sh
+--- netfilter/iptables_init_and_clean.sh	2011-12-28 14:48:58.207334111 +0000
++++ netfilter/iptables_init_and_clean.sh	2011-12-28 14:50:31.982327230 +0000
+@@ -5,7 +5,7 @@
+ 
+ EXTIF=eth0
+ IPTABLES=/sbin/iptables
+-EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
++EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet ' | awk '{print $2}' | sed -e 's/.*://'`"
+ NDIRTY="`LC_ALL=C /sbin/iptables -t nat -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`"
+ FDIRTY="`LC_ALL=C /sbin/iptables -t filter -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`"
+ echo "External IP = $EXTIP"
+diff -aurp netfilter/iptables_init.sh netfilter/iptables_init.sh
+--- netfilter/iptables_init.sh	2011-12-28 14:48:58.207334111 +0000
++++ netfilter/iptables_init.sh	2011-12-28 14:50:41.214329654 +0000
+@@ -4,7 +4,7 @@ IPTABLES=/sbin/iptables
+ 
+ #change this parameters :
+ EXTIF=eth0
+-EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
++EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet ' | awk '{print $2}' | sed -e 's/.*://'`"
+ echo "External IP = $EXTIP"
+ 
+ #adding the MINIUPNPD chain for nat
+diff -aurp netfilter/iptables_removeall.sh netfilter/iptables_removeall.sh
+--- netfilter/iptables_removeall.sh	2011-12-28 14:48:58.207334111 +0000
++++ netfilter/iptables_removeall.sh	2011-12-28 14:50:47.822327499 +0000
+@@ -4,7 +4,7 @@ IPTABLES=/sbin/iptables
+ 
+ #change this parameters :
+ EXTIF=eth0
+-EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
++EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet ' | awk '{print $2}' | sed -e 's/.*://'`"
+ 
+ #removing the MINIUPNPD chain for nat
+ $IPTABLES -t nat -F MINIUPNPD
diff --git a/net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild b/net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild
new file mode 100644
index 000000000000..f32fd050bc9d
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild
@@ -0,0 +1,56 @@
+# 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.7_pre20111118.ebuild,v 1.1 2011/12/28 14:58:45 gurligebis Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+MY_PV=1.6.20111118
+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}-nettools_newoutput.patch"
+	sed -i \
+		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/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"
+}