net-libs/libupnp: Use Suse patch to fo compilation problem with latest gcc/glibc, #526562

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 204 insertions, 24 deletions

diff --git a/net-libs/libupnp/ChangeLog b/net-libs/libupnp/ChangeLog
index 86e2a07facf5..d640b249d444 100644
--- a/net-libs/libupnp/ChangeLog
+++ b/net-libs/libupnp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libupnp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.51 2014/03/23 12:18:17 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/ChangeLog,v 1.52 2014/11/11 21:13:55 jlec Exp $
+
+*libupnp-1.6.18-r1 (11 Nov 2014)
+
+  11 Nov 2014; Justin Lecher <jlec@gentoo.org> +libupnp-1.6.18-r1.ebuild,
+  +files/libupnp-1.6.18-suse.patch, metadata.xml:
+  Use Suse patch to fo compilation problem with latest gcc/glibc, #526562
 
   23 Mar 2014; Mikle Kolyada <zlogene@gentoo.org> -libupnp-1.6.17.ebuild:
   Drop insecure version
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 867bfb7e4577..093d958adc20 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX libupnp-1.6.18-suse.patch 3428 SHA256 e7ba59cee885d122dd7ef34781880fa0592b0d3fbf7da7656d7ab7f091a7fbb6 SHA512 87636106cae24b64737d3ba6ed8a02fab505a30028380448fa58f5fddcdd02361e169e20271ef271147da6089873aecf763d87a8ae9f7580d904c1e4d67cb844 WHIRLPOOL aa5bd504ac176a3f50f98b6e498563c17dca4a8baa22a846df1bae3b169d001084c04f6aafea6e24b69c02a26bbc434187804219074363f51667c8141a0e701f
 DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 b21bc676365622d3ace1b25292dab8d4d23f6e6a80ddc8f029b765d39797e934 SHA512 2ce9b637a7edf544ae272aea137f735b03761a7925da0578e0073cf6429389f7f2af6cb05f666a02faa839caba3e1798ad31657afd287626b88905a5c45f3cb4 WHIRLPOOL b575b517fb668c5e3af78dc1bc95c1a202404beb42966400b3b1313a1fe0e6cb8437ce392af6ad6de4ccc90715c8df7cc34bf3d0b3b828af4e14f1cc8a5e0eda
+EBUILD libupnp-1.6.18-r1.ebuild 1389 SHA256 254ad924540cd08456e55cd38f50ef4785b53f05d27133f21391fe9a2b696c29 SHA512 10c63c0eaeeb292f98c7652267b40f76edd909c294d961139ffae6e6bdfe322a76f15220532b31982d0188418e52b05aa790269d7715c83db7ca3bf20c3b33a6 WHIRLPOOL 9fe9ddc2a4d5d8037ed25084fd5d54d1ccad9df888a78355585e94e1b7cf8878a08d00ef561bada3bd34094839c90ad11e939e0995384233aae92d45348f0358
 EBUILD libupnp-1.6.18.ebuild 1443 SHA256 6adaee821b94f70751bd872be3ac0398596e455f3403c6ac7debff393e571509 SHA512 1d0f232aef49c43defe0adf3fa0532c24787eac42a622a7dfbcd2d72763cb8619f3a5e85e5cd019c9a8ee5e6890a0a365687b8e74de14ba852388926797aeb38 WHIRLPOOL a480cf0b687dda02919f39c5acbeeba16399b613b5fff389064364ff70b5d34e63e5ecf0e1af889234b778860c517ad50440f289a2f304e31c846d822af5b2f4
-MISC ChangeLog 8490 SHA256 b8bc1267e15f2c36babde55ca9856d18303f80e73ea8e6da56b516728ff9b1e0 SHA512 c890b64e476ce755438b42943f586118949f22108160070e47aff5450ac16d7f6d301c6daac4b2aaa7e332e31cd4a7f474fb7cef13406c8c7ffb23d14aaa8a7b WHIRLPOOL 099f8ebc9dc0b8776dfb17190afb363706e38bc85ec59b0c833b0e5b6a74e32ae57d6cc0536373703fabbac8a0de770fcaafa98fda056fbcabe49b2a392b9423
-MISC metadata.xml 368 SHA256 8be8b7c1c68e780a2fd0e1df428a6208d920081d390257a6ad3fa0d36f9d73e5 SHA512 8d6c2a2d32a4349792db1cd4ac472f6e7b6412b3e6da9047653866edb9a672fecbf8776d04113062324338931b408a79bcfa4024fda558f75fd9265c1455ec93 WHIRLPOOL 298b9a5aad04f9c86fb02fe77f8e3e0e1684a515d82db980a0f3ffa6058a83ad5c6f3d8cacf08e4f6ee0eb4d6476d504d94de9af0a05a759d972c6423479cae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iJwEAQEIAAYFAlMu0mIACgkQG9wOWsQutda02wP7B+Jf/dVDMK1KMwiZibRrcApc
-+yp/ZtRQGzXQgbM/+dlUMTZhZtwkzTr3eYCucIF7EUBDWQBIHrBYHLnxAYdSlfRA
-oaSlQK7+jY8LjETO8rZ5g1VR++yZsx467Di7x3c6Opxcemut7+y1FnMGRsTOpxOe
-cSiIRNVRubTYIBtB+3s=
-=Gf4N
------END PGP SIGNATURE-----
+MISC ChangeLog 8720 SHA256 de414dbc6dea51e67717c674e051bc3aab479d473861f38de4d2892ec30f4fd6 SHA512 1931249f4efa16a88716d53b053dcdcc43575f34c97da676660a7e1ab27f257e8c7ce9e74a1766203bbf94043ab3bff7e764c55b051a20be6b15edc9be6f37e7 WHIRLPOOL f5e0bae1ccc63336a1452811dff09808de5fd51978b098ab41cd3fefbd15c9a6fd1590bef5a0c046a6b1e367835d0160744862bff87a279fb9686b9256c3101c
+MISC metadata.xml 386 SHA256 0344f103da52b54161d48d24945e93958140c37be21fd49640f901f58098c318 SHA512 26fb506745919e63ce2b1fc3f49ba15c48720501a7fbb73cb80507c019027bc8af079626fbf4ff6a0d2cd3091cf7f682ee51ccbb4727eb068ee2e850388e920e WHIRLPOOL 1a40b2f786ef694121b806555757ac2616d88c8ecbccefb852d8e4be17cdd34df27511be6afd8cde9a7f69e04df8308fc7a7d640ae97af26893fa6a7123e3bdf
diff --git a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
new file mode 100644
index 000000000000..2e91990c0243
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
@@ -0,0 +1,132 @@
+--- configure.ac	2013-01-29 16:39:56.000000000 +0100
++++ configure.ac	2013-02-17 10:40:53.680021913 +0100
+@@ -7,9 +7,9 @@
+ # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+ #
+ 
+-AC_PREREQ(2.60)
++AC_PREREQ([2.60])
+ 
+-AC_INIT([libupnp], [1.6.18], [mroberto@users.sourceforge.net])
++AC_INIT([libupnp],[1.6.18],[mroberto@users.sourceforge.net])
+ dnl ############################################################################
+ dnl # *Independently* of the above libupnp package version, the libtool version
+ dnl # of the 3 libraries need to be updated whenever there is a change released:
+@@ -366,7 +366,6 @@
+ #    installed libraries.
+ #
+ AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
+-#AC_SYS_LARGEFILE_SENSITIVE
+ 
+ AC_REVISION([$Revision: 1.1 $])
+ 
+@@ -506,9 +505,12 @@
+ #
+ # Checks for programs
+ #
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++LT_INIT
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_EGREP
+@@ -532,9 +534,7 @@
+ 		#:
+ 		# Use -O0 in debug so that variables do not get optimized out
+ 		AX_CFLAGS_GCC_OPTION([-O0, -g])
+-	else
+-		# add optimise for size
+-		AX_CFLAGS_GCC_OPTION([-Os])
++
+ 	fi
+ 	;;
+ esac
+@@ -548,8 +548,7 @@
+ #
+ AC_TYPE_SIZE_T
+ AC_TYPE_OFF_T
+-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
+-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
++
+ 
+ 
+ #
+--- ixml/Makefile.am.orig
++++ ixml/Makefile.am
+@@ -7,7 +7,7 @@
+ 
+ SUBDIRS 		= doc
+ 
+-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS		= -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+ AM_CFLAGS		= 
+ 
+ LDADD			= libixml.la
+--- threadutil/Makefile.am.orig
++++ threadutil/Makefile.am
+@@ -4,7 +4,7 @@
+ # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+ #
+ 
+-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS		= -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+ 
+ if ENABLE_DEBUG
+     AM_CPPFLAGS		+= -DDEBUG -DSTATS
+--- upnp/src/api/UpnpString.c.orig
++++ upnp/src/api/UpnpString.c
+@@ -28,38 +28,6 @@
+ 	/* Other systems have strncasecmp */
+ #endif
+ 
+-#ifndef UPNP_USE_MSVCPP
+-	/* VC has strnlen which is already included but with (potentially) different linkage */
+-	/* strnlen() is a GNU extension. */
+-	#if HAVE_STRNLEN
+-		extern size_t strnlen(const char *s, size_t maxlen);
+-	#else /* HAVE_STRNLEN */
+-		static size_t strnlen(const char *s, size_t n)
+-		{
+-			const char *p = (const char *)memchr(s, 0, n);
+-			return p ? p - s : n;
+-		}
+-	#endif /* HAVE_STRNLEN */
+-#endif /* WIN32 */
+-
+-/* strndup() is a GNU extension. */
+-#if HAVE_STRNDUP && !defined(WIN32)
+-	extern char *strndup(__const char *__string, size_t __n);
+-#else /* HAVE_STRNDUP && !defined(WIN32) */
+-	static char *strndup(const char *__string, size_t __n)
+-	{
+-		size_t strsize = strnlen(__string, __n);
+-		char *newstr = (char *)malloc(strsize + 1);
+-		if (newstr == NULL)
+-			return NULL;
+-
+-		strncpy(newstr, __string, strsize);
+-		newstr[strsize] = 0;
+-
+-		return newstr;
+-	}
+-#endif /* HAVE_STRNDUP && !defined(WIN32) */
+-
+ /*!
+  * \brief Internal implementation of the class UpnpString.
+  *
+--- upnp/Makefile.am.orig
++++ upnp/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ SUBDIRS = doc . sample
+ 
+-AM_CPPFLAGS = \
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \
+ 	-I$(srcdir)/inc \
+ 	-I$(top_srcdir)/threadutil/inc \
+ 	-I$(top_srcdir)/ixml/inc
diff --git a/net-libs/libupnp/libupnp-1.6.18-r1.ebuild b/net-libs/libupnp/libupnp-1.6.18-r1.ebuild
new file mode 100644
index 000000000000..8361cbad1c08
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.18-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libupnp/libupnp-1.6.18-r1.ebuild,v 1.1 2014/11/11 21:13:55 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README ChangeLog"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-suse.patch
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use x86-fbsd &&	append-flags -O1
+	# w/o docdir to avoid sandbox violations
+	econf \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable static-libs static) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+	default
+	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use static-libs || prune_libtool_files
+}
+
+pkg_postinst() {
+	ewarn "Please remember to run revdep-rebuild when upgrading"
+	ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages"
+	ewarn "gets linked with the new library."
+	echo ""
+	ewarn "The revdep-rebuild script is part of the"
+	ewarn "app-portage/gentoolkit package."
+}
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 9551b35d4bd9..39f3775ddfe6 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>maq@maqibooy.com</email>
-  <name>Marcus Stjärnås</name>
-</maintainer>
-<maintainer>
-  <email>gurligebis@gentoo.org</email>
-  <name>Bjarke Istrup Pedersen</name>
-</maintainer>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>maq@maqibooy.com</email>
+    <name>Marcus Stjärnås</name>
+  </maintainer>
+  <maintainer>
+    <email>gurligebis@gentoo.org</email>
+    <name>Bjarke Istrup Pedersen</name>
+  </maintainer>
 </pkgmetadata>