aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-11-12 15:09:06 -0800
committerGerald Combs <gerald@wireshark.org>2018-11-14 17:45:12 +0000
commit66b9495b9e9445f59c2fe9af69b405e62e8d910a (patch)
treedca58f5e49fd1f48ab1cb46c663331015823f8e0
parent8dffa1aa20f851d0eeb0b19804c24bd39a879794 (diff)
macos-setup.sh: Update library and tool versions.
Update the following versions: CMake: 3.7.2 to 3.12.4 Qt: 5.9.5 to 5.9.7 (Current LTS) libxml2: 2.9.4 to 2.9.7 (2.9.4 has security issues) c-ares: 1.12.0 to 1.15.0 (1.12.0 has security issues) libssh: 0.7.4 to 0.8.5 (0.7.4 has security issues) Change-Id: Ia97b436981705a4d99c0b0a2f238738e18394d45 Reviewed-on: https://code.wireshark.org/review/30589 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rwxr-xr-xtools/macos-setup.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh
index 6ea0f597cc..4e7847adfc 100755
--- a/tools/macos-setup.sh
+++ b/tools/macos-setup.sh
@@ -68,10 +68,10 @@ LZIP_VERSION=1.19
# in some cases.
#
# So if you're on Lion, we choose version 3.5.2, otherwise we choose
-# version 3.7.2.
+# the latest stable version (currently 3.12.4).
#
if [[ $DARWIN_MAJOR_VERSION -gt 11 ]]; then
- CMAKE_VERSION=${CMAKE_VERSION-3.7.2}
+ CMAKE_VERSION=${CMAKE_VERSION-3.12.4}
else
CMAKE_VERSION=${CMAKE_VERSION-3.5.2}
fi
@@ -113,7 +113,7 @@ LIBGCRYPT_VERSION=1.7.7
# packet data pane; see, for example, Qt bugs QTBUG-31937, QTBUG-41017,
# and QTBUG-43464, all of which seem to be the same bug.
#
-QT_VERSION=${QT_VERSION-5.9.5}
+QT_VERSION=${QT_VERSION-5.9.7}
if [ "$QT_VERSION" ]; then
QT_MAJOR_VERSION="`expr $QT_VERSION : '\([0-9][0-9]*\).*'`"
@@ -151,11 +151,11 @@ fi
# features present in all three versions)
LUA_VERSION=5.2.4
SNAPPY_VERSION=1.1.4
-LIBXML2_VERSION=2.9.4
+LIBXML2_VERSION=2.9.7
LZ4_VERSION=1.7.5
SBC_VERSION=1.3
-CARES_VERSION=1.12.0
-LIBSSH_VERSION=0.7.4
+CARES_VERSION=1.15.0
+LIBSSH_VERSION=0.8.5
# mmdbresolve
MAXMINDDB_VERSION=1.3.2