Merge latest fixes on Debian packaging
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>debian
Gianfranco Costamagna
6 years ago
committed by
Roger Light
parent
c5a984db81
commit
1628d7da06
@ -1 +0,0 @@
|
||||
11
|
||||
@ -1,4 +1,4 @@
|
||||
usr/include/mosquitto.h
|
||||
usr/include/mqtt_protocol.h
|
||||
usr/lib/*/libmosquitto.so
|
||||
usr/share/man/man3/libmosquitto.3
|
||||
usr/lib/*/pkgconfig/libmosquitto.pc
|
||||
|
||||
@ -0,0 +1 @@
|
||||
usr/share/man/man3/libmosquitto.3
|
||||
@ -1 +1 @@
|
||||
usr/lib/*/libmosquitto.so.1
|
||||
usr/lib/*/libmosquitto.so.*
|
||||
|
||||
@ -1 +1 @@
|
||||
usr/lib/*/libmosquittopp.so.1
|
||||
usr/lib/*/libmosquittopp.so.*
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
usr/bin/mosquitto_pub
|
||||
usr/bin/mosquitto_sub
|
||||
usr/share/man/man1/mosquitto_pub.1
|
||||
usr/share/man/man1/mosquitto_sub.1
|
||||
usr/bin/mosquitto_rr
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
usr/share/man/man1/mosquitto_pub.1
|
||||
usr/share/man/man1/mosquitto_sub.1
|
||||
usr/share/man/man1/mosquitto_rr.1
|
||||
@ -1 +1,2 @@
|
||||
usr/include/mosquitto_plugin.h
|
||||
usr/include/mosquitto_broker.h
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
usr/share/man/man1/mosquitto_passwd.1
|
||||
usr/share/man/man5/mosquitto.conf.5
|
||||
usr/share/man/man7/mosquitto-tls.7
|
||||
usr/share/man/man7/mqtt.7
|
||||
usr/share/man/man8/mosquitto.8
|
||||
@ -0,0 +1,67 @@
|
||||
Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1568]
|
||||
From 50bfc79cae5764a6e513b684a5eb5bef2b35c856 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Wed, 22 Jan 2020 12:30:25 +0100
|
||||
Subject: [PATCH] Bugfix: include "deps" directory only if BUNDLED_DEPS has
|
||||
been provided and set to true
|
||||
|
||||
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
---
|
||||
config.mk | 5 ++++-
|
||||
lib/CMakeLists.txt | 5 ++++-
|
||||
test/unit/Makefile | 6 +++++-
|
||||
3 files changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 51e36e0d0..0ac24b3d4 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -135,7 +135,10 @@ endif
|
||||
|
||||
STATIC_LIB_DEPS:=
|
||||
|
||||
-LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps
|
||||
+LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib
|
||||
+ifeq ($(WITH_BUNDLED_DEPS),yes)
|
||||
+ LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps
|
||||
+endif
|
||||
LIB_CFLAGS:=$(CFLAGS)
|
||||
LIB_CXXFLAGS:=$(CXXFLAGS)
|
||||
LIB_LDFLAGS:=$(LDFLAGS)
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index e1521f12a..891046a81 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -1,11 +1,14 @@
|
||||
add_subdirectory(cpp)
|
||||
|
||||
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
|
||||
- ${mosquitto_SOURCE_DIR}/src/deps
|
||||
${STDBOOL_H_PATH} ${STDINT_H_PATH}
|
||||
${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR})
|
||||
link_directories(${mosquitto_SOURCE_DIR}/lib)
|
||||
|
||||
+if (WITH_BUNDLED_DEPS)
|
||||
+ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps)
|
||||
+endif (WITH_BUNDLED_DEPS)
|
||||
+
|
||||
set(C_SRC
|
||||
actions.c
|
||||
callbacks.c
|
||||
diff --git a/test/unit/Makefile b/test/unit/Makefile
|
||||
index 9d422428d..928579492 100644
|
||||
--- a/test/unit/Makefile
|
||||
+++ b/test/unit/Makefile
|
||||
@@ -2,7 +2,11 @@ include ../../config.mk
|
||||
|
||||
.PHONY: all check test test-broker test-lib clean coverage
|
||||
|
||||
-CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps
|
||||
+CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src
|
||||
+ifeq ($(WITH_BUNDLED_DEPS),yes)
|
||||
+ CPPFLAGS:=$(CPPFLAGS) -I../../src/deps
|
||||
+endif
|
||||
+
|
||||
CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb
|
||||
LDFLAGS:=$(LDFLAGS) -coverage
|
||||
LDADD:=$(LDADD) -lcunit
|
||||
@ -0,0 +1,25 @@
|
||||
Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1569]
|
||||
From fda932612afce2cead2fd2ca1c8ea543b2892177 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Wed, 22 Jan 2020 12:31:01 +0100
|
||||
Subject: [PATCH] Bugfix: enabling DLT was overriding everything else on linker
|
||||
flags because of error in cmake set keyword
|
||||
|
||||
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 7898ff5b1..6dfbba5e6 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -130,7 +130,7 @@ add_definitions (-DWITH_BROKER)
|
||||
if (WITH_DLT)
|
||||
message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}")
|
||||
link_directories(${DLT_LIBDIR})
|
||||
- set (MOSQ_LIBS ${DLT_LIBRARIES})
|
||||
+ set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES})
|
||||
endif (WITH_DLT)
|
||||
|
||||
set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
|
||||
@ -0,0 +1,39 @@
|
||||
Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1570]
|
||||
From 775677b05190380c3736bf0dbef002ee7b9bff33 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Wed, 22 Jan 2020 12:29:41 +0100
|
||||
Subject: [PATCH] cmake: add ADNS enable/disable dynamic support
|
||||
|
||||
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
---
|
||||
src/CMakeLists.txt | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 7898ff5b1..edae76f32 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -105,6 +105,9 @@ if (WITH_SYS_TREE)
|
||||
add_definitions("-DWITH_SYS_TREE")
|
||||
endif (WITH_SYS_TREE)
|
||||
|
||||
+option(WITH_ADNS
|
||||
+ "Include ADNS support?" OFF)
|
||||
+
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
||||
option(WITH_SYSTEMD
|
||||
"Include systemd support?" OFF)
|
||||
@@ -137,10 +140,11 @@ set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
|
||||
# Check for getaddrinfo_a
|
||||
include(CheckLibraryExists)
|
||||
check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A)
|
||||
-if (HAVE_GETADDRINFO_A)
|
||||
+if (HAVE_GETADDRINFO_A AND WITH_ADNS)
|
||||
+ add_definitions("-DWITH_ADNS")
|
||||
add_definitions(-DHAVE_GETADDRINFO_A)
|
||||
set (MOSQ_LIBS ${MOSQ_LIBS} anl)
|
||||
-endif (HAVE_GETADDRINFO_A)
|
||||
+endif (HAVE_GETADDRINFO_A AND WITH_ADNS)
|
||||
|
||||
|
||||
if (UNIX)
|
||||
@ -0,0 +1,24 @@
|
||||
Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1571]
|
||||
From 3fe5468f1bdca1bff1d18cf43c9e338f41aa9e32 Mon Sep 17 00:00:00 2001
|
||||
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
Date: Wed, 22 Jan 2020 12:39:49 +0100
|
||||
Subject: [PATCH] Add dynamic symbols linking with cmake too
|
||||
|
||||
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
||||
---
|
||||
lib/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index e1521f12a..14ba12739 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES
|
||||
OUTPUT_NAME mosquitto
|
||||
VERSION ${VERSION}
|
||||
SOVERSION 1
|
||||
+ LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linker.version
|
||||
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/linker.version"
|
||||
)
|
||||
|
||||
install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
@ -1,20 +0,0 @@
|
||||
Description: Use pkg-config to get systemd libs to allow build on non-linux systems
|
||||
Author: Roger Light <roger@atchoo.org>
|
||||
Forwarded: yes
|
||||
Index: mosquitto-pulls/config.mk
|
||||
===================================================================
|
||||
--- mosquitto-pulls.orig/config.mk
|
||||
+++ mosquitto-pulls/config.mk
|
||||
@@ -247,8 +247,10 @@ ifeq ($(WITH_SYS_TREE),yes)
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_SYSTEMD),yes)
|
||||
- BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_SYSTEMD
|
||||
- BROKER_LDADD:=$(BROKER_LDADD) -lsystemd
|
||||
+ ifneq ($(shell pkg-config --libs libsystemd),)
|
||||
+ BROKER_CPPFLAGS:=$(BROKER_CPPFLAGS) -DWITH_SYSTEMD $(shell pkg-config --cflags libsystemd)
|
||||
+ BROKER_LDADD:=$(BROKER_LDADD) $(shell pkg-config --libs libsystemd)
|
||||
+ endif
|
||||
endif
|
||||
|
||||
ifeq ($(WITH_SRV),yes)
|
||||
@ -0,0 +1,14 @@
|
||||
Description: Also install mqtt_protocol.h, as is done in Makefile
|
||||
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/951116
|
||||
Forwarded: https://github.com/eclipse/mosquitto/pull/1599
|
||||
Last-Update: 2020-02-15
|
||||
|
||||
--- mosquitto-1.6.8.orig/lib/CMakeLists.txt
|
||||
+++ mosquitto-1.6.8/lib/CMakeLists.txt
|
||||
@@ -113,4 +113,4 @@ if (WITH_STATIC_LIBRARIES)
|
||||
install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
endif (WITH_STATIC_LIBRARIES)
|
||||
|
||||
-install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
+install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
@ -1,2 +1,6 @@
|
||||
914525.patch
|
||||
debian-config.patch
|
||||
1568.patch
|
||||
1569.patch
|
||||
1570.patch
|
||||
1571.patch
|
||||
install-protocol.patch
|
||||
|
||||
Loading…
Reference in New Issue