From d842321c221fdf15937e37724b23620b9b32dd8e Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 25 Apr 2019 15:50:00 +0100 Subject: [PATCH] Package update for 1.6. --- .gitignore | 15 +++++++++++++++ debian/changelog | 8 ++++++++ debian/control | 23 +++++++++++------------ debian/libmosquitto1.symbols | 1 + debian/mosquitto-clients.install | 2 ++ debian/mosquitto.logrotate | 1 + debian/patches/914525.patch | 6 +++--- debian/patches/debian-config.patch | 2 +- 8 files changed, 42 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 38f3bc9d..4fff00f0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,21 @@ client/mosquitto_sub cov-int/ +debian/*.debhelper +debian/*.debhelper.log +debian/*.substvars +debian/.debhelper/ +debian/debhelper-build-stamp +debian/files +debian/libmosquitto-dev/ +debian/libmosquitto1/ +debian/libmosquittopp-dev/ +debian/libmosquittopp1/ +debian/mosquitto-clients/ +debian/mosquitto-dev/ +debian/mosquitto/ +debian/tmp/ + dist/ examples/mysql_log/mosquitto_mysql_log diff --git a/debian/changelog b/debian/changelog index 536b0889..cccd5cb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mosquitto (1.6.0-0mosquitto1) stretch; urgency=medium + + * New upstream release. + * Add mosquitto_rr to mosquitto-clients package. + * Set logrotation compression to delayed to avoid races when rotating. + + -- Roger A. Light Thu, 25 Apr 2019 15:10:40 +0100 + mosquitto (1.5.8-0mosquitto1) stretch; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 66a6acbb..767f042f 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,7 @@ Build-Depends: debhelper (>= 10), libwebsockets-dev, libwrap0-dev, pkg-config, - uthash-dev, - uuid-dev + uthash-dev Standards-Version: 4.3.0 Homepage: https://mosquitto.org/ Vcs-Git: https://github.com/eclipse/mosquitto @@ -19,13 +18,12 @@ Package: mosquitto Architecture: any Multi-Arch: foreign Depends: adduser (>= 3.10), - libuuid1, lsb-base (>=4.1+Debian3), ${misc:Depends}, ${shlibs:Depends} Suggests: apparmor -Description: MQTT version 3.1/3.1.1 compatible message broker - This is a message broker that supports version 3.1 and 3.1.1 of the MQTT +Description: MQTT version 3.1/3.1.1/5.0 compatible message broker + This is a message broker that supports version 5.0 and 3.1.1 of the MQTT protocol. . MQTT provides a method of carrying out messaging using a publish/subscribe @@ -52,8 +50,8 @@ Section: libs Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} -Description: MQTT version 3.1/3.1.1 client library - This is a C library for implementing MQTT version 3.1/3.1.1 clients. +Description: MQTT version 3.1/3.1.1/5.0 client library + This is a C library for implementing MQTT version 3.1/3.1.1/5.0 clients. . MQTT provides a method of carrying out messaging using a publish/subscribe model. It is lightweight, both in terms of bandwidth usage and ease of @@ -70,9 +68,9 @@ Depends: libmosquitto1 (<< ${source:Version}.1~), ${misc:Depends} Replaces: libmosquitto0-dev (<< 1.2-1~) Breaks: libmosquitto0-dev (<< 1.2-1~) -Description: MQTT version 3.1/3.1.1 client library, development files +Description: MQTT version 3.1/3.1.1/5.0 client library, development files This is the header and man page for the libmosquitto1 C library, which is a - library for implementing MQTT version 3.1/3.1.1 clients. This package is + library for implementing MQTT version 3.1/3.1.1/5.0 clients. This package is needed to do development with libmosquitto1. Package: libmosquittopp1 @@ -114,9 +112,10 @@ Depends: libmosquitto1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Mosquitto command line MQTT clients - This is two MQTT version 3.1/3.1.1 command line clients. mosquitto_pub can be - used to publish messages to a broker and mosquitto_sub can be used to - subscribe to a topic to receive messages. + This is three MQTT version 3.1/3.1.1/5.0 command line clients. mosquitto_pub + can be used to publish messages to a broker. mosquitto_sub can be used to + subscribe to a topic to receive messages. mosquitto_rr can be used to carry + out request/response type messaging. . MQTT provides a method of carrying out messaging using a publish/subscribe model. It is lightweight, both in terms of bandwidth usage and ease of diff --git a/debian/libmosquitto1.symbols b/debian/libmosquitto1.symbols index acbc6f2f..8cb66692 100644 --- a/debian/libmosquitto1.symbols +++ b/debian/libmosquitto1.symbols @@ -5,3 +5,4 @@ libmosquitto.so.1 libmosquitto1 #MINVER# (symver)MOSQ_1.3 1.3 (symver)MOSQ_1.4 1.4 (symver)MOSQ_1.5 1.5 + (symver)MOSQ_1.6 1.6 diff --git a/debian/mosquitto-clients.install b/debian/mosquitto-clients.install index 06beb92e..c1d50f91 100644 --- a/debian/mosquitto-clients.install +++ b/debian/mosquitto-clients.install @@ -1,4 +1,6 @@ usr/bin/mosquitto_pub +usr/bin/mosquitto_rr usr/bin/mosquitto_sub usr/share/man/man1/mosquitto_pub.1 +usr/share/man/man1/mosquitto_rr.1 usr/share/man/man1/mosquitto_sub.1 diff --git a/debian/mosquitto.logrotate b/debian/mosquitto.logrotate index 824e6b10..d4f4bc7a 100644 --- a/debian/mosquitto.logrotate +++ b/debian/mosquitto.logrotate @@ -2,6 +2,7 @@ rotate 7 daily compress + delaycompress size 100k nocreate missingok diff --git a/debian/patches/914525.patch b/debian/patches/914525.patch index 293d2722..0fa60cc1 100644 --- a/debian/patches/914525.patch +++ b/debian/patches/914525.patch @@ -3,9 +3,9 @@ Author: Roger Light Forwarded: yes --- a/config.mk +++ b/config.mk -@@ -244,8 +244,10 @@ +@@ -237,8 +237,10 @@ endif - + ifeq ($(WITH_SYSTEMD),yes) - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYSTEMD - BROKER_LIBS:=$(BROKER_LIBS) -lsystemd @@ -14,5 +14,5 @@ Forwarded: yes + BROKER_LIBS:=$(BROKER_LIBS) $(shell pkg-config --libs libsystemd) + endif endif - + ifeq ($(WITH_SRV),yes) diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 22606aee..434798ad 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch @@ -3,7 +3,7 @@ Author: Roger Light Forwarded: not-needed --- a/Makefile +++ b/Makefile -@@ -49,6 +49,7 @@ +@@ -52,6 +52,7 @@ endif $(INSTALL) -d "${DESTDIR}/etc/mosquitto" $(INSTALL) -m 644 mosquitto.conf "${DESTDIR}/etc/mosquitto/mosquitto.conf.example"