Fix building because of missing #include(s) wrt #401107 by James Shaw

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 59 insertions, 22 deletions

diff --git a/net-misc/linux-igd/ChangeLog b/net-misc/linux-igd/ChangeLog
index 394b8c522f80..a6a63ede806f 100644
--- a/net-misc/linux-igd/ChangeLog
+++ b/net-misc/linux-igd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/linux-igd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/ChangeLog,v 1.29 2008/09/16 06:53:22 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/ChangeLog,v 1.30 2012/01/28 01:05:40 ssuominen Exp $
+
+  28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> linux-igd-1.0-r2.ebuild,
+  +files/linux-igd-1.0-include.patch:
+  Fix building because of missing #include(s) wrt #401107 by James Shaw
 
   16 Sep 2008; Mike Frysinger <vapier@gentoo.org> files/upnpd.initd-1.0-r2,
   +files/linux-igd-1.0-build.patch, -files/makefile-fix-1.0-r2.diff,
diff --git a/net-misc/linux-igd/Manifest b/net-misc/linux-igd/Manifest
index 4d9956f48cf9..65209a5d5328 100644
--- a/net-misc/linux-igd/Manifest
+++ b/net-misc/linux-igd/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX linux-igd-1.0-build.patch 2063 RMD160 bf2d2f5c4baa17e2767e7232a7ae8d91c0374e23 SHA1 38eaa0ba3bff08e2bb2c294e9fdf95804de668c2 SHA256 191d8218770840ade55501ad65c68fedc36d4dbc6d23dd041ce79c79f363b486
+AUX linux-igd-1.0-include.patch 665 RMD160 6dd484fc3eee425db019fb545076a8b360b70f56 SHA1 9098f19bac7d8d101b938a8cc88005fd611775e8 SHA256 9f4ac394403d8a1d8bb5f477626cefe83ade5ac24a53bf17da084b49a8e6f844
 AUX upnpd.confd-1.0-r2 267 RMD160 59139ed0a9dca59fa8275023d944c1ec95e68453 SHA1 a1021465b04d67ad022c23dc99d6f4d40dbd983b SHA256 41e13640638909ad58fc6ce623c0e8d5254431fb03617f6d65e301f73c13bd65
 AUX upnpd.initd-1.0-r2 924 RMD160 f3472bd65c94f3b6bced5d64548a190584f543d9 SHA1 aaa77449d4167b6c3157d32dc1482a8b34493183 SHA256 2dd8ba5a46bae9e1d68097b9995544ecd5ad0f0e02a47ac7849dc63f624ac099
 DIST linuxigd-1.0.tar.gz 35396 RMD160 b05fe11d99766119779839766e323cfb6ada6977 SHA1 0dd71fd7c5b8a3b0609164618314f4c110aff100 SHA256 f6335273fd6bfad7fb32e94e36461e8b74f9523e7994bad8be9fac29bee9f4cd
-EBUILD linux-igd-1.0-r2.ebuild 1099 RMD160 4755e4f690d75449cdb4ed4339062449b69dc668 SHA1 979cb21f6e2d15181c18c7689aad95ff8cde584c SHA256 b15136dada243bbce8a8d91a8796dc932244821762ef6af2b3f10d66f1d31960
-MISC ChangeLog 4060 RMD160 4244505d58ec6f957099f0bee2b97178aa959d45 SHA1 bd87bca23da7eaf7dd348abde68d2cde91c60496 SHA256 6095dc63df34d14170bf3922a8a04f30a21bcdf7e1f8f1ca6ff24cd15e07045b
+EBUILD linux-igd-1.0-r2.ebuild 1048 RMD160 8a9ad8658c466088553784df3a706ffda82faa96 SHA1 1a0b61ca47b6dc226be1efb09446b654cd9eef77 SHA256 b7b9aff8300308f9552ecb4813107bb3955057b6350048cfad9f2cec946b82b6
+MISC ChangeLog 4253 RMD160 e6dc5e765f6d29f685be109b07b65716c5ceb5c9 SHA1 e13168f15f673624751f054dc8f5f61cc688e3f4 SHA256 ba7420d443696c85114b6439594909368630783191187f8d737c771969f96f1a
 MISC metadata.xml 371 RMD160 745a713a0eb037304c07f4398543ba320271e166 SHA1 a0b5a02b66a92d6869af11437a7605d5410eedf2 SHA256 ee0901c67264ecd9c485d048be48cf8818eb923b002a8f7239508b5606d17034
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rRgACgkQfXuS5UK5QB2dogP/YH+11/P2taH29c8bMH2IACy/
-QQ8NYvY5ulhDsxu9GxUpFm/C07tJQ+Yx05moWcADKM7U3omPIcS1EROOa2MHNvsh
-XTjoUKXKL3ggo2qX+htln27kSqHOVF2o4k5SfOH0tgRx34sVG494pH2BDhfMXCMa
-vdHNp+7XIIVuugIIOuU=
-=jqyg
+iQEcBAEBAgAGBQJPI0lgAAoJEEdUh39IaPFNeMcH/jDuzj+2U/dQR4E7uCLKMD7A
+BKbQs5qGWtla9/GNh+1kwbmG34A47v9gHWm8oicnebqTeZoIjjZQrvkYJ3BySYc4
+4UjABOZlCGRRAE3tjL3TzcThTPLEwnVmQXTXqr3e1y8SDsOxqyFLYg6qg7v75X/U
+k1MdjkUPgREt7TtbHsSJQ+uTSEawrsnSnR2g4iB9hV3O1PUmDn5eYGmpNumSQUX1
+hEsZUNrOgbX+t23f33G57roELE1TtTg51MSCwhd2ywtSvwsSlcamYghtIukVQXB9
+aDnS75pdxhoG741ZBe0M0kBsasJYFGNTmhEoRCLavNmDYBgxnP5Cl2CFux8w2ow=
+=jBne
 -----END PGP SIGNATURE-----
diff --git a/net-misc/linux-igd/files/linux-igd-1.0-include.patch b/net-misc/linux-igd/files/linux-igd-1.0-include.patch
new file mode 100644
index 000000000000..31b43d7197c6
--- /dev/null
+++ b/net-misc/linux-igd/files/linux-igd-1.0-include.patch
@@ -0,0 +1,31 @@
+This is 07-fix-includes.patch from Debian and linux-igd-includes.patch from Fedora for bug 401107.
+
+--- gatedevice.c
++++ gatedevice.c
+@@ -1,4 +1,5 @@
+ #include <syslog.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <upnp/ixml.h>
+ #include <string.h>
+--- main.c
++++ main.c
+@@ -3,8 +3,8 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <signal.h>
++#include <string.h>
+ #include <sys/types.h>
+-#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
+ #include <time.h>
+--- pmlist.c
++++ pmlist.c
+@@ -1,4 +1,6 @@
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+ #include <upnp/upnp.h>
diff --git a/net-misc/linux-igd/linux-igd-1.0-r2.ebuild b/net-misc/linux-igd/linux-igd-1.0-r2.ebuild
index 98d7b6634181..365207401d2b 100644
--- a/net-misc/linux-igd/linux-igd-1.0-r2.ebuild
+++ b/net-misc/linux-igd/linux-igd-1.0-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 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/linux-igd/linux-igd-1.0-r2.ebuild,v 1.7 2008/09/16 06:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/linux-igd-1.0-r2.ebuild,v 1.8 2012/01/28 01:05:40 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Deamon that emulates Microsoft's Internet Connection Sharing (ICS) for UPnP-aware clients"
 HOMEPAGE="http://linux-igd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-igd/linuxigd-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN/-}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,21 +18,19 @@ DEPEND=">=net-libs/libupnp-1.4.1"
 RDEPEND="${DEPEND}
 	net-firewall/iptables"
 
-S=${WORKDIR}/linuxigd-${PV}
+S=${WORKDIR}/${PN/-}-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{build,include}.patch
 }
 
 src_compile() {
 	tc-export CC
-	emake || die "compile failed"
+	emake
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install
 
 	newinitd "${FILESDIR}"/upnpd.initd-${PVR} upnpd
 	newconfd "${FILESDIR}"/upnpd.confd-${PVR} upnpd
@@ -40,6 +39,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Make sure your firewall allows routing of packages"
-	einfo "to 239.0.0.0/255.0.0.0 correctly."
+	elog "Make sure your firewall allows routing of packages to:"
+	elog " 239.0.0.0/255.0.0.0"
 }