openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: mosquitto 1.5.3 -> 1.5.4

master
Dr. Ralf S. Engelschall 7 years ago
parent
3b291867e7
commit
b6d9218f3f
2 changed files with 47 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      mosquitto/mosquitto.patch
  2. 4
      mosquitto/mosquitto.spec

85
mosquitto/mosquitto.patch
Unescape View File

@ -1,23 +1,28 @@
Index: client/CMakeLists.txt
--- 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})
--- client/CMakeLists.txt.orig 2018-11-09 16:56:21.007286000 +0100
+++ client/CMakeLists.txt 2018-11-09 16:56:57.730537000 +0100
@@ -12,13 +12,13 @@
add_executable(mosquitto_sub sub_client.c sub_client_output.c ${shared_src})
-target_link_libraries(mosquitto_pub libmosquitto)
-target_link_libraries(mosquitto_sub libmosquitto)
+target_link_libraries(mosquitto_pub libmosquitto_static)
+target_link_libraries(mosquitto_sub libmosquitto_static)
if (QNX)
target_link_libraries(mosquitto_pub socket)
target_link_libraries(mosquitto_sub socket)
endif()
-install(TARGETS mosquitto_pub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
-install(TARGETS mosquitto_sub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+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-09-25 17:27:43.000000000 +0200
+++ config.mk 2018-09-27 22:40:18.482755000 +0200
@@ -266,7 +266,7 @@
--- config.mk.orig 2018-11-08 13:12:53.000000000 +0100
+++ config.mk 2018-11-09 16:56:21.007501000 +0100
@@ -272,7 +272,7 @@
ifeq ($(WITH_WEBSOCKETS),yes)
BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WEBSOCKETS
@ -26,7 +31,7 @@ Index: config.mk
endif
ifeq ($(WITH_WEBSOCKETS),static)
@@ -275,11 +275,11 @@
@@ -281,11 +281,11 @@
endif
INSTALL?=install
@ -43,9 +48,9 @@ Index: config.mk
ifeq ($(WITH_STRIP),yes)
Index: lib/CMakeLists.txt
--- 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 @@
--- lib/CMakeLists.txt.orig 2018-11-08 13:12:53.000000000 +0100
+++ lib/CMakeLists.txt 2018-11-09 16:56:21.007620000 +0100
@@ -71,21 +71,6 @@
endif (ARES_HEADER)
endif (${WITH_SRV} STREQUAL ON)
@ -67,7 +72,7 @@ Index: lib/CMakeLists.txt
if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
add_library(libmosquitto_static STATIC ${C_SRC})
if (${WITH_PIC} STREQUAL ON)
@@ -131,7 +116,3 @@
@@ -107,7 +92,3 @@
install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
@ -76,8 +81,8 @@ Index: lib/CMakeLists.txt
-endif (UNIX AND NOT APPLE)
-
Index: lib/cpp/CMakeLists.txt
--- 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
--- lib/cpp/CMakeLists.txt.orig 2018-11-08 13:12:53.000000000 +0100
+++ lib/cpp/CMakeLists.txt 2018-11-09 16:56:21.007728000 +0100
@@ -4,17 +4,6 @@
set(CPP_SRC mosquittopp.cpp mosquittopp.h)
@ -105,8 +110,8 @@ Index: lib/cpp/CMakeLists.txt
-endif (UNIX AND NOT APPLE)
-
Index: lib/mosquitto.c
--- lib/mosquitto.c.orig 2018-09-25 17:27:43.000000000 +0200
+++ lib/mosquitto.c 2018-09-27 22:37:31.751770000 +0200
--- lib/mosquitto.c.orig 2018-11-08 13:12:53.000000000 +0100
+++ lib/mosquitto.c 2018-11-09 16:56:21.007857000 +0100
@@ -16,6 +16,10 @@
#include "config.h"
@ -119,8 +124,8 @@ Index: lib/mosquitto.c
#include <signal.h>
#include <string.h>
Index: lib/tls_mosq.c
--- 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
--- lib/tls_mosq.c.orig 2018-11-08 13:12:53.000000000 +0100
+++ lib/tls_mosq.c 2018-11-09 16:56:21.007967000 +0100
@@ -24,6 +24,7 @@
#else
# include <arpa/inet.h>
@ -130,8 +135,8 @@ Index: lib/tls_mosq.c
#endif
Index: lib/tls_mosq.h
--- 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
--- lib/tls_mosq.h.orig 2018-11-08 13:12:53.000000000 +0100
+++ lib/tls_mosq.h 2018-11-09 16:56:21.008061000 +0100
@@ -26,6 +26,7 @@
#ifdef WITH_TLS
@ -141,22 +146,22 @@ 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-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)
- set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
--- src/CMakeLists.txt.orig 2018-11-08 13:12:53.000000000 +0100
+++ src/CMakeLists.txt 2018-11-09 16:58:24.834001000 +0100
@@ -132,7 +132,11 @@
elseif(QNX)
set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
else(APPLE)
- set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
+ find_library(LIBDL dl)
+ if (LIBDL)
+ set (MOSQ_LIBS ${MOSQ_LIBS} dl)
+ endif (LIBDL)
find_library(LIBRT rt)
if (LIBRT)
set (MOSQ_LIBS ${MOSQ_LIBS} rt)
@@ -145,13 +149,13 @@
find_library(LIBRT rt)
if (LIBRT)
set (MOSQ_LIBS ${MOSQ_LIBS} rt)
@@ -146,13 +150,13 @@
if (${WITH_WEBSOCKETS} STREQUAL ON)
if (${STATIC_WEBSOCKETS} STREQUAL ON)
@ -172,7 +177,7 @@ Index: src/CMakeLists.txt
endif (${STATIC_WEBSOCKETS} STREQUAL ON)
endif (${WITH_WEBSOCKETS} STREQUAL ON)
@@ -175,17 +179,12 @@
@@ -176,17 +180,12 @@
endif (APPLE)
endif (UNIX)
@ -193,8 +198,8 @@ Index: src/CMakeLists.txt
-
-
Index: src/mosquitto.c
--- src/mosquitto.c.orig 2018-09-25 17:27:43.000000000 +0200
+++ src/mosquitto.c 2018-09-27 22:37:31.752289000 +0200
--- src/mosquitto.c.orig 2018-11-08 13:12:53.000000000 +0100
+++ src/mosquitto.c 2018-11-09 16:56:21.008384000 +0100
@@ -16,6 +16,11 @@
#include "config.h"
@ -225,8 +230,8 @@ Index: src/mosquitto.c
# include <systemd/sd-daemon.h>
#endif
Index: src/mosquitto_broker_internal.h
--- 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
--- src/mosquitto_broker_internal.h.orig 2018-11-08 13:12:53.000000000 +0100
+++ src/mosquitto_broker_internal.h 2018-11-09 16:56:21.008534000 +0100
@@ -20,6 +20,8 @@
#include "config.h"
@ -237,8 +242,8 @@ Index: src/mosquitto_broker_internal.h
#ifdef WITH_WEBSOCKETS
# include <libwebsockets.h>
Index: src/signals.c
--- src/signals.c.orig 2018-09-25 17:27:43.000000000 +0200
+++ src/signals.c 2018-09-27 22:37:31.752576000 +0200
--- src/signals.c.orig 2018-11-08 13:12:53.000000000 +0100
+++ src/signals.c 2018-11-09 16:56:21.008632000 +0100
@@ -39,6 +39,8 @@
#include <signal.h>
#include <stdio.h>
@ -249,8 +254,8 @@ Index: src/signals.c
# include <systemd/sd-daemon.h>
#endif
Index: src/websockets.c
--- src/websockets.c.orig 2018-09-25 17:27:43.000000000 +0200
+++ src/websockets.c 2018-09-27 22:37:31.752743000 +0200
--- src/websockets.c.orig 2018-11-08 13:12:53.000000000 +0100
+++ src/websockets.c 2018-11-09 16:56:21.008780000 +0100
@@ -31,6 +31,8 @@
#include "config.h"

4
mosquitto/mosquitto.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Networking
License: EPL
Version: 1.5.3
Release: 20180927
Version: 1.5.4
Release: 20181109
# list of sources
Source0: http://mosquitto.org/files/source/mosquitto-%{version}.tar.gz

Write Preview
Loading…
Cancel
Save