Skip to contentSkip to conversation

libwebsockets: bump to version 2.1.1

PATCH New Kurt Van Dijck 3 participants 9 messages Mar 5, 2017 – Mar 7, 2017

lore
Share & tools
lore

Kurt Van Dijck

author
#0 lore raw

PATCH 1/1 libwebsockets: bump to version 2.1.1

Mosquitto combined with version 2.1.0 of libwebsockets yields a failing system. Version 2.1.1 restores the websocket interface again.

Signed-off-by Kurt Van Dijck <[email protected]>

--

package/libwebsockets/libwebsockets.hash +1 -1
index cbd1101..df7221e 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66  libwebsockets-v2.1.0.tar.gz
+sha256	96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d  libwebsockets-v2.1.1.tar.gz
package/libwebsockets/libwebsockets.mk +1 -1
index bf46291..983ffce 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBWEBSOCKETS_VERSION = v2.1.0
+LIBWEBSOCKETS_VERSION = v2.1.1
 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION))
 LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
 LIBWEBSOCKETS_LICENSE_FILES = LICENSE
Applied
#1 lore raw

PATCH 1/1 libwebsockets: bump to version 2.1.1

Hello,

Quoted 4 lines · Kurt Van Dijck

Mosquitto combined with version 2.1.0 of libwebsockets yields a failing system. Version 2.1.1 restores the websocket interface again.

Signed-off-by Kurt Van Dijck <[email protected]>

Applied to master, thanks!

Peter: even though this is a version bump, it seems like this one would be needed on the LTS branch, since it apparently fixes a runtime issue with Mosquitto.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 libwebsockets: bump to version 2.1.1

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 3 lines · Kurt Van Dijck

Mosquitto combined with version 2.1.0 of libwebsockets yields a failing system. Version 2.1.1 restores the websocket interface again.

Quoted 7 lines
Quoted 1 line
Signed-off-by Kurt Van Dijck <[email protected]>

Applied to master, thanks!

Peter: even though this is a version bump, it seems like this one would be needed on the LTS branch, since it apparently fixes a runtime issue with Mosquitto.

Committed to 2017.02.x, thanks.

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

PATCH 1/1 libwebsockets: bump to version 2.1.1

In reply to Kurt Van Dijck

Hello,

Quoted 4 lines · Kurt Van Dijck

Mosquitto combined with version 2.1.0 of libwebsockets yields a failing system. Version 2.1.1 restores the websocket interface again.

Signed-off-by Kurt Van Dijck <[email protected]>

This update causes a build failure:

/home/test/autobuild/run/instance-2/output/build/libwebsockets-v2.1.1/lib/libwebsockets.c: In function 'lws_get_addresses':
/home/test/autobuild/run/instance-2/output/build/libwebsockets-v2.1.1/lib/libwebsockets.c:645:4: error: too many arguments for format [-Werror=format-extra-args]

    lwsl_err("inet_ntop", strerror(LWS_ERRNO));
    ^

cc1: all warnings being treated as errors

See http://autobuild.buildroot.net/results/bf0/bf04ea2c63562443dbe62934cd55f9f771fb3b3c/build-end.log

Could you have a look ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#4 lore raw

PATCH 1/1 libwebsockets: Fix build for 2.1.1

This patch repairs the build for libwebsockets 2.1.1

Signed-off-by Kurt Van Dijck <[email protected]>

--

package/libwebsockets/lws211-lib-libwebsockets-format.patch new file +11 -0
new file mode 100644
index 0000000..a563048
@@ -0,0 +1,11 @@
+--- a/lib/libwebsockets.c	2017-03-06 11:37:03.699943521 +0100
++++ b/lib/libwebsockets.c	2017-03-05 07:04:12.989997774 +0100
+@@ -642,7 +642,7 @@
+ #ifdef LWS_USE_IPV6
+ 	if (LWS_IPV6_ENABLED(vh)) {
+ 		if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6 *)ads)->sin6_addr, rip, rip_len)) {
+-			lwsl_err("inet_ntop", strerror(LWS_ERRNO));
++			lwsl_err("inet_ntop %s", strerror(LWS_ERRNO));
+ 			return -1;
+ 		}
+
#5 lore raw

PATCH 1/1 libwebsockets: Fix build for 2.1.1

Hello,

Quoted 3 lines · Kurt Van Dijck

This patch repairs the build for libwebsockets 2.1.1

Signed-off-by Kurt Van Dijck <[email protected]>

Thanks for this patch.

package/libwebsockets/lws211-lib-libwebsockets-format.patch

Quoted 6 lines

--

package/libwebsockets/lws211-lib-libwebsockets-format.patch new file +0 -0
new file mode 100644
index 0000000..a563048

However, we require all patches to have a description + Signed-off-by line. Could you add one?

But in fact, this issue has already been fixed upstream, by commit
https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.

So you could instead do:

LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.patch

(and add an entry in the .hash file) ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#6 lore raw

PATCH 1/1 libwebsockets: cherry-pick upstream patch for v2.1.1

This commit cherry-picks an upstream patch that fixes a compile error that was introduced in v2.1.1

Signed-off-by Kurt Van Dijck <[email protected]>
package/libwebsockets/libwebsockets.hash +1 -0
index df7221e..7976a69 100644
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d  libwebsockets-v2.1.1.tar.gz
+sha256	49ae9f959394686d469f960951ece3ad1101655afe64df28ea5b1a61c1d124f0  f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
package/libwebsockets/libwebsockets.mk +3 -0
index 983ffce..e2e6bb2 100644
@@ -12,6 +12,9 @@ LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
 
+# patch specific for v2.1.1
+LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
+
 # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled
 # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small
 # amount of pthread mutex code is built into the library.
#7 lore raw

PATCH 1/1 libwebsockets: cherry-pick upstream patch for v2.1.1

Hello,

Quoted 4 lines · Kurt Van Dijck

This commit cherry-picks an upstream patch that fixes a compile error that was introduced in v2.1.1

Signed-off-by Kurt Van Dijck <[email protected]>

Thanks, I've applied with a minor change, see below.

Quoted 1 line

+# patch specific for v2.1.1

This comment really isn't needed. A patch is always specific to a version. And the fact it comes from the upstream Git repository makes it extra clear that it most likely should be dropped the next time we bump this package.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#8 lore raw

PATCH 1/1 libwebsockets: cherry-pick upstream patch for v2.1.1

In reply to Kurt Van Dijck
Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Kurt" == Kurt Van Dijck <[email protected]> writes:

This commit cherry-picks an upstream patch that fixes a compile error that was introduced in v2.1.1

Signed-off-by Kurt Van Dijck <[email protected]>
package/libwebsockets/libwebsockets.hash +1 -0
index df7221e..7976a69 100644
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d  libwebsockets-v2.1.1.tar.gz
+sha256	49ae9f959394686d469f960951ece3ad1101655afe64df28ea5b1a61c1d124f0  f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
package/libwebsockets/libwebsockets.mk +0 -0
index 983ffce..e2e6bb2 100644

package/libwebsockets/libwebsockets.mk LIBWEBSOCKETS_DEPENDENCIES = zlib · line 17

Quoted 6 lines
package/libwebsockets/libwebsockets.mk +3 -0
@@ -12,6 +12,9 @@ LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
 
+# patch specific for v2.1.1
+LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
+

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard