net/mosquitto: Upgrade 1.4.1 to 1.4.2

Bugfix release.  Full changelog available at:
http://mosquitto.org/2015/05/version-1-4-2-released/

Drops a patch now included upstream.

Signed-off-by: Karl Palsson <karlp@remake.is>

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 5b015795c3af0f37634d16bc3aba5b7b60379ca4..7ad3bc8cef72f564b202b66465e61eb6800bd81f 100644 (file)
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.4.2
 PKG_RELEASE:=2
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mosquitto.org/files/source/
-PKG_MD5SUM:=46008028563eb750c6aa93281ab2e181
+PKG_MD5SUM:=2c3b19686c04849ed4b183c63149bfe1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/mosquitto/patches/101-qos2-inflight.patch b/net/mosquitto/patches/101-qos2-inflight.patch
deleted file mode 100644 (file)
index 61706d3..0000000
--- a/net/mosquitto/patches/101-qos2-inflight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/mosquitto.c b/lib/mosquitto.c
-index bd9dbd3..7314248 100644
---- a/lib/mosquitto.c
-+++ b/lib/mosquitto.c
-@@ -594,7 +594,6 @@ int mosquitto_publish(struct mosquitto *mosq, int *mid, const char *topic, int p
-               pthread_mutex_lock(&mosq->out_message_mutex);
-               _mosquitto_message_queue(mosq, message, mosq_md_out);
-               if(mosq->max_inflight_messages == 0 || mosq->inflight_messages < mosq->max_inflight_messages){
--                      mosq->inflight_messages++;
-                       if(qos == 1){
-                               message->state = mosq_ms_wait_for_puback;
-                       }else if(qos == 2){