aboutsummaryrefslogtreecommitdiffstats
path: root/main/mosquitto/config.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-09-27 11:32:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-09-27 11:32:44 +0000
commit1010882df397e3c8f889b1f5bc658e870d5f52a6 (patch)
tree878ae6d7dcb99ffa48214642c04ee616be3c348f /main/mosquitto/config.patch
parent609fbb0235cf6440f5d502885c4e0531c835aed7 (diff)
downloadaports-1010882df397e3c8f889b1f5bc658e870d5f52a6.tar.bz2
aports-1010882df397e3c8f889b1f5bc658e870d5f52a6.tar.xz
main/mosquitto: security upgrade to 1.5.3 (CVE-2018-12543)
Diffstat (limited to 'main/mosquitto/config.patch')
-rw-r--r--main/mosquitto/config.patch29
1 files changed, 11 insertions, 18 deletions
diff --git a/main/mosquitto/config.patch b/main/mosquitto/config.patch
index a88d35366b..a070427ddb 100644
--- a/main/mosquitto/config.patch
+++ b/main/mosquitto/config.patch
@@ -1,15 +1,17 @@
---- ./config.mk.orig
-+++ ./config.mk
-@@ -26,7 +26,7 @@
+diff --git a/config.mk b/config.mk
+index 46ffb6d..4e7b31d 100644
+--- a/config.mk
++++ b/config.mk
+@@ -26,7 +26,7 @@ WITH_TLS:=yes
# Comment out to disable TLS/PSK support in the broker and client. Requires
# WITH_TLS=yes.
# This must be disabled if using openssl < 1.0.
-WITH_TLS_PSK:=yes
+WITH_TLS_PSK:=no
- # Comment out to disable client client threading support.
+ # Comment out to disable client threading support.
WITH_THREADING:=yes
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ WITH_PERSISTENCE:=yes
# Comment out to remove memory tracking support from the broker. If disabled,
# mosquitto won't track heap memory usage nor export '$SYS/broker/heap/current
# size', but will use slightly less memory and CPU time.
@@ -18,7 +20,7 @@
# Compile with database upgrading support? If disabled, mosquitto won't
# automatically upgrade old database versions.
-@@ -65,7 +65,7 @@
+@@ -69,7 +69,7 @@ WITH_SRV:=no
WITH_UUID:=yes
# Build with websockets support on the broker.
@@ -27,20 +29,11 @@
# Use elliptic keys in broker
WITH_EC:=yes
-@@ -78,6 +78,7 @@
+@@ -88,6 +88,7 @@ WITH_STATIC_LIBRARIES:=no
# Build with async dns lookup support for bridges (temporary). Requires glibc.
#WITH_ADNS:=yes
+WITH_ADNS=no
- # =============================================================================
- # End of user configuration
-@@ -249,7 +250,7 @@
- endif
-
- INSTALL?=install
--prefix=/usr/local
-+prefix=/usr
- mandir=${prefix}/share/man
- localedir=${prefix}/share/locale
- STRIP?=strip
+ # Build with epoll support.
+ WITH_EPOLL:=yes