update to mosquitto-1.5.5

This commit is contained in:
jasper 2019-01-07 18:36:44 +00:00
parent c5ab1b5fb0
commit d97d7f8954
5 changed files with 18 additions and 19 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:09 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2019/01/07 18:36:44 jasper Exp $
COMMENT = opensource MQTT broker
DISTNAME = mosquitto-1.5.3
REVISION = 0
DISTNAME = mosquitto-1.5.5
SHARED_LIBS += mosquitto 0.0 # 1.5
SHARED_LIBS += mosquittopp 0.0 # 1.5

View File

@ -1,2 +1,2 @@
SHA256 (mosquitto-1.5.3.tar.gz) = MIGpmNMDqIOxzQZACb6ryIqpFZ4m9SWKSuYAcWBJHRA=
SIZE (mosquitto-1.5.3.tar.gz) = 425844
SHA256 (mosquitto-1.5.5.tar.gz) = /NtH40CGTFRRRmga9yUzmcwpLkF3Wv12QA/aWw0j1mg=
SIZE (mosquitto-1.5.5.tar.gz) = 431998

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-lib_CMakeLists_txt,v 1.5 2018/06/03 14:20:43 jasper Exp $
$OpenBSD: patch-lib_CMakeLists_txt,v 1.6 2019/01/07 18:36:44 jasper Exp $
Index: lib/CMakeLists.txt
--- lib/CMakeLists.txt.orig
+++ lib/CMakeLists.txt
@@ -108,6 +108,12 @@ set_target_properties(libmosquitto PROPERTIES
@@ -84,6 +84,12 @@ set_target_properties(libmosquitto PROPERTIES
SOVERSION 1
)
@ -16,7 +16,7 @@ Index: lib/CMakeLists.txt
install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
@@ -131,7 +137,7 @@ endif (${WITH_STATIC_LIBRARIES} STREQUAL ON)
@@ -107,7 +113,7 @@ endif (${WITH_STATIC_LIBRARIES} STREQUAL ON)
install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")

View File

@ -1,18 +1,18 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.6 2018/09/22 08:19:25 jasper Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.7 2019/01/07 18:36:44 jasper Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -130,6 +130,8 @@ endif (HAVE_GETADDRINFO_A)
@@ -129,6 +129,8 @@ endif (HAVE_GETADDRINFO_A)
if (UNIX)
if (APPLE)
set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
else (APPLE)
set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
find_library(LIBRT rt)
@@ -155,14 +157,22 @@ if (${WITH_WEBSOCKETS} STREQUAL ON)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
elseif(QNX)
set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
else(APPLE)
@@ -156,14 +158,22 @@ if (${WITH_WEBSOCKETS} STREQUAL ON)
endif (${STATIC_WEBSOCKETS} STREQUAL ON)
endif (${WITH_WEBSOCKETS} STREQUAL ON)
@ -40,7 +40,7 @@ Index: src/CMakeLists.txt
add_executable(mosquitto ${MOSQ_SRCS})
target_link_libraries(mosquitto ${MOSQ_LIBS})
@@ -184,8 +194,8 @@ if (${WITH_TLS} STREQUAL ON)
@@ -185,8 +195,8 @@ if (${WITH_TLS} STREQUAL ON)
install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
endif (${WITH_TLS} STREQUAL ON)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-test_broker_c_Makefile,v 1.3 2018/09/22 08:19:25 jasper Exp $
$OpenBSD: patch-test_broker_c_Makefile,v 1.4 2019/01/07 18:36:44 jasper Exp $
Index: test/broker/c/Makefile
--- test/broker/c/Makefile.orig
+++ test/broker/c/Makefile
@@ -25,10 +25,10 @@ auth_plugin_msg_params.so : auth_plugin_msg_params.c
@@ -38,10 +38,10 @@ auth_plugin_acl_sub_denied.so : auth_plugin_acl_sub_de
$(CC) ${CFLAGS} -fPIC -shared $^ -o $@
08-tls-psk-pub.test : 08-tls-psk-pub.c