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
commit2bfc03a465cca05cbfb69e351832eba095a6e0cb (patch)
tree25a77ea56980938b10de0fa39d6509d1554a14f9 /net-misc
parentfix breakage due to recent changes in git.eclass... (diff)
downloadhistorical-2bfc03a465cca05cbfb69e351832eba095a6e0cb.tar.gz
historical-2bfc03a465cca05cbfb69e351832eba095a6e0cb.tar.bz2
historical-2bfc03a465cca05cbfb69e351832eba095a6e0cb.zip
Bumping to 20090214
Package-Manager: portage-2.2_rc29/cvs/Linux i686
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/miniupnpd/ChangeLog15
-rw-r--r--net-misc/miniupnpd/Manifest15
-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
8 files changed, 37 insertions, 11 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/Manifest b/net-misc/miniupnpd/Manifest
index 566ccc72ac5c..823f3f26860e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,8 +1,9 @@
-AUX miniupnpd-20090129-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
-AUX miniupnpd-20090129-init.d 626 RMD160 d54f7df3594ced64e3912468eb0e20a5e8f16936 SHA1 c037f8aad5ff523235a5cfe9180469d2453ff261 SHA256 b314a2a7c7e80f5c53bc5c16a221ecb77181f97e4cbe4b1cd20efca00b07f15a
-AUX miniupnpd-20090129-iptables.diff 757 RMD160 7921a9782b4f8bb98060661b3a4c13f2186ba6ba SHA1 342d1493e9385659b9950d30f4df52d5a3f9e080 SHA256 14f474f20265ca2d38da57d54401cfac0e088a51e8885fe17705d49ea8eef99d
-AUX miniupnpd-20090129-iptables_path.diff 1684 RMD160 0da2623469bbc17e97a39c1c00966870155cdfe5 SHA1 615dbab6a03ab93dbc1a37dc95ae82ffe9cca931 SHA256 3ac1d754c858f638ad6f36448c525a182ae8d1e336bf6f7fff3bab01844f59e9
-DIST miniupnpd-20090129.tar.gz 82487 RMD160 d75525035f281e4b2ee55af2c8569bd86b9df510 SHA1 d309b6a23207f104677f027d09054084ffeb8840 SHA256 3f1f9ccb13a5e8c7311aa37289282b96d7c053679e28c8e27c2d98d6439cb1af
-EBUILD miniupnpd-20090129.ebuild 1085 RMD160 c74de3bd41fdce1031f44f86b50a44e644e96aba SHA1 57cdbe65d58add12a4a9fe96851bd05a5a8f8a9a SHA256 17a055fbc77c777b90a451d51d063f7a9a5de324476d7ce2ba4c89077510c4fc
-MISC ChangeLog 1269 RMD160 b677435b222cdc2fbf9dc06013aadc04d64ec726 SHA1 3066bf04e746929f2edcd8d6e45ce2b430bb8f3f SHA256 b17dd5d37edb850b1ea3bdfaa343c5f2d4049f3ac85a89099c0be441619b078c
+AUX miniupnpd-20090214-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
+AUX miniupnpd-20090214-init.d 626 RMD160 5ef339c5847953da917429dbb9109b7caa50f5e1 SHA1 acf22a603d5cc34aaeb5b9d2c12fdb28ae46b027 SHA256 81d7c1c13cdc5e83a9f9b628e3ce7e42e0ea6ce43df5f8b56ca3e534ffa4205e
+AUX miniupnpd-20090214-iptables.diff 757 RMD160 7921a9782b4f8bb98060661b3a4c13f2186ba6ba SHA1 342d1493e9385659b9950d30f4df52d5a3f9e080 SHA256 14f474f20265ca2d38da57d54401cfac0e088a51e8885fe17705d49ea8eef99d
+AUX miniupnpd-20090214-iptables_compile.diff 313 RMD160 c5ebf80db28460afe7bb06ec96b12ba96c1670bd SHA1 d54f4eb632c984f1df1ec48d9e494e79199cbafc SHA256 87b986d7a802b306bd07e38f3ded799846c59446d1a690e6cc00505130b637ea
+AUX miniupnpd-20090214-iptables_path.diff 1684 RMD160 0da2623469bbc17e97a39c1c00966870155cdfe5 SHA1 615dbab6a03ab93dbc1a37dc95ae82ffe9cca931 SHA256 3ac1d754c858f638ad6f36448c525a182ae8d1e336bf6f7fff3bab01844f59e9
+DIST miniupnpd-20090214.tar.gz 82921 RMD160 61fc48b32d8d842cc526231f102a5f8e30677191 SHA1 7006b1bc7e0df4493536369fb5a5c01a1c9669a1 SHA256 347c057d61226673df9811126830d4f279cbad3bd9efce1875ef4a561356a56f
+EBUILD miniupnpd-20090214.ebuild 1131 RMD160 54956b35aa13f9ab1d703bcba32d8f0ce34e85a2 SHA1 6159fbaeff5497c2231531b9648576d839f479f2 SHA256 4f7228c513f846c12042af0a1a771669e0a52a206c93ee38e351e91b74ab1e2a
+MISC ChangeLog 1820 RMD160 50ce91db5ecb3f53959b955161978e4337830cd5 SHA1 7bb60a10af461fafe8cbd491d711a54ea70a57c2 SHA256 c5e0994ee88e4915eb6aa944a79b24cd03c9e377c13224837a988b01cc6be140
MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
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