diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-02-12 11:59:19 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-02-12 11:59:19 +0000 |
| commit | 06d887abeec3064d0734939fe14c8916dca71f97 (patch) | |
| tree | 1fb83b88c06c07f17b6c7cc20b7efa40d0d11103 /net-misc | |
| parent | Add locale patches, bug 302633 (diff) | |
| download | gentoo-2-06d887abeec3064d0734939fe14c8916dca71f97.tar.gz gentoo-2-06d887abeec3064d0734939fe14c8916dca71f97.tar.bz2 gentoo-2-06d887abeec3064d0734939fe14c8916dca71f97.zip | |
Bumping to 1.7_pre20120207
(Portage version: 2.2.0_alpha85/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/miniupnpd/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch | 36 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.7_pre20120207.ebuild (renamed from net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild) | 7 |
3 files changed, 11 insertions, 42 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog index a291a62a3c39..cc8983e97e18 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.22 2011/12/28 14:58:45 gurligebis Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.23 2012/02/12 11:59:19 gurligebis Exp $ + +*miniupnpd-1.7_pre20120207 (12 Feb 2012) + + 12 Feb 2012; <gurligebis@gentoo.org> -miniupnpd-1.7_pre20111118.ebuild, + +miniupnpd-1.7_pre20120207.ebuild, -files/miniupnpd-nettools_newoutput.patch: + Bumping to 1.7_pre20120207 *miniupnpd-1.7_pre20111118 (28 Dec 2011) diff --git a/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch b/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch deleted file mode 100644 index 42e7f167a42d..000000000000 --- a/net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch +++ /dev/null @@ -1,36 +0,0 @@ -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_pre20120207.ebuild index f32fd050bc9d..48e5557da641 100644 --- a/net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild +++ b/net-misc/miniupnpd/miniupnpd-1.7_pre20120207.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.7_pre20120207.ebuild,v 1.1 2012/02/12 11:59:19 gurligebis Exp $ EAPI=2 inherit eutils toolchain-funcs -MY_PV=1.6.20111118 +MY_PV=1.6.20120207 S="${WORKDIR}/${PN}-${MY_PV}" DESCRIPTION="MiniUPnP IGD Daemon" @@ -26,7 +26,6 @@ DEPEND="${RDEPEND} 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' \ |