diff options
author | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-12-28 14:58:45 +0000 |
---|---|---|
committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-12-28 14:58:45 +0000 |
commit | 2901d674a18090762446ab09ce7e10d1e1f6cc8e (patch) | |
tree | b1861ff959424a1545c8860727b1f2edd8d13d2f /net-misc/miniupnpd | |
parent | Remove overshadowed versions. Bump latest to eapi4. Remove libtool archive. P... (diff) | |
download | historical-2901d674a18090762446ab09ce7e10d1e1f6cc8e.tar.gz historical-2901d674a18090762446ab09ce7e10d1e1f6cc8e.tar.bz2 historical-2901d674a18090762446ab09ce7e10d1e1f6cc8e.zip |
Bumping to 1.7_pre20111118 and adding support for new ifconfig output format.
Package-Manager: portage-2.2.0_alpha83/cvs/Linux i686
Diffstat (limited to 'net-misc/miniupnpd')
-rw-r--r-- | net-misc/miniupnpd/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/miniupnpd/Manifest | 11 | ||||
-rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-nettools_newoutput.patch | 36 | ||||
-rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.7_pre20111118.ebuild | 56 |
4 files changed, 106 insertions, 5 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/Manifest b/net-misc/miniupnpd/Manifest index 6f56e409203d..d574460af47a 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -4,15 +4,18 @@ Hash: SHA1 AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7e6781bb SHA1 c0d9538e2c47421e9688b4f2d6a51941fe800999 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5 AUX miniupnpd-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3 AUX miniupnpd-init.d 629 RMD160 0016f17563068c16d3a762dfcc3a151a7b911ec4 SHA1 6ab26ea633ab3d6d8d403f6b1c60b6c8f5e307ac SHA256 2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643 +AUX miniupnpd-nettools_newoutput.patch 1804 RMD160 fb8156f5fa0447cc5132f8f56c04f2713eacd5fd SHA1 46bd4610b66efe8122519d2ab7161a632ac5b3e3 SHA256 4b4e3ccc22b5af4f89b7267dec7573da69b71db2317b5e62c5ec830691a97be5 AUX miniupnpd-nf_nat-fix.diff 1784 RMD160 3d7a420653a76f4adab6307e3f775ef673a4f930 SHA1 51ecbe42771a258b4436b16f05c16cfcd537d864 SHA256 370eefe9a81e3dc17e1a41adbcb085bd496f1a41d929bcfd26638b7b2e3fb96c +DIST miniupnpd-1.6.20111118.tar.gz 125683 RMD160 18c00f718f7fc3a784e599c049046648c262183f SHA1 091cd4a729257e8085ab930b580453e16d94fb2d SHA256 73495d9a51268b0aea2cd61b6d9abc59f8532baa858bc26419849e01ac1f0c8b DIST miniupnpd-1.6.tar.gz 124917 RMD160 11ef50d02983d19e7d6eaa07eea5eb77f76cce04 SHA1 d8469ba820487fcbf5260556ec2974dd9db69f40 SHA256 a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585 EBUILD miniupnpd-1.6.ebuild 1510 RMD160 bee61271d7abaa94abd9577f4c3c21f3138ac1ce SHA1 63eab69df78efea9c21477f4f215b9bd2adc5220 SHA256 1779e26b4138b1e30b62dfb167f27a2e66fe0fae0d8a6014b2356d6fa73eb021 -MISC ChangeLog 5343 RMD160 602b78fc233b5fff5557c338b4061be6e583ca3f SHA1 26722d14e77310d063ac30a2c0fb9e307e81ec29 SHA256 6e02db78add9723ad7251c6cf1b8ea46f988df4188d91f136bbb6fe759f6bce9 +EBUILD miniupnpd-1.7_pre20111118.ebuild 1490 RMD160 e9522f05e98bd8b6449f2038097034bbdff1f599 SHA1 030b9242eb6fc964e42d5fcd3f7258c9576f3eb9 SHA256 172e8ba039a56ba017f535f8e495f41ac82a4c6cb732800a9b1609ac3b63f357 +MISC ChangeLog 5585 RMD160 d92f6572b195cf4b33f4e2b83ece4fc44f20af1d SHA1 03d9cc4e01d0f611d31f23ea0ba367478834f54b SHA256 cf023bbdb952694c068bce502864d988d99676a2557cd53b25e3828fed79110b MISC metadata.xml 380 RMD160 216ad6e31a386ad173222d81fd8996300dac7be6 SHA1 b8cbf8d00a419cdf74b782f3ae3968f8f9abf637 SHA256 cbfddfa590d65e994e3e3c45bdfa0f4d94cb2b446f5cd8815ed93cd1d7fcf727 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6cGYAACgkQsR7PQhRXYEnfHwCdF9eFXPkocNI14cNqxZL6Pl/7 -yY4AnRFW4jPu8Fx8krDy3JCzl6vLPQWe -=Ov8d +iEYEARECAAYFAk77LpgACgkQsR7PQhRXYEnMiwCdFHaRowU5oFrEH/aqhIUqQc/n +GBYAn2j+VxCYGfoMys6LjHOANZCh7C+8 +=D6xl -----END PGP SIGNATURE----- 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" +} |