libmosquitto: Update from 1.4.14 to 1.4.15

Also keep mosquittopp (fixes #2219).

diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh
index 417dccd7c0945442093f2988ac8a268beec9dd98..085dd319d7a8c7bc8c0a614aca91f1e2007828e4 100644 (file)
--- a/packages/libmosquitto/build.sh
+++ b/packages/libmosquitto/build.sh
@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://mosquitto.org/
 TERMUX_PKG_DESCRIPTION="MQTT library"
 TERMUX_PKG_HOMEPAGE=https://mosquitto.org/
 TERMUX_PKG_DESCRIPTION="MQTT library"

-TERMUX_PKG_VERSION=1.4.14
-TERMUX_PKG_SHA256=156b1fa731d12baad4b8b22f7b6a8af50ba881fc711b81e9919ec103cf2942d1
+TERMUX_PKG_VERSION=1.4.15
+TERMUX_PKG_SHA256=7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83

 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="c-ares, openssl"
 TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_THREADING=OFF
 -DWITH_TLS_PSK=OFF"
 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="c-ares, openssl"
 TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_THREADING=OFF
 -DWITH_TLS_PSK=OFF"

-TERMUX_PKG_RM_AFTER_INSTALL="include/mosquittopp.h lib/libmosquittopp.so"

diff --git a/packages/libmosquitto/src-loop.c.patch b/packages/libmosquitto/src-loop.c.patch
deleted file mode 100644 (file)
index 4702b59..0000000
--- a/packages/libmosquitto/src-loop.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../mosquitto-1.4.14/src/loop.c ./src/loop.c
---- ../mosquitto-1.4.14/src/loop.c     2017-07-11 00:46:01.000000000 +0200
-+++ ./src/loop.c       2017-07-16 17:02:46.714354543 +0200
-@@ -126,7 +126,7 @@
- #ifdef WIN32
-       pollfd_max = _getmaxstdio();
- #else
--      pollfd_max = getdtablesize();
-+      pollfd_max = sysconf(_SC_OPEN_MAX);
- #endif
- 
-       pollfds = _mosquitto_malloc(sizeof(struct pollfd)*pollfd_max);