net: mosquitto: Fix libwebsockets detection

Patch suggested from upstream.  Bumping release and including the patch
directly until a point release is available.

Signed-off-by: Karl Palsson <karlp@remake.is>

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 9bab9b570f813fbda0dedc6b5a9180da18b7dfd2..f7b0a918c5a359c95f9bcab830c655c33a0170d2 100644 (file)
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
 PKG_VERSION:=1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 

diff --git a/net/mosquitto/patches/100-libwebsockets-fixes.patch b/net/mosquitto/patches/100-libwebsockets-fixes.patch
new file mode 100644 (file)
index 0000000..4d107b1
--- /dev/null
+++ b/net/mosquitto/patches/100-libwebsockets-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/src/websockets.c b/src/websockets.c
+index 95f8a81..cf2b5e7 100644
+--- a/src/websockets.c
++++ b/src/websockets.c
+@@ -72,7 +72,7 @@ struct libws_http_data {
+       FILE *fptr;
+ };
+ 
+-#ifndef HTTP_STATUS_NOT_FOUND
++#ifndef LWS_FEATURE_SERVE_HTTP_FILE_HAS_OTHER_HEADERS_ARG
+       /* This is libwebsockets 1.2.x or earlier, we have to degrade our capabilities.
+        * Once lws 1.3 is widely available this should be removed. */
+ #     define LWS_IS_OLD