aboutsummaryrefslogtreecommitdiffstats
path: root/main/mosquitto
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2018-03-04 16:09:09 +0100
committerJakub Jirutka <jakub@jirutka.cz>2018-03-04 16:11:56 +0100
commit9fd49ead7922a262370c74c063833035c26ef731 (patch)
treee7e5d350aeaf6da368ced636cadb8ee2e1a12bb4 /main/mosquitto
parentee6bb98990299ab9c32374b3a53c2d56dfd091ed (diff)
downloadaports-9fd49ead7922a262370c74c063833035c26ef731.tar.bz2
aports-9fd49ead7922a262370c74c063833035c26ef731.tar.xz
main/mosquitto: security upgrade to 1.4.15
Diffstat (limited to 'main/mosquitto')
-rw-r--r--main/mosquitto/APKBUILD11
-rw-r--r--main/mosquitto/test_broker_makefile.patch14
2 files changed, 6 insertions, 19 deletions
diff --git a/main/mosquitto/APKBUILD b/main/mosquitto/APKBUILD
index 7e976a2483..2c39e6bb8d 100644
--- a/main/mosquitto/APKBUILD
+++ b/main/mosquitto/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mosquitto
-pkgver=1.4.14
-pkgrel=5
+pkgver=1.4.15
+pkgrel=0
pkgdesc="An Open Source MQTT v3.1 Broker"
url="http://mosquitto.org/"
arch="all"
@@ -16,13 +16,15 @@ checkdepends="python2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs++:_pp $pkgname-openrc
$pkgname-libs $pkgname-clients"
source="http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz
- test_broker_makefile.patch
libressl.patch
config.patch
mosquitto.initd"
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
+# 1.4.15-r0:
+# - CVE-2017-7652
+# - CVE-2017-7651
# 1.4.13-r0:
# - CVE-2017-9868
# 1.4.12-r0:
@@ -84,8 +86,7 @@ clients() {
mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/
}
-sha512sums="dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2 mosquitto-1.4.14.tar.gz
-b4c5c4d513c58b24aa5dec11fc3c644d18cc447eed099de77ea518ce1a70f84854b03f242d756462e46067872a89f0c2c49728ff2424a31dc9cac93c5c1e332b test_broker_makefile.patch
+sha512sums="36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100 mosquitto-1.4.15.tar.gz
53859b628f965b77f6e47910c0ceba2f2737b815131ed800dc64a80419e434d25b5ba0938ae645882e9aa5d475d4940c7d35cc6d56f54bc4937a66b32d7db4ad libressl.patch
d5442373ae6ae8bc83eee59b425fbd76e80f905b9fd2bd2ed2a37a7e156fe95a9cf477c9c4dac0975c5fd90e70884de6fb8a16aefcd37b239199d5deae50b7d2 config.patch
16f96d8f7f3a8b06e2b2e04d42d7e0d89a931b52277fc017e4802f7a3bc85aff4dd290b1a0c40382ea8f5568d0ceb7319c031d9be916f346d805231a002b0433 mosquitto.initd"
diff --git a/main/mosquitto/test_broker_makefile.patch b/main/mosquitto/test_broker_makefile.patch
deleted file mode 100644
index afd1889fea..0000000000
--- a/main/mosquitto/test_broker_makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# https://github.com/eclipse/mosquitto/issues/636
---- a/test/broker/Makefile
-+++ b/test/broker/Makefile
-@@ -89,8 +89,10 @@
- ./08-ssl-connect-identity.py
- ./08-ssl-connect-no-identity.py
- ./08-ssl-bridge.py
-+ifeq ($(WITH_TLS_PSK),yes)
- ./08-tls-psk-pub.py
- ./08-tls-psk-bridge.py
-+endif
- endif
-
- 09 :