gentoo resync : 08.10.2021

6 files changed, 120 insertions, 21 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index d88334d194e5..8b00eca562f8 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,7 @@
+AUX libupnp-1.14.12-disable-network-tests.patch 416 BLAKE2B d1fea0b8e0abba960cd5296839977559bcc8081285f17de4a19e0d48557735bdee687f8d069976b3e97e5f0d5dde46063f1c8d83cd4df071bef439633d33b59c SHA512 e59e7695bad657b3e67efc3478f76ae2617732b22bbc7ea07b904260f0a73d7a57db83deedc58959f4335aba2c66c6bd0bf819051a7c4c8e412694883466d61b
+AUX libupnp-1.14.7-glibc-2.34.patch 1409 BLAKE2B 2734fcbcfb4414469cf80eb9846d5574ecd436cb2b3a3b6344926d630c0850b108cf2e758a6e285a7a685587a05c46cdd958b2ef8f277732f272022309ce6445 SHA512 69e9ecd32f5510fead3eebab1343c01a05c7f7c8dbc66c4a09884805d4b51309f5111aaec6f44f2a169deb990d6df9155ae93aef1de5e9e23986c9023daa8b58
+DIST libupnp-1.14.12.tar.gz 788299 BLAKE2B 721c10f9fa4ffc60743b4ebf8be566ea595931cb1f2a2448d8e3cecfc787abfb855cb16256eaaa10ce6a901cd5e5b3d14672610841b2a718d5dd003ccfd3c2f0 SHA512 aab17aa12f15d110bfab20cbcbae5f54926b6ca7a30bce10b9287cd39919a06a5e9f1493405e1d561c0d58ba46926f87009df891e4e4f37097df1c3c67635ca9
 DIST libupnp-1.14.7.tar.gz 785084 BLAKE2B 539388737dda0dd037cb50fbc1cca8bcdc43d1d706bdb7da19d1a184cfd61f3d585d9beef2a9c8c33f2cb2640a8479210ad6c358abd7193f304509df574e912c SHA512 92dd80d1bbaa64e6d3909c5bce73d0340fcd3a3c1d247a634bd48ec077ba0ce0b8224d1a670a66f6a8c591e31a54f15526071d62ae5460e85d582d7b6b67c674
-EBUILD libupnp-1.14.7.ebuild 1109 BLAKE2B 7d451bcf4f71e4cbbb38c05c9159271fcf5104be6c56016e981004e025490980480d87ea3cb61a4d5c19899fcdfaf9f0b598643ec26035390797ee8d64cbae72 SHA512 e82840468c0d19d91122d7f0704e89072ee2b52a249b5737e6d29952f2c857f741c0cb195b4931dbcf57b5e44930cd48a934e02db2f0fbe188cde21c6ce4b05c
-MISC metadata.xml 697 BLAKE2B c0a79078387931bc8b6c03867ce4288db06f8bdf603ccf6a18755846b59347de715f2bedda6afe00167dc64153d82a1e6ee45f24ee009eaa78ebf8c6dbb76464 SHA512 cf77f66cd82314f8d1b00450d29fc0470359259ca748f2a404db4a9eae01bc4a7bca07b2713b68264d04bef92aac12a2cb20827e31dfc32d5845edf8fb64b8a7
+EBUILD libupnp-1.14.12-r1.ebuild 1118 BLAKE2B 25d08965916c376da7ab5db71847e3e2b56c3820c16c2ee2961b15e8ca86fe92f51ccb35b15f257437767aa023f08d620e38f5a974eb17e1d03852b67266457b SHA512 308a1c305a00da7e503c8a13876fa89a1986b2978285bd44443b8301d6e3796a7b2a7511baee5055f5413581a4d3247d05191720ea43823d9e570497f9eb7253
+EBUILD libupnp-1.14.7.ebuild 1147 BLAKE2B 5adda59b43d307387ceaebdb7b47c444d7a6b88d32871a3f020ad0f461665d0134602d1d5e7ac14cc0a8c7d2a4d2ad820b510765c9dea4e4261f96ab9cefeef0 SHA512 e62f7cea7a828a87a22aea7ce2003f71deb05aae3e49def0887f2d0052dfb57325f3d6c8da8ce329e8435780e8fe4a3e04a82cc9a36ee91e2ea4d2824033fbc5
+MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/files/libupnp-1.14.12-disable-network-tests.patch b/net-libs/libupnp/files/libupnp-1.14.12-disable-network-tests.patch
new file mode 100644
index 000000000000..4c602c02d8dc
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.14.12-disable-network-tests.patch
@@ -0,0 +1,15 @@
+--- a/upnp/Makefile.am
++++ b/upnp/Makefile.am
+@@ -203,10 +203,8 @@
+ 
+ 
+ # check / distcheck tests
+-check_PROGRAMS = test_init test_url test_log test_list
+-TESTS = test_init test_url test_log test_list
+-test_init_SOURCES = test/test_init.c
+-test_url_SOURCES = test/test_url.c
++check_PROGRAMS = test_log test_list
++TESTS = test_log test_list
+ test_log_SOURCES = test/test_log.c
+ test_list_SOURCES = test/test_list.c
+ 
diff --git a/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
new file mode 100644
index 000000000000..dbcfd5e2cc20
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.14.7-glibc-2.34.patch
@@ -0,0 +1,32 @@
+--- a/upnp/inc/ithread.h
++++ b/upnp/inc/ithread.h
+@@ -304,12 +304,8 @@
+  *      Returns EINVAL if the kind is not supported.
+  *      See man page for pthread_mutexattr_setkind_np
+  *****************************************************************************/
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+-	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+-#else
+-	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
+-#endif /* UPNP_USE_RWLOCK */
+-
++#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
++#define ithread_mutexattr_settype pthread_mutexattr_settype
+ /****************************************************************************
+  * Function: ithread_mutexattr_getkind_np
+  *
+@@ -329,12 +325,8 @@
+  *      Always returns 0.
+  *      See man page for pthread_mutexattr_getkind_np
+  *****************************************************************************/
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+-	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+-#else
+-	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
+-#endif /* UPNP_USE_RWLOCK */
+-
++#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
++#define ithread_mutexattr_gettype pthread_mutexattr_gettype
+ /****************************************************************************
+  * Function: ithread_mutex_init
+  *
diff --git a/net-libs/libupnp/libupnp-1.14.12-r1.ebuild b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
new file mode 100644
index 000000000000..5eac7976b3d5
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.14.12-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN="pupnp"
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="blocking-tcp debug doc +ipv6 +reuseaddr samples +ssl static-libs"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.12-disable-network-tests.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable blocking-tcp blocking-tcp-connections)
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable reuseaddr)
+		$(use_enable samples)
+		$(use_enable ssl open_ssl)
+		$(use_enable static-libs static)
+	)
+
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libupnp/libupnp-1.14.7.ebuild b/net-libs/libupnp/libupnp-1.14.7.ebuild
index 42645556aca7..4dcf90126cfd 100644
--- a/net-libs/libupnp/libupnp-1.14.7.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.7.ebuild
@@ -10,6 +10,7 @@ MY_PN="pupnp"
 DESCRIPTION="An Portable Open Source UPnP Development Kit"
 HOMEPAGE="http://pupnp.sourceforge.net/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -19,9 +20,7 @@ IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 # bug 733750
 RESTRICT="test"
 
-DOCS="ChangeLog"
-
-S="${WORKDIR}/${MY_PN}-release-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-1.14.7-glibc-2.34.patch" )
 
 src_prepare() {
 	default
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 236a9d8be5cd..ba0bdd2e5c82 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
-  <slots>
-    <subslots>Reflect ABI of libupnp.so.</subslots>
-  </slots>
-  <upstream>
-    <remote-id type="sourceforge">pupnp</remote-id>
-    <remote-id type="github">pupnp/pupnp</remote-id>
-  </upstream>
-  <use>
-    <flag name="reuseaddr">Allow clean restarts by binding the socket with SO_REUSEADDR</flag>
-    <flag name="blocking-tcp">Do not use async socket calls</flag>
-    <flag name="samples">Install sample applications</flag>
-  </use>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libupnp.so</subslots>
+	</slots>
+	<upstream>
+		<remote-id type="sourceforge">pupnp</remote-id>
+		<remote-id type="github">pupnp/pupnp</remote-id>
+	</upstream>
+	<use>
+		<flag name="blocking-tcp">Do not use async socket calls</flag>
+		<flag name="reuseaddr">Allow clean restarts by binding the socket with SO_REUSEADDR</flag>
+		<flag name="samples">Install sample applications</flag>
+	</use>
 </pkgmetadata>