Skip to contentSkip to conversation

package/libupnp18: needs host-pkgconf

PATCH New Jörg Krause 3 participants 6 messages May 9, 2019 – Jun 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libupnp18: needs host-pkgconf

Otherwise build fails with:

```
configure.ac:630: error: possibly undefined macro: AC_MSG_ERROR
      If this token and others are legitimate, please use m4_pattern_allow.
```
---
 package/libupnp18/libupnp18.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libupnp18/libupnp18.mk +2 -1
index 5154be5316..35e8dc4a47 100644
@@ -11,12 +11,13 @@ LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
 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
-LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
+LIBUPNP18_DEPENDENCIES += openssl
 else
 LIBUPNP18_CONF_OPTS += --disable-open-ssl
 endif
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 package/libupnp18: add upstream patch to fix runtime crash with musl

Applications build with a musl 1.1.20+ toolchain and linked with libupnpp will crash at runtime with Illegal instruction as musl is more strict with trying to detach an already detached thread resulting in undefined behaviour.

Upstream status:
https://github.com/mrjimenez/pupnp/issues/102

Backported from:
https://github.com/mrjimenez/pupnp/commit/04b454f693d0c71336252380d08f1d02967e133e

---
 ...tach-detached-thread-the-result-is-u.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch
package/libupnp18/0002-Do-not-try-to-detach-detached-thread-the-result-is-u.patch new file +39 -0
new file mode 100644
index 0000000000..601ea89be7
@@ -0,0 +1,39 @@
+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
+
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/2 package/libupnp18: add upstream patch to fix runtime crash with musl

Quoted 8 lines · On Thu, 9 May 2019 13:04:38 +0200 J?rg Krause <[email protected]>…

Applications build with a musl 1.1.20+ toolchain and linked with libupnpp will crash at runtime with Illegal instruction as musl is more strict with trying to detach an already detached thread resulting in undefined behaviour.

Upstream status:
https://github.com/mrjimenez/pupnp/issues/102

Quoted 8 lines

Backported from:
https://github.com/mrjimenez/pupnp/commit/04b454f693d0c71336252380d08f1d02967e133e

---
 ...tach-detached-thread-the-result-is-u.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create 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
#3 lore raw

PATCH 2/2 package/libupnp18: add upstream patch to fix runtime crash with musl

In reply to Jörg Krause
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

Applications build with a musl 1.1.20+ toolchain and linked with libupnpp will crash at runtime with Illegal instruction as musl is more strict with trying to detach an already detached thread resulting in undefined behaviour.

Quoted 7 lines

Upstream status:
https://github.com/mrjimenez/pupnp/issues/102

Backported from:
https://github.com/mrjimenez/pupnp/commit/04b454f693d0c71336252380d08f1d02967e133e

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 package/libupnp18: needs host-pkgconf

In reply to Jörg Krause
Quoted 7 lines · On Thu, 9 May 2019 13:04:37 +0200 J?rg Krause <[email protected]>…

Otherwise build fails with:

```
configure.ac:630: error: possibly undefined macro: AC_MSG_ERROR
      If this token and others are legitimate, please use m4_pattern_allow.
```

You forgot to add a reference to the autobuilder failure that this commit fixes, so I've added it and applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/2 package/libupnp18: needs host-pkgconf

In reply to Jörg Krause
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

Otherwise build fails with:

```
configure.ac:630: error: possibly undefined macro: AC_MSG_ERROR
      If this token and others are legitimate, please use m4_pattern_allow.
```

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard