net/mosquitto: bump to 1.4.12 for CVE-2017-7650

Dot release, primarily due to CVE-2017-7650 but also rolls up some
earlier patches.

Signed-off-by: Karl Palsson <karlp@etactica.com>

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 10e51b63249ef302d45685fe5f2aa5037795e952..f0575704b9fb38be59106387c752bf4cc4d22592 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.11
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.12
+PKG_RELEASE:=1
 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_HASH:=ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5
+PKG_HASH:=b12e2353f92cb76882ce7b7bddfea022b461b38cbe6e7fb7c969d0daeb379cf7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/mosquitto/patches/01-fix-libanl-musl.patch b/net/mosquitto/patches/01-fix-libanl-musl.patch
deleted file mode 100644 (file)
index b497217..0000000
--- a/net/mosquitto/patches/01-fix-libanl-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit f095176610597c8e95481a400375a742f2e96a3a
-Author: Karl Palsson <karlp@etactica.com>
-Date:   Fri May 5 09:57:37 2017 +0000
-
-    [344] Only link libanl when WITH_ADNS=yes
-    
-    Removes the hard link of libanl for Linux, leaving the protected link
-    when WITH_ADNS is specified.
-    
-    Fixes: 433ee5c4d6852b507b43eae9c9a2c9028c6b48e5
-    
-    Signed-off-by: Karl Palsson <karlp@etactica.com>
-
-diff --git a/config.mk b/config.mk
-index 6e369c2..44639d2 100644
---- a/config.mk
-+++ b/config.mk
-@@ -159,10 +159,6 @@ ifeq ($(UNAME),QNX)
-       LIB_LIBS:=$(LIB_LIBS) -lsocket
- endif
- 
--ifeq ($(UNAME),Linux)
--      BROKER_LIBS:=$(BROKER_LIBS) -lanl
--endif
--
- ifeq ($(WITH_WRAP),yes)
-       BROKER_LIBS:=$(BROKER_LIBS) -lwrap
-       BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP