Add net-libs/libupnp-1.6.21, update net-libs/libupnp-1.6.20, net-libs/libupnp-1.8.0

6 files changed, 235 insertions, 26 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 9b6f3bb2..bfd6cf52 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,7 +1,12 @@
 AUX CVE-2016-6255.patch 2300 SHA256 8b4300d0c1bc19b19d7f4c4ac6c5bf493b636d51b9d85f17483d0c6d5c37bb09 SHA512 4e415875a4c843b64d92baf9530994829639939db7be710a6ba27ec02651c8faf86a2f9af80105d0895f2eb420a48c8d4ce31ad38d39ab02a10e095905870c42 WHIRLPOOL a09b8b494b03151feca9bda97d06796232461aa0b431ffaac2f4bf72d12dd83bbc68a5d724a4495125c63e3089139dad303a99b6af93e770f5eab3acd3b513e9
 AUX libupnp-1.6.19-docs-install.patch 387 SHA256 1b7ee5e36e2d53ef0d02b0d703c90f5a8e322d1f1dad6cb36dba4885fd0c2df3 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c WHIRLPOOL dbebe934973aef59038945d2120d98b12c3aed4c2df8ad198ae04ebd0280a2e33b7319cfaf1e6a025ef661a5373ca5b90c0b1033345b956d20fb0efdacb4b043
 AUX libupnp-1.6.20-suse.patch 3297 SHA256 a0c85f95f94b792987f7c3162c37872f93f60943aadaa9ccdd6846118c40125a SHA512 7bb64e08a393c1d16b01bcef83ee72ac665bd7ee4290cf618e3d4f2d83514b12364eb58f0df2c4d4913738b17ff542ee1c4020a2542fc6564092fe8569fd6001 WHIRLPOOL e688ed64798bededfdad9b7539d5b0333a9e3c40adee837d100ae5d7bf6e6b5ffc2c73d12207679e6266d16e8bd5e41cccd102f9bcd4c5ec9510b3a98ad2ab98
+AUX libupnp-1.6.21-suse.patch 4209 SHA256 ce5d46aae09efdfd15b1f3615738502d6e55ca6e2248b40c7372630daead5add SHA512 c9d72ec14ef5baae8fe4f984a58759013e7c6dd44b53e024e7ef467a4d99bc66576a5582e15b3304294501e9166cf8102df7bc880388f49c61e5d5b936b03089 WHIRLPOOL 5011ef17767b00b85dbcf42801111a6d49b3782ca17f5c5095bc1b03f58d0b38cf48dc4043183ea6fc70d269ba021785c53724912571520536e9d141ef59757f
+AUX libupnp-1.8.0-docs-install.patch 403 SHA256 b0c6504e3bdc24f8df4cfbab24f37c759f319759fafce24e5f84b69833cb0bec SHA512 a1157f13933f0cb61a3c256f6a57ee0e415e36f48cf2fabb9c4ae060d91c4a8f6a9f2ed31f5b36a0dbecb3d46b0a051275a597fb8069f43a79d6da6a8207f486 WHIRLPOOL c297905bd9627715567f32e2e8bd220515e51e0d2b3cf755f79d52bdfe495cbda632c786bc5389012c41e26f94961b5f598e5fe6ed9bf65c5141f1bff3750a95
 AUX libupnp-1.8.0-suse.patch 3827 SHA256 23415f5886e9a72a05d01c4c4d1eb0c236d4a31e4bb6fd9f9bafea926d5aa862 SHA512 683b5eba9ae1db301b236a20e6e9671d4dedf528f989e36ff6cdeef698c797d5a354c83ee17c4a3c557e6abe8a39d5b72edc433754bdfb7c15fb1c84634b14e2 WHIRLPOOL 004d6e78326f42d6392529170e193e61e944791c7396246a968ae838b47c69883f6ca8ba698a5bd17b090539f56d921db0ebc709f4ba6a0c8f38e27353751dd2
 DIST libupnp-1.6.20.tar.bz2 1243637 SHA256 ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 SHA512 754a3f587963078fc60e8a58f6b04536dac03d053c8cd14d4fd7e505a3417484fa03b72dd09ef92150f00263f270aa19646b7aab1b8707111aff53c43f8a120a WHIRLPOOL df2702b30a9e895371ba0647bfdd017fd17b4478feb691efaf754618fa032cb8ba72317030960676584da44dfc144f8b9bd07218799b40c2afa7fdee28e8b164
-EBUILD libupnp-1.6.20.ebuild 1387 SHA256 56a6bdf189c62b3178f87f72d071cdbe8189e76043fad897ce95e480a399d4e8 SHA512 9e94508d5bb83ffd6b88748e9c10432e65a47bc172fbe781807ae00ba3635770e114b8c516dcd674425641d5240b23356f818b9828ceb0385d00508fcbd9a448 WHIRLPOOL 8aadaf905c23ab860a58522292e62bf47a814a68dbdc48a40f077ec5638afcbc77bb89631a95cd409bb4aa781279841519fb1547c7e16fbe4f884032390fa7a3
-EBUILD libupnp-1.8.0.ebuild 1808 SHA256 e30652e36f7116a6ae71e62a10f52ac0c49f1641b163e9b0c1adad45751e018c SHA512 0bdb64f5aa7dcfec9b83504a89bad8243d12ce8ea2d6ee343ba91a5904452364b3faa21160fe88ebbaa96c3b9a63b89a85ed3aee7b68619b3cf8424e312b639d WHIRLPOOL d89f87ae122f36dff6b48ee1c9115d1ba488845888321165ed804d1e62853659120f215f235bcd3908881a36336c34daea0112eeb871b3cf78752de17fce0bea
+DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb WHIRLPOOL b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
+DIST libupnp-1.8.0.tar.gz 1380524 SHA256 1ddfb4e12e947deb5637e0d5e09bbe7835dfc8fb8a57712346026afa029165b1 SHA512 e2ae54352d747191f3ffc15c50481da515665fb35ddf6a9e488b6e1962e47803937bf078d0c2c5d56f8339cfd226ffba7433975363dc312e484ed22f83eda061 WHIRLPOOL c3d4abf54d25e87a1d650a18c475097a47633e8bf7691248695a7682ecff8aca4419c8eb2db4d24d62ca5a7905321971adf924166c20876ee18dd32d846748a1
+EBUILD libupnp-1.6.20.ebuild 1386 SHA256 da64eb3d8281541ee808762544914f70447d6eb96c0c86caf3c301df59158749 SHA512 518a01603c1c9ec8165bd8799f8eb71ed5b33493b02b69d6006c4590d4bb3a52926fa165e749da9bed16c44a94e7f0d347c33a5462da605e81d800a7aa37843d WHIRLPOOL 5fe6c068ee79d20909ecd088fc9e8da0c4b55717dc83b80b2488bb703a763dd49f2d003926dd9e76c9508d402fa8384db831aeab6a1b5ee340dbb97af2b6180e
+EBUILD libupnp-1.6.21.ebuild 1337 SHA256 a2f384bbfb7204f159780a37949078a954311fde245098649d3b7e3314e1492c SHA512 80f73d3531309acb6a95887edeb4436cb3ce586acca95cae27cdd70af064218a156c11d4181ea5e2ec5ae48d0c7178ac950ec9983d0017f45ff600a010c2cca4 WHIRLPOOL 8df503044fafe0381ae0a56a7a46ebf06a696a8f2748e5be7daccde85611169cada374d2d340944829b44cdd1c46e2e1d49ed63bf512eca67fb4e89d626f798a
+EBUILD libupnp-1.8.0.ebuild 1435 SHA256 b20baf908d1c02467ca83046d346e094874669dccb40bfa882649a282cd84d77 SHA512 bd82653c60ae2f09fc4b437ea62a7033f5e2b080a3e18ca09e63f26fd460b6f7fe4ef344dd3c846788eccd825ef3906201513ad277abb36aebfd4707777afe07 WHIRLPOOL fc146405f410053fb5485dc14da0183251f3425233c564036dfea9eeca6c8e945bd5360ef5b593d9d49a68b3e670c65e0e19c3df054fc8156cb45f96fb6c97a8
diff --git a/net-libs/libupnp/files/libupnp-1.6.21-suse.patch b/net-libs/libupnp/files/libupnp-1.6.21-suse.patch
new file mode 100644
index 00000000..430287ad
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.21-suse.patch
@@ -0,0 +1,145 @@
+--- ./upnp/Makefile.am.dist	2017-01-06 19:04:31.732760995 +0000
++++ ./upnp/Makefile.am	2017-01-06 19:05:03.355627257 +0000
+@@ -7,6 +7,7 @@
+ SUBDIRS = doc . sample
+ 
+ AM_CPPFLAGS = \
++	-include $(top_builddir)/autoconfig.h \
+ 	-I$(srcdir)/inc \
+ 	-I$(top_srcdir)/threadutil/inc \
+ 	-I$(top_srcdir)/ixml/inc
+--- ./upnp/src/api/UpnpString.c.dist	2017-01-06 19:06:13.714588048 +0000
++++ ./upnp/src/api/UpnpString.c	2017-01-06 19:07:08.680442863 +0000
+@@ -28,34 +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
+-		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)
+-	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.
+  *
+--- ./configure.ac.dist	2017-01-06 19:07:58.046380391 +0000
++++ ./configure.ac	2017-01-06 19:10:07.787797432 +0000
+@@ -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.21], [mroberto@users.sourceforge.net])
++AC_INIT([libupnp],[1.6.21],[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:
+@@ -400,7 +400,6 @@ AC_CANONICAL_HOST
+ #    installed libraries.
+ #
+ AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
+-#AC_SYS_LARGEFILE_SENSITIVE
+ 
+ AC_REVISION([$Revision: 1.11 $])
+ 
+@@ -549,10 +548,12 @@ AC_MSG_RESULT($docdir)
+ #
+ # Checks for programs
+ #
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AM_PROG_CC_C_O
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_EGREP
+@@ -576,9 +577,6 @@ freebsd*)
+ 		#:
+ 		# 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
+@@ -592,8 +590,6 @@ echo "----------------------------------
+ #
+ 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.dist	2017-01-06 19:10:27.834168012 +0000
++++ ./ixml/Makefile.am	2017-01-06 19:12:07.566028297 +0000
+@@ -7,8 +7,9 @@
+ 
+ SUBDIRS 		= doc
+ 
+-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+-                          -I$(top_srcdir)/upnp/inc
++AM_CPPFLAGS		= -include $(top_builddir)/autoconfig.h \
++			  -I$(srcdir)/inc -I$(srcdir)/src/inc \
++			  -I$(top_srcdir)/upnp/inc
+ AM_CFLAGS		= 
+ 
+ LDADD			= libixml.la
+@@ -43,10 +44,10 @@ upnpinclude_HEADERS	= \
+ 			inc/ixml.h \
+ 			inc/ixmldebug.h
+ 
+-check_PROGRAMS          = test_document
+-TESTS                   = test/test_document.sh
++check_PROGRAMS		= test_document
++TESTS			= test/test_document.sh
+ 
+-test_document_SOURCES 	= test/test_document.c
++test_document_SOURCES	= test/test_document.c
+ 
+ EXTRA_DIST		= test/test_document.sh test/testdata
+ 
+--- ./threadutil/Makefile.am.dist	2017-01-06 19:12:36.538933697 +0000
++++ ./threadutil/Makefile.am	2017-01-06 19:13:06.571823445 +0000
+@@ -4,8 +4,9 @@
+ # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+ #
+ 
+-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+-                          -I$(top_srcdir)/upnp/inc
++AM_CPPFLAGS		= -include $(top_builddir)/autoconfig.h \
++			  -I$(srcdir)/inc -I$(srcdir)/src/inc \
++			  -I$(top_srcdir)/upnp/inc
+ 
+ if ENABLE_DEBUG
+     AM_CPPFLAGS		+= -DDEBUG -DSTATS
diff --git a/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
new file mode 100644
index 00000000..f0fbd04f
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.8.0-docs-install.patch
@@ -0,0 +1,13 @@
+--- libupnp-1.6.19/upnp/sample/Makefile.am.orig	2013-11-15 19:50:02.000000000 +0400
++++ libupnp-1.6.19/upnp/sample/Makefile.am	2016-06-03 20:30:43.545081667 +0300
+@@ -65,8 +65,8 @@
+ if WITH_DOCUMENTATION
+ examplesdir = $(docdir)/examples
+ examples_DATA = \
+-	$(tv_ctrlpt_1_8_SOURCES) \
+-	$(tv_device_1_8_SOURCES)
++	$(sort $(tv_ctrlpt_1_8_SOURCES) \
++	$(tv_device_1_8_SOURCES) )
+ endif
+ 
+ EXTRA_DIST = \
diff --git a/net-libs/libupnp/libupnp-1.6.20.ebuild b/net-libs/libupnp/libupnp-1.6.20.ebuild
index 2f9efa9f..03083e00 100644
--- a/net-libs/libupnp/libupnp-1.6.20.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 638a6e8ba4aa4e1658c0cde59f339b1d869efd8b $
+# $Id: da45421e6c247a9840fdbeb1f944c21f7ada992f $
 
 EAPI=6
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="alpha ~amd64 arm ~hppa ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="+client debug doc examples ipv6 static-libs +tools +server +webserver"
 REQUIRED_USE="!server? ( !webserver )"
 
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
new file mode 100644
index 00000000..2124c01e
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: c48aedc7739d9a6960e025e43ec0746591d5d3d5 $
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A 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="+client debug doc examples ipv6 static-libs +tools +server +webserver"
+REQUIRED_USE="!server? ( !webserver )"
+
+DOCS="NEWS README ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+	"${FILESDIR}"/${P}-suse.patch
+)
+
+src_prepare() {
+	default
+
+	# 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 client) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable server device) \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable webserver) \
+		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+	default
+	use client && use server && use examples && dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libupnp/libupnp-1.8.0.ebuild b/net-libs/libupnp/libupnp-1.8.0.ebuild
index 2e578abe..c98258d6 100644
--- a/net-libs/libupnp/libupnp-1.8.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.0.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: c589c65c4df22e0d30c1427bd0f658d2eafe0a19 $
+# $Id: abee901f84419b90736449f28412c6a3bd43733d $
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils flag-o-matic git-r3
+inherit autotools eutils flag-o-matic vcs-snapshot
 
-DESCRIPTION="A Portable Open Source UPnP Development Kit, forked in 2008 from upstream libupnp-1.6.6, with mjg59's POST-write fix"
-# Fork was commit 7206e80127e4669e2e63534a7de4a84fbfe0babb
+DESCRIPTION="A Portable Open Source UPnP Development Kit" # forked in 2008 from upstream libupnp-1.6.6
 HOMEPAGE="http://pupnp.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/mjg59/pupnp-code.git"
-EGIT_COMMIT="be0a01bdb83395d9f3a5ea09c1308a4f1a972cbd"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="1.8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="+client debug doc examples ipv6 static-libs +tools +server +webserver"
 REQUIRED_USE="!server? ( !webserver )"
 
-DOCS="NEWS README ChangeLog"
+DOCS="NEWS README.md ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-suse.patch
+	"${FILESDIR}"/${P}-docs-install.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-suse.patch \
-		"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+	default
 
 	# fix tests
 	chmod +x ixml/test/test_document.sh || die
@@ -46,15 +48,6 @@ src_configure() {
 
 src_install () {
 	default
-	use client && use server && use examples && dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+	use client && use server && use examples && dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}-1.8
 	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.8.x , so packages"
-	ewarn "are linked with the new library."
-	echo ""
-	ewarn "The revdep-rebuild script is part of the"
-	ewarn "app-portage/gentoolkit package."
-}