diff --git a/debian/changelog b/debian/changelog index 3f2045ca..9a5020a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mosquitto (1.4.10-1) unstable; urgency=low + + * New upstream release. + * Add support for openssl 1.1.0 (closes: #828442) + * Fix FTBFS on Hurd (closes: #824571) + + -- Roger A. Light Thu, 27 Oct 2016 14:01:40 +0100 + mosquitto (1.4.8-1) unstable; urgency=high * New upstream release. diff --git a/debian/patches/build-timestamp.patch b/debian/patches/build-timestamp.patch index 5ae2ca24..05dabe6a 100644 --- a/debian/patches/build-timestamp.patch +++ b/debian/patches/build-timestamp.patch @@ -6,7 +6,7 @@ Forwarded: not-needed @@ -84,7 +84,7 @@ # Also bump lib/mosquitto.h, CMakeLists.txt, # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi - VERSION=1.4.8 + VERSION=1.4.10 -TIMESTAMP:=$(shell date "+%F %T%z") +TIMESTAMP:=$(shell dpkg-parsechangelog -l../debian/changelog | grep Date | sed -e 's/Date: //') diff --git a/debian/patches/hurd-errno.patch b/debian/patches/hurd-errno.patch new file mode 100644 index 00000000..78991066 --- /dev/null +++ b/debian/patches/hurd-errno.patch @@ -0,0 +1,14 @@ +Description: Fix FTBFS on Hurd (bug: 424571) +Author: Roger Light +Forwarded: yes +--- a/config.h ++++ b/config.h +@@ -27,6 +27,8 @@ + #define uthash_malloc(sz) _mosquitto_malloc(sz) + #define uthash_free(ptr,sz) _mosquitto_free(ptr) + ++#include ++ + #ifndef EPROTO + # define EPROTO ECONNABORTED + #endif diff --git a/debian/patches/nostrip.patch b/debian/patches/nostrip.patch index cfaf5a12..d7c3ab28 100644 --- a/debian/patches/nostrip.patch +++ b/debian/patches/nostrip.patch @@ -38,14 +38,16 @@ Forwarded: not-needed $(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h --- a/src/Makefile +++ b/src/Makefile -@@ -103,10 +103,10 @@ +@@ -103,12 +103,12 @@ install : all $(INSTALL) -d ${DESTDIR}$(prefix)/sbin - $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto + $(INSTALL) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto + $(INSTALL) -d ${DESTDIR}$(prefix)/include $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h ifeq ($(WITH_TLS),yes) + $(INSTALL) -d ${DESTDIR}$(prefix)/bin - $(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd + $(INSTALL) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd endif diff --git a/debian/patches/series b/debian/patches/series index c83508ce..23aa9048 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ disable-in-tree-uthash.patch enable-websockets.patch libdir.patch build-timestamp.patch +hurd-errno.patch