From b1833bb9f5dcf8e142369ab2248c3db8351002f9 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 22 Sep 2018 04:35:20 +0200 Subject: [PATCH] libmosquitto: Update from 1.5.1 to 1.5.2 --- packages/libmosquitto/build.sh | 5 ++--- packages/libmosquitto/lib-net_mosq.c.patch | 16 ---------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 packages/libmosquitto/lib-net_mosq.c.patch diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index 7ec5eca69..87812f890 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://mosquitto.org/ TERMUX_PKG_DESCRIPTION="MQTT library" -TERMUX_PKG_VERSION=1.5.1 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=8557bc7ae34dfaf32a0fb56d2491b7a7f731269c88337227233013502df4d5b0 +TERMUX_PKG_VERSION=1.5.2 +TERMUX_PKG_SHA256=7e90ccfe95179cfe6bf7d7f725281dd83041f241a8f093c9d3883b926584de9c 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" diff --git a/packages/libmosquitto/lib-net_mosq.c.patch b/packages/libmosquitto/lib-net_mosq.c.patch deleted file mode 100644 index 4671c2387..000000000 --- a/packages/libmosquitto/lib-net_mosq.c.patch +++ /dev/null @@ -1,16 +0,0 @@ -Submitted upstream at https://github.com/eclipse/mosquitto/pull/932 - -diff -u -r ../mosquitto-1.5.1/lib/net_mosq.c ./lib/net_mosq.c ---- ../mosquitto-1.5.1/lib/net_mosq.c 2018-08-16 16:05:26.000000000 +0000 -+++ ./lib/net_mosq.c 2018-08-23 17:45:34.544680239 +0000 -@@ -103,7 +103,9 @@ - #if OPENSSL_VERSION_NUMBER < 0x10100000L - ERR_remove_state(0); - #endif -- ENGINE_cleanup(); -+ #ifndef OPENSSL_NO_ENGINE -+ ENGINE_cleanup(); -+ #endif - CONF_modules_unload(1); - ERR_free_strings(); - EVP_cleanup();