|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: client/CMakeLists.txt
|
|
|
|
|
--- client/CMakeLists.txt.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ client/CMakeLists.txt 2018-08-31 21:34:14.841203000 +0200
|
|
|
|
|
--- client/CMakeLists.txt.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ client/CMakeLists.txt 2018-09-27 22:37:31.751136000 +0200
|
|
|
|
|
@@ -11,8 +11,8 @@
|
|
|
|
|
add_executable(mosquitto_pub pub_client.c ${shared_src})
|
|
|
|
|
add_executable(mosquitto_sub sub_client.c sub_client_output.c ${shared_src})
|
|
|
|
@ -15,9 +15,9 @@ Index: client/CMakeLists.txt
|
|
|
|
|
+install(TARGETS mosquitto_pub RUNTIME DESTINATION "${BINDIR}" ARCHIVE DESTINATION "${LIBDIR}")
|
|
|
|
|
+install(TARGETS mosquitto_sub RUNTIME DESTINATION "${BINDIR}" ARCHIVE DESTINATION "${LIBDIR}")
|
|
|
|
|
Index: config.mk
|
|
|
|
|
--- config.mk.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ config.mk 2018-08-31 21:34:14.841381000 +0200
|
|
|
|
|
@@ -263,7 +263,7 @@
|
|
|
|
|
--- config.mk.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ config.mk 2018-09-27 22:40:18.482755000 +0200
|
|
|
|
|
@@ -266,7 +266,7 @@
|
|
|
|
|
|
|
|
|
|
ifeq ($(WITH_WEBSOCKETS),yes)
|
|
|
|
|
BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS
|
|
|
|
@ -26,22 +26,25 @@ Index: config.mk
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(WITH_WEBSOCKETS),static)
|
|
|
|
|
@@ -272,9 +272,9 @@
|
|
|
|
|
@@ -275,11 +275,11 @@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
INSTALL?=install
|
|
|
|
|
-prefix=/usr/local
|
|
|
|
|
-mandir=${prefix}/share/man
|
|
|
|
|
-localedir=${prefix}/share/locale
|
|
|
|
|
+prefix=${PREFIX}
|
|
|
|
|
+mandir=${PREFIX}/man
|
|
|
|
|
+localedir=${PREFIX}/share/locale
|
|
|
|
|
-prefix?=/usr/local
|
|
|
|
|
+prefix?=${PREFIX}
|
|
|
|
|
incdir?=${prefix}/include
|
|
|
|
|
-libdir?=${prefix}/lib${LIB_SUFFIX}
|
|
|
|
|
-localedir?=${prefix}/share/locale
|
|
|
|
|
-mandir?=${prefix}/share/man
|
|
|
|
|
+libdir?=${prefix}/lib
|
|
|
|
|
+localedir?=${PREFIX}/share/locale
|
|
|
|
|
+mandir?=${PREFIX}/man
|
|
|
|
|
STRIP?=strip
|
|
|
|
|
|
|
|
|
|
ifeq ($(WITH_STRIP),yes)
|
|
|
|
|
Index: lib/CMakeLists.txt
|
|
|
|
|
--- lib/CMakeLists.txt.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ lib/CMakeLists.txt 2018-08-31 21:34:14.841520000 +0200
|
|
|
|
|
--- lib/CMakeLists.txt.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ lib/CMakeLists.txt 2018-09-27 22:37:31.751504000 +0200
|
|
|
|
|
@@ -95,21 +95,6 @@
|
|
|
|
|
endif (ARES_HEADER)
|
|
|
|
|
endif (${WITH_SRV} STREQUAL ON)
|
|
|
|
@ -73,8 +76,8 @@ Index: lib/CMakeLists.txt
|
|
|
|
|
-endif (UNIX AND NOT APPLE)
|
|
|
|
|
-
|
|
|
|
|
Index: lib/cpp/CMakeLists.txt
|
|
|
|
|
--- lib/cpp/CMakeLists.txt.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ lib/cpp/CMakeLists.txt 2018-08-31 21:34:14.841647000 +0200
|
|
|
|
|
--- lib/cpp/CMakeLists.txt.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ lib/cpp/CMakeLists.txt 2018-09-27 22:37:31.751624000 +0200
|
|
|
|
|
@@ -4,17 +4,6 @@
|
|
|
|
|
|
|
|
|
|
set(CPP_SRC mosquittopp.cpp mosquittopp.h)
|
|
|
|
@ -102,8 +105,8 @@ Index: lib/cpp/CMakeLists.txt
|
|
|
|
|
-endif (UNIX AND NOT APPLE)
|
|
|
|
|
-
|
|
|
|
|
Index: lib/mosquitto.c
|
|
|
|
|
--- lib/mosquitto.c.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ lib/mosquitto.c 2018-08-31 21:34:14.841800000 +0200
|
|
|
|
|
--- lib/mosquitto.c.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ lib/mosquitto.c 2018-09-27 22:37:31.751770000 +0200
|
|
|
|
|
@@ -16,6 +16,10 @@
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
@ -116,8 +119,8 @@ Index: lib/mosquitto.c
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
Index: lib/tls_mosq.c
|
|
|
|
|
--- lib/tls_mosq.c.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ lib/tls_mosq.c 2018-08-31 21:34:14.841930000 +0200
|
|
|
|
|
--- lib/tls_mosq.c.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ lib/tls_mosq.c 2018-09-27 22:37:31.751888000 +0200
|
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
|
#else
|
|
|
|
|
# include <arpa/inet.h>
|
|
|
|
@ -127,8 +130,8 @@ Index: lib/tls_mosq.c
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
Index: lib/tls_mosq.h
|
|
|
|
|
--- lib/tls_mosq.h.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ lib/tls_mosq.h 2018-08-31 21:34:14.842043000 +0200
|
|
|
|
|
--- lib/tls_mosq.h.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ lib/tls_mosq.h 2018-09-27 22:37:31.751993000 +0200
|
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
|
#ifdef WITH_TLS
|
|
|
|
|
|
|
|
|
@ -138,9 +141,9 @@ Index: lib/tls_mosq.h
|
|
|
|
|
int mosquitto__server_certificate_verify(int preverify_ok, X509_STORE_CTX *ctx);
|
|
|
|
|
int mosquitto__verify_certificate_hostname(X509 *cert, const char *hostname);
|
|
|
|
|
Index: src/CMakeLists.txt
|
|
|
|
|
--- src/CMakeLists.txt.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ src/CMakeLists.txt 2018-08-31 21:45:06.001836000 +0200
|
|
|
|
|
@@ -126,7 +126,11 @@
|
|
|
|
|
--- src/CMakeLists.txt.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ src/CMakeLists.txt 2018-09-27 22:37:31.752139000 +0200
|
|
|
|
|
@@ -131,7 +131,11 @@
|
|
|
|
|
if (APPLE)
|
|
|
|
|
set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
|
|
|
|
|
else (APPLE)
|
|
|
|
@ -153,7 +156,7 @@ Index: src/CMakeLists.txt
|
|
|
|
|
find_library(LIBRT rt)
|
|
|
|
|
if (LIBRT)
|
|
|
|
|
set (MOSQ_LIBS ${MOSQ_LIBS} rt)
|
|
|
|
|
@@ -140,13 +144,13 @@
|
|
|
|
|
@@ -145,13 +149,13 @@
|
|
|
|
|
|
|
|
|
|
if (${WITH_WEBSOCKETS} STREQUAL ON)
|
|
|
|
|
if (${STATIC_WEBSOCKETS} STREQUAL ON)
|
|
|
|
@ -169,7 +172,7 @@ Index: src/CMakeLists.txt
|
|
|
|
|
endif (${STATIC_WEBSOCKETS} STREQUAL ON)
|
|
|
|
|
endif (${WITH_WEBSOCKETS} STREQUAL ON)
|
|
|
|
|
|
|
|
|
|
@@ -170,17 +174,12 @@
|
|
|
|
|
@@ -175,17 +179,12 @@
|
|
|
|
|
endif (APPLE)
|
|
|
|
|
endif (UNIX)
|
|
|
|
|
|
|
|
|
@ -190,8 +193,8 @@ Index: src/CMakeLists.txt
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
Index: src/mosquitto.c
|
|
|
|
|
--- src/mosquitto.c.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ src/mosquitto.c 2018-08-31 21:34:14.843058000 +0200
|
|
|
|
|
--- src/mosquitto.c.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ src/mosquitto.c 2018-09-27 22:37:31.752289000 +0200
|
|
|
|
|
@@ -16,6 +16,11 @@
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
@ -222,8 +225,8 @@ Index: src/mosquitto.c
|
|
|
|
|
# include <systemd/sd-daemon.h>
|
|
|
|
|
#endif
|
|
|
|
|
Index: src/mosquitto_broker_internal.h
|
|
|
|
|
--- src/mosquitto_broker_internal.h.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ src/mosquitto_broker_internal.h 2018-08-31 21:34:14.843212000 +0200
|
|
|
|
|
--- src/mosquitto_broker_internal.h.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ src/mosquitto_broker_internal.h 2018-09-27 22:37:31.752459000 +0200
|
|
|
|
|
@@ -20,6 +20,8 @@
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
@ -234,8 +237,8 @@ Index: src/mosquitto_broker_internal.h
|
|
|
|
|
#ifdef WITH_WEBSOCKETS
|
|
|
|
|
# include <libwebsockets.h>
|
|
|
|
|
Index: src/signals.c
|
|
|
|
|
--- src/signals.c.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ src/signals.c 2018-08-31 21:34:14.843583000 +0200
|
|
|
|
|
--- src/signals.c.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ src/signals.c 2018-09-27 22:37:31.752576000 +0200
|
|
|
|
|
@@ -39,6 +39,8 @@
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
@ -246,8 +249,8 @@ Index: src/signals.c
|
|
|
|
|
# include <systemd/sd-daemon.h>
|
|
|
|
|
#endif
|
|
|
|
|
Index: src/websockets.c
|
|
|
|
|
--- src/websockets.c.orig 2018-08-16 18:05:26.000000000 +0200
|
|
|
|
|
+++ src/websockets.c 2018-08-31 21:34:14.843749000 +0200
|
|
|
|
|
--- src/websockets.c.orig 2018-09-25 17:27:43.000000000 +0200
|
|
|
|
|
+++ src/websockets.c 2018-09-27 22:37:31.752743000 +0200
|
|
|
|
|
@@ -31,6 +31,8 @@
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|