[meta-oe][PATCH 1/2] mosquitto: refresh patches and sync with Debian packaging

[meta-oe][PATCH 1/2] mosquitto: refresh patches and sync with Debian packaging

[Gianfranco Costamagna]

 Also add patch from debian to mqtt_protocol.h header file

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 .../mosquitto/files/1571.patch                     |  4 +---
 .../mosquitto/files/install-protocol.patch         | 14 ++++++++++++++
 .../mosquitto/mosquitto_1.6.9.bb                   |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
index 2cfa48457..93ff6bcfa 100644
--- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
+++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch
@@ -9,11 +9,9 @@ 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
+@@ -89,6 +89,8 @@
  	OUTPUT_NAME mosquitto
  	VERSION ${VERSION}
  	SOVERSION 1
diff --git a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
new file mode 100644
index 000000000..1397fc6a2
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch
@@ -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
+
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -114,4 +114,4 @@
+ 	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}")
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
index 0d840e938..a0321a36f 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
@@ -17,6 +17,7 @@ DEPENDS = "uthash"
 SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
            file://mosquitto.init \
            file://1571.patch \
+           file://install-protocol.patch \
 "
 
 SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b"
-- 
2.17.1

[meta-oe][PATCH 2/2] mosquitto: do not enable srv by default

[Gianfranco Costamagna]

Rationale can be found in the Debian packaging (debian/changelog):
Revert change enabling SRV functionality, it is disabled by default
upstream and of little benefit to any end user, but adds reasonable
complexity to the code.

Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.6.9.bb           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
index a0321a36f..de43aae73 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f
 
 inherit systemd update-rc.d useradd cmake
 
-PACKAGECONFIG ??= "ssl dlt websockets dns-srv\
+PACKAGECONFIG ??= "ssl dlt websockets \
                   ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
                   "
 
-- 
2.17.1