summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2009-04-16 17:33:31 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2009-04-16 17:33:31 +0000
commit14f2c6e7d8cb60b4c8c34c9cd3ed982fa2c38672 (patch)
tree31624f8e2c55c59df874fc4139683c649e6c50a0 /net-misc/miniupnpd
parentfix breakage due to recent changes in git.eclass... (diff)
downloadgentoo-2-14f2c6e7d8cb60b4c8c34c9cd3ed982fa2c38672.tar.gz
gentoo-2-14f2c6e7d8cb60b4c8c34c9cd3ed982fa2c38672.tar.bz2
gentoo-2-14f2c6e7d8cb60b4c8c34c9cd3ed982fa2c38672.zip
Bumping to 20090214
(Portage version: 2.2_rc29/cvs/Linux i686)
Diffstat (limited to 'net-misc/miniupnpd')
-rw-r--r--net-misc/miniupnpd/ChangeLog15
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-20090214-conf.d (renamed from net-misc/miniupnpd/files/miniupnpd-20090129-conf.d)0
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-20090214-init.d (renamed from net-misc/miniupnpd/files/miniupnpd-20090129-init.d)2
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff (renamed from net-misc/miniupnpd/files/miniupnpd-20090129-iptables.diff)0
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff11
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff (renamed from net-misc/miniupnpd/files/miniupnpd-20090129-iptables_path.diff)0
-rw-r--r--net-misc/miniupnpd/miniupnpd-20090214.ebuild (renamed from net-misc/miniupnpd/miniupnpd-20090129.ebuild)5
7 files changed, 29 insertions, 4 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index b8f17dd99052..34e3b808aafa 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,19 @@
# ChangeLog for net-misc/miniupnpd
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.4 2009/01/30 00:05:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.5 2009/04/16 17:33:31 gurligebis Exp $
+
+*miniupnpd-20090214 (16 Apr 2009)
+
+ 16 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+ -files/miniupnpd-20090129-conf.d, -files/miniupnpd-20090129-init.d,
+ -files/miniupnpd-20090129-iptables.diff,
+ -files/miniupnpd-20090129-iptables_path.diff,
+ +files/miniupnpd-20090214-conf.d, +files/miniupnpd-20090214-init.d,
+ +files/miniupnpd-20090214-iptables.diff,
+ +files/miniupnpd-20090214-iptables_compile.diff,
+ +files/miniupnpd-20090214-iptables_path.diff, -miniupnpd-20090129.ebuild,
+ +miniupnpd-20090214.ebuild:
+ Bumping to 20090214
*miniupnpd-20090129 (30 Jan 2009)
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090129-conf.d b/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d
index 8482ef2d185b..8482ef2d185b 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090129-conf.d
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090129-init.d b/net-misc/miniupnpd/files/miniupnpd-20090214-init.d
index 22036d75adb3..128d8348563e 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090129-init.d
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090129-init.d,v 1.1 2009/01/30 00:05:17 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-init.d,v 1.1 2009/04/16 17:33:30 gurligebis Exp $
depend() {
need net iptables
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090129-iptables.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff
index 25067c8a7667..25067c8a7667 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090129-iptables.diff
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff
new file mode 100644
index 000000000000..043f585629b4
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff
@@ -0,0 +1,11 @@
+--- netfilter/iptcrdr.c.old 2009-04-16 17:09:17.000000000 +0000
++++ netfilter/iptcrdr.c 2009-04-16 17:09:35.000000000 +0000
+@@ -30,6 +30,8 @@
+ #include "iptcrdr.h"
+ #include "../upnpglobalvars.h"
+
++typedef struct iptc_handle *iptc_handle_t;
++
+ /* dummy init and shutdown functions */
+ int init_redirect(void)
+ {
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090129-iptables_path.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
index 2b7042d78989..2b7042d78989 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090129-iptables_path.diff
+++ b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
diff --git a/net-misc/miniupnpd/miniupnpd-20090129.ebuild b/net-misc/miniupnpd/miniupnpd-20090214.ebuild
index ae0fe36a551e..263ee9c825bf 100644
--- a/net-misc/miniupnpd/miniupnpd-20090129.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-20090214.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-20090129.ebuild,v 1.1 2009/01/30 00:05:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-20090214.ebuild,v 1.1 2009/04/16 17:33:31 gurligebis Exp $
EAPI="2"
@@ -15,7 +15,7 @@ KEYWORDS="~x86"
SLOT="0"
IUSE=""
-DEPEND=">=net-firewall/iptables-1.4.2-r1
+DEPEND=">=net-firewall/iptables-1.4.3
sys-apps/lsb-release"
RDEPEND="${DEPEND}"
@@ -23,6 +23,7 @@ src_prepare() {
mv Makefile.linux Makefile
epatch "${FILESDIR}/${P}-iptables.diff"
epatch "${FILESDIR}/${P}-iptables_path.diff"
+ epatch "${FILESDIR}/${P}-iptables_compile.diff"
sed -i -e "s#^CFLAGS = #CFLAGS = -I${KV_OUT_DIR}/include #" Makefile
# we don't use netfilter/Makefile
gmake config.h