package/libupnp18: bump to version 1.8.5
PATCH 1/1 package/libupnp18: bump to version 1.8.5
Drop patches included in new version. No need for autoreconf anymore.
--- ...-configure.ac-fix-build-with-openssl.patch | 51 ------------------- ...tach-detached-thread-the-result-is-u.patch | 39 -------------- package/libupnp18/libupnp18.hash | 6 +-- package/libupnp18/libupnp18.mk | 4 +- 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch delete mode 100644 package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch deleted +0 -51
@@ -1,51 +0,0 @@ -From c70d326f3ae88aa2dca903fb17a1f18d3b45a2ca Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Fri, 8 Feb 2019 16:45:32 +0100 -Subject: [PATCH] configure.ac: fix build with openssl - -- Add a call to PKG_CHECK_MODULES to get openssl libraries and its - dependencies if openssl support is enabled -- Add OPENSSL_LIBS to libupnp.pc.in so that applications linking with - pupnp (such as mpd) will be able to retrieve openssl libraries - -Fixes: - - http://autobuild.buildroot.org/results/a4148e516070b79816769f3443fc24d6d8192073 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/mrjimenez/pupnp/pull/105] ---- - configure.ac | 5 +++++ - libupnp.pc.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 670d363..190b30c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -722,6 +722,11 @@ AC_COMPILE_IFELSE( - AC_MSG_ERROR([pthread_rwlock_t not available])])]) - echo "-------------------------------------------------------------------------------" - -+if test "x$enable_open_ssl" = xyes ; then -+ PKG_CHECK_MODULES(OPENSSL, libssl, -+ [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], -+ [AC_MSG_ERROR([openssl not found])]) -+fi - - AC_CONFIG_FILES([ - Makefile -diff --git a/libupnp.pc.in b/libupnp.pc.in -index bd2d7b3..54cba90 100644 ---- a/libupnp.pc.in -+++ b/libupnp.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libupnp - Description: Linux SDK for UPnP Devices - Version: @VERSION@ --Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml -+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml @OPENSSL_LIBS@ - Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp - --- -2.14.1 -
package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 04b454f693d0c71336252380d08f1d02967e133e Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes <[email protected]> -Date: Sun, 27 Jan 2019 10:44:17 +0100 -Subject: [PATCH] Do not try to detach detached thread, the result is - undefined. Fixes issue #102 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes runtime crash with musl 1.1.20+. The problem is that libupnp is -calling pthread_detach() on a thread which was created in the detached state. - -Backported from: 04b454f693d0c71336252380d08f1d02967e133e - -(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170) -Signed-off-by: J?rg Krause <[email protected]> ---- - upnp/src/threadutil/ThreadPool.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c -index d272907..5e590ed 100644 ---- a/upnp/src/threadutil/ThreadPool.c -+++ b/upnp/src/threadutil/ThreadPool.c -@@ -651,11 +651,6 @@ static int CreateWorker( - rc = ithread_create(&temp, &attr, WorkerThread, tp); - ithread_attr_destroy(&attr); - if (rc == 0) { -- rc = ithread_detach(temp); -- /* ithread_detach will return EINVAL if thread has been -- successfully detached by ithread_create */ -- if (rc == EINVAL) -- rc = 0; - tp->pendingWorkerThreadStart = 1; - /* wait until the new worker thread starts */ - while (tp->pendingWorkerThreadStart) { --- -2.21.0 -
package/libupnp18/libupnp18.hash +3 -3
@@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.4/libupnp-1.8.4.tar.bz2.sha1 -sha1 93e7b3c94cf53eb59533b4b7b137ef5cc651e28b libupnp-1.8.4.tar.bz2 +# From https://sourceforge.net/projects/pupnp/files/pupnp/libupnp-1.8.5/libupnp-1.8.5.tar.bz2.sha1 +sha1 4d687f8f7d6279fddc4c6faff7f5e3513e765d8a libupnp-1.8.5.tar.bz2 # Locally computed: -sha256 188d3f786d92fe14191f17634d2d87847eee7d2b568a5257ea23262fec9973d6 libupnp-1.8.4.tar.bz2 +sha256 55c4c30543b4cdaff3ed3a1c72bf118173369e9009eeed0bbd6e2ae62c6f0e93 libupnp-1.8.5.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING
package/libupnp18/libupnp18.mk +1 -3
@@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP18_VERSION = 1.8.4 +LIBUPNP18_VERSION = 1.8.5 LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2 LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libupnp-$(LIBUPNP18_VERSION) LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
@@ -12,8 +12,6 @@ LIBUPNP18_INSTALL_STAGING = YES LIBUPNP18_LICENSE = BSD-3-Clause LIBUPNP18_LICENSE_FILES = COPYING LIBUPNP18_DEPENDENCIES = host-pkgconf -# We're patching configure.ac -LIBUPNP18_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUPNP18_CONF_OPTS += --enable-open-ssl
Signature · 1 line
2.23.0
PATCH 1/1 package/libupnpp: bump to version 0.17.2
libupnpp 0.17.2 requires libupnp >= 1.8.5.
--- package/libupnpp/libupnpp.hash | 4 ++-- package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/libupnpp/libupnpp.hash +2 -2
@@ -1,5 +1,5 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.1.tar.gz.sha256 -sha256 90403b55583e932a9a04905a01bf452016a56aecbeade5c9e1454a5fbb6f01b0 libupnpp-0.17.1.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.2.tar.gz.sha256 +sha256 5abaaf353a1e9c3482d61ef2627b650285d59f27c1ee60d35b8951952261374f libupnpp-0.17.2.tar.gz # Hash for license file: sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING
package/libupnpp/libupnpp.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.17.1 +LIBUPNPP_VERSION = 0.17.2 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = LGPL-2.1+ LIBUPNPP_LICENSE_FILES = COPYING
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 1/1 package/libupnpp: bump to version 0.17.2
Quoted 7 lines · On Mon, 4 Nov 2019 15:01:51 +0100 J?rg Krause <[email protected]>…
libupnpp 0.17.2 requires libupnp >= 1.8.5.
Signed-off-by J?rg Krause <[email protected]>--- package/libupnpp/libupnpp.hash | 4 ++-- package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/1 package/libupnp18: bump to version 1.8.5
In reply to Jörg KrauseQuoted 11 lines · On Mon, 4 Nov 2019 15:01:50 +0100 J?rg Krause <[email protected]>…
Drop patches included in new version. No need for autoreconf anymore.
Signed-off-by J?rg Krause <[email protected]>--- ...-configure.ac-fix-build-with-openssl.patch | 51 ------------------- ...tach-detached-thread-the-result-is-u.patch | 39 -------------- package/libupnp18/libupnp18.hash | 6 +-- package/libupnp18/libupnp18.mk | 4 +- 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch delete mode 100644 package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libupnp18: bump to version 1.8.5
In reply to Jörg KrauseHello J?rg,
Quoted 11 lines · On Mon, 4 Nov 2019 15:01:50 +0100 J?rg Krause <[email protected]>…
Drop patches included in new version. No need for autoreconf anymore.
Signed-off-by J?rg Krause <[email protected]>--- ...-configure.ac-fix-build-with-openssl.patch | 51 ------------------- ...tach-detached-thread-the-result-is-u.patch | 39 -------------- package/libupnp18/libupnp18.hash | 6 +-- package/libupnp18/libupnp18.mk | 4 +- 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 package/libupnp18/0001-configure.ac-fix-build-with-openssl.patch delete mode 100644 package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
This version bump broke the build of the gerbera package:
http://autobuild.buildroot.net/?reason=gerbera%
Reverting libupnp18 to 1.8.4 fixes the gerbera build issue.
Could you have a look ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libupnp18: bump to version 1.8.5
Hi,
Quoted 21 lines · Thomas Petazzoni
Hello J?rg,
Quoted 14 lines · On Mon, 4 Nov 2019 15:01:50 +0100 J?rg Krause <[email protected]>…
Drop patches included in new version. No need for autoreconf anymore.
Signed-off-by J?rg Krause <[email protected]>--- ...-configure.ac-fix-build-with-openssl.patch | 51 ------------- ------ ...tach-detached-thread-the-result-is-u.patch | 39 -------------- package/libupnp18/libupnp18.hash | 6 +-- package/libupnp18/libupnp18.mk | 4 +- 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 package/libupnp18/0001-configure.ac-fix-build- with-openssl.patch delete mode 100644 package/libupnp18/0002-Do-not-try-to-detach-Quoted 1 line
detached-thread-the-result-is-u.patch
Quoted 7 lines
This version bump broke the build of the gerbera package:
http://autobuild.buildroot.net/?reason=gerbera%
Reverting libupnp18 to 1.8.4 fixes the gerbera build issue.
Could you have a look ?
The issue has been fixed upstream [1] and meanwhile Fabrice Fontaine submitted a patch [2].
[1] https://github.com/gerbera/gerbera/commit/1476d7a90673a870091044fcc0307f5bcaeb24be
[2] https://patchwork.ozlabs.org/patch/1196425/
J?rg