Bumping to 1.6_pre20110623

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

3 files changed, 67 insertions, 4 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index e704974680b2..a684e2daefd9 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2011/01/21 16:09:48 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.17 2011/06/30 20:02:17 gurligebis Exp $
+
+*miniupnpd-1.6_pre20110623 (30 Jun 2011)
+
+  30 Jun 2011; <gurligebis@gentoo.org> +miniupnpd-1.6_pre20110623.ebuild,
+  files/miniupnpd-init.d:
+  Bumping to 1.6_pre20110623, fixing bugs #373511 and #373371 and
+  compilation issues with iptables.
 
 *miniupnpd-1.5 (21 Jan 2011)
 
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d b/net-misc/miniupnpd/files/miniupnpd-init.d
index ea08fc9c0fcb..86c61846981b 100644
--- a/net-misc/miniupnpd/files/miniupnpd-init.d
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.1 2010/02/28 19:36:06 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.2 2011/06/30 20:02:18 gurligebis Exp $
 
 depend() {
 	need net iptables
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting miniupnpd"
 	/etc/miniupnpd/iptables_init.sh
-	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --startas /usr/sbin/miniupnpd -- ${ARGS}
+	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --exec /usr/sbin/miniupnpd -- ${ARGS}
 	eend $?
 }
 
diff --git a/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild b/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild
new file mode 100644
index 000000000000..af15c44eac73
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.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.6_pre20110623.ebuild,v 1.1 2011/06/30 20:02:17 gurligebis Exp $
+
+EAPI=2
+inherit eutils linux-info toolchain-funcs
+
+MY_PV=1.5.20110623
+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-Makefile_fix.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"
+}