Commit Graph

102 Commits

Author SHA1 Message Date
Joerg Mayer bf33998a30 Add missing space before ']' 2021-05-30 18:51:02 +02:00
Michael Tuexen 96aa5d9b68 macos-setup.sh: update sparkle 2021-05-29 01:41:15 +02:00
Michael Tuexen a889e8e04b macos-setup.sh: improve arm support
Disable on arm the usage of assember code in nettle and sbc, since this
doesn't compile (yet) on arm platforms.
2021-05-27 14:18:45 +02:00
Michael Tuexen bb327af305 macossetup.sh: fix syntax 2021-05-26 23:21:39 +02:00
Michael Tuexen c1518877fa macossetup.sh: whitespace fix 2021-05-26 23:20:44 +02:00
John Thacker 9bd450f507 macos: Update Python
Update Python from 3.9.3 to 3.9.5, since 3.9.3 was recalled due
to unintentional ABI compatiblity breakage:
(https://bugs.python.org/issue43710)
2021-05-26 03:50:03 +00:00
John Thacker 69244cbb98 macos-setup: Update CMake, Qt, and Python
Update CMake (3.19.7), Qt (5.2.10), and Python (3.9.3) to later bugfix
versions of the current packages. CMake and Python have made tweaks in
the names of the binary packages that support different macOS versions.

Fixes downloading Python 3.9.2+ on macOS 11 after the package suffix
changed from -macos11.0.pkg to -macos11.pkg

Warn about the lack of Qt offline installers for version 5.15 and
greater.
2021-04-05 00:41:41 +00:00
Guy Harris 828b43491c macos-setup: the current Python is 3.9.2.
While we're at it, capitalize "Arm".  (That's how Arm Ltd. is spelling
it now, even in the architecture versions, e.g. "Armv8-A".)
2021-03-26 21:32:31 -07:00
Joerg Mayer 92b3edd798 macos-setup.sh: Starting with major 11, the minor SDK version no longer matters 2021-02-25 07:09:54 +00:00
John Thacker 94488fc509 macos-setup: Require Qt 5.6 or later and macOS 10.8 or later
The minimum required version of Qt is now 5.6, and thus the minimum
required version of macOS is 10.8. Reflect that in macos-setup, and
remove version checks and older packages installed to support
Snow Leopard and Lion.
2021-02-20 19:17:31 +00:00
John Thacker 4c1e0dd1fb macos-setup: Support uninstall of QT versions 5.[10-14].x 2021-01-16 02:32:04 +00:00
John Thacker d612e19767 macos-setup: Allow installing QT 5.14
Allow QT version 5.14.x to be installed (if specified as a variable
on the command line.) Remove the ability to install 5.2.x, as QT 5.3
has been the minimum required version since the Wireshark 3.4 branch.
Note that QT no longer providers offline installers for the free releases
of 5.15 and later, so we'll have to come up with a different method.
(See http://download.qt.io/archive/qt/5.15/5.15.0/OFFLINE_README.txt
and https://www.qt.io/blog/qt-offering-changes-2020 )
2021-01-11 21:32:22 +00:00
John Thacker eff595db67 macos-setup: Update Python for Big Sur and Apple Silicon (arm)
Python 3.9.1 is the first version of Python to support Big Sur and
Apple Silicon (https://www.python.org/downloads/release/python-391/),
and Python 3.7.6 is the last version with a 64-bit/32-bit binary installer
for macOS X 10.6 (Snow Leopard) to 10.8 (Mountain Lion) provided.
2021-01-08 12:04:24 +00:00
John Thacker d74bfc569e macos-setup: Update CMake for Apple Silicon
Apple Silicon requires CMake 3.19.2, but the binaries provided
for 3.19.2 only run on MacOS 10.10 and later, so we have more
bifurcation of the CMake we try to install. Get rid of some of
the old 2.x paths to compensate.
2021-01-05 22:00:58 +00:00
John Thacker 3506735f08 macos: Clarify when xz support was added to tar
OS X 10.9 (https://opensource.apple.com/release/os-x-109.html) ships
with libarchive-29, which is compiled with LZMA/xz support; its default
[bsd]tar has xz support.  (Look for HAVE_LIBLZMA in config.h in
https://opensource.apple.com/source/libarchive/libarchive-29/)
OS X 10.8 (https://opensource.apple.com/release/mac-os-x-1084.html)
does not have xz support. Clarify the comment in case in the future
we decide we don't need to install xz-utils once the minimum macOS
version is 10.9 or greater.
2021-01-02 19:44:01 +00:00
Michael Tuexen f918c3372c Bump Qt version to match what is used on the MacOS buildbot 2020-12-27 17:04:13 +01:00
Guy Harris f3dc269df6 macos-setup: work around a botch in GLib "make distclean".
[skip ci]
2020-12-19 14:21:15 -08:00
Guy Harris 8b0d19c634 macos-setup: explain why we're running autoreconf on minizip.
[skip ci]
2020-12-18 23:53:47 -08:00
Guy Harris 0cdbdcc5a4 macos-setup: fix the name of the -done file for Minizip.
It's minizip-$installed_minizip_version-done, not
zlib-$installed_minizip_version-done; the tarball is
zlib-$installed_minizip_version.tar.gz, because it's a contributed file
in the zlib package, but we don't use zlib in the name of the -done
file.

[skip ci]
2020-12-18 23:45:28 -08:00
Guy Harris 806f524a10 macos-setup: do "make clean", not "make distclean", for zstd.
It has no configure script, so there's no need for "make distclean", and
the Makefile supplied with it has no "make distclean" rule; just do
"make clean".

[skip ci]
2020-12-18 23:19:40 -08:00
Guy Harris 1949b6a5ee macos-setup: don't configure p11-kit to use libffi.
See comment for an explanation.
2020-12-17 21:45:14 +00:00
Guy Harris 2db0c64034 macos-setup: remove tabs.
Consistenly use spaces for indentation.
2020-12-17 12:43:43 -08:00
Guy Harris ca13c3ce49 macos-setup: get rid of a debugging "set -x". 2020-12-16 23:23:13 -08:00
Guy Harris 9fbf79c045 macos-setup: various cleanups.
In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".
2020-12-16 18:14:30 -08:00
Guy Harris 190442d76e macos-setup: set SDKROOT when running xcrun.
That lets it find the right SDK path if you're not using the default
SDK.
2020-12-16 14:09:22 -08:00
Guy Harris f2af1ea66d macos-setup: fix uninstallation of libtasn1.
Fix a copy-and-pasteo.
2020-12-16 11:54:53 -08:00
Guy Harris 02c5f50009 macos-setup: more cleanups.
Fix/update/expand some comments.

Do uninstalls for dependencies using CMake more similarly.

For LZ4, as it comes with a Makefile rather than any
autotools/CMake/etc. configuration, "make distclean" might not be
necessary, so, as it's not supported, just do "make clean".

For libssh, do all removes in the uninstall in a single command, and use
$DO_RM, so that it uses sudo iff /usr/local isn't writable by us.  In
addition, remove the build directory as the equivalent of "make
distclean".

As with libssh, so with brotli.
2020-12-13 00:44:24 -08:00
Guy Harris 7d01e3a74e macos-setup: clean up uninstallation of snappy.
For a CMake build done in a subdirectory of the source directory, the
equivalent of "make distclean" is "rm -rf {that subdirectory}".  Make it
so.

When uninstalling the stuff snappy installs with "rm -rf", use $DO_RM,
so it's done with sudo iff /usr/local isn't writable by us, just as
"make uninstall" is done with $DO_MAKE_UNINSTALL so it's done with sudo
iff /usr/local isn't writable by us.

Fix up the list of what to remove, now that we're building snappy as a
shared library, so that it removes shared libraries rather than the
non-existent static library.

Update a comment while we're at it, as Lua isn't the only dependency
that doesn't support "make uninstall".
2020-12-12 23:47:27 -08:00
Guy Harris e92119c608 macos-setup: build snappy as a shared library.
The older versions of snappy apparently used autotools and build a
shared library by default; for example, Wireshark 3.2.6 for macOS is
built with snappy, and includes a snappy dynamic library in the app
bundle.

The current version uses CMake and does *not* build a shared library by
default.  Instead, it builds a static library, which, when you try to
link it to a C-only shared library...

...does not work.

The linker sees that you're statically linking in a bunch of C++ .o
files and gets upset because it can't find C++ standard library routines
used by that code.

If it's a dynamic library, the library was itself already linked with
the C++ standard library, so the external references to that library
from the snappy library are already marked as having been resolved to
the extent that they're expected to be in the C++ standard library at
run time - and, when the dynamic snappy library is built, it's marked as
depending on the C++ standard library, so the run time linker will, when
it loads the snappy dynamic library, see that the C++ standard library
is required and will load it if it hasn't already been loaded.
2020-12-12 21:30:51 -08:00
Guy Harris 504f2ea42a Snappy uses CMake, and they didn't bother to provide an unintall target.
Or a distclean target, for that matter.

Do the best we can.

(libpcap and tcpdump support both autotools and CMake, and Wireshark
uses only CMake; all of them support an uninstall target in CMake.  Go
forth, read what they did, and sin no more.)
2020-12-12 15:51:10 -08:00
Guy Harris 2ecb606142 Work around more NeXTStEP-induced pain.
GNU libtool has a libtool program and a libtoolize program.

The development tools for NeXTStEP, apparently, had a libtool program as
well, and the current version of the development tools for the current
version of NeXTStEP, generally known as "Xcode for macOS", still have
that program.

This means that we do some renaming after installing GNU libtool, so
that its "libtool" becomes "glibtool" and its "libtoolize" becomes
"glibtoolize".

That meant we had to compensate for that when running autoreconf when
building and installing minizip.

It turns out we have to do that when running autogen.sh when building
and installing GLib as well.
2020-12-12 21:59:59 +00:00
John Thacker fe1f947540 macOS: Enable PKCS #11 support when building with macos-setup.sh
Enable PKCS #11 support in macOS builds with macos-setup.sh (already
supported on macOS via Homebrew and on all other OSes with GnuTLS 3.4
or greater) by installing p11-kit (and its dependency libtasn1) and
building nettle and GnuTLS against it.
2020-12-02 07:55:42 +00:00
Joerg Mayer 77e9d7d3f9 macos-setup.sh: Update various software versions
Update versions of xz, lzip, gettext, libgpg, libgpg-error, libgcrypt, gnutls and gmp
to newest releases.

Also update glib but only to last version with autotools support - meson build is left
for another time.

Current versions of glib require a libpcre with unicode enabled which the Catalina system
version does not provide, so install the current version of libpcre as well.

Update some additional tools to commit 3a42bf0de2b9e35efcc3cea38153ab95cb71b352:
brotli, libmaxminddb, lz4, and snappy
2020-12-01 21:54:09 +00:00
Guy Harris 8e2815bfc0 Don't assume macOS version numbers are of the form 10.N.
Big Sur goes to 11, and it appears that next year's (San Juan Capistrano?)
will go to 12, and so on.

Split version numbers into major and minor, and do version-number
comparison (alas, whilst CMake has that built in, the Bourne shell
doesn't, and neither does the Bourne-again shell).

This should fix issue #17043.
2020-11-25 18:23:28 -08:00
Lin Sun 6136c719da RTP: opus playback
It's possible to play opus payload with libopus (https://opus-codec.org/).
Closes #16882.

Helped-by: Pascal Quantin <pascal.quantin@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-10-03 21:15:09 +00:00
Guy Harris e013c5ec7f Clean up URLs.
Add ui/urls.h to define some URLs on various of our websites.  Use the
GitLab URL for the wiki.  Add a macro to generate wiki URLs.

Update wiki URLs in comments etc.

Use the #defined URL for the docs page in
WelcomePage::on_helpLabel_clicked; that removes the last user of
topic_online_url(), so get rid of it and swallow it up into
topic_action_url().
2020-10-02 20:13:42 -07:00
Gerald Combs d6d4f71f29 macos-setup: Add iLBC.
Change-Id: Ibdea3918a24b4c248fd5f3d524b8546e917e4ea0
Reviewed-on: https://code.wireshark.org/review/37356
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2020-06-13 09:50:05 +00:00
Joerg Mayer ec65f1d9e2 macos-setup.sh: Update GNUTLS, NETTLE and GMP versions
Fix patch location for non-default build directory

Change-Id: I8454e77de1cec53609bd7ab7f565b06b1ad79923
Reviewed-on: https://code.wireshark.org/review/37325
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2020-06-13 09:22:56 +00:00
Gerald Combs ae1d569322 macos-setup: Update Gcrypt to 1.8.5.
This is required for WireGuard decryption.

Change-Id: I8d27ac198a8bac161c1675e87c3685c8d73c9246
Reviewed-on: https://code.wireshark.org/review/36129
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-02-18 23:54:26 +00:00
Joerg Mayer fc0cca0911 macos-setup.sh: Add SpeexDSP setup and install
Change-Id: I3558d398970d919b8e12992ad4c97789aac79129
Reviewed-on: https://code.wireshark.org/review/35785
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2020-01-17 13:11:44 +00:00
Joerg Mayer 0468ead898 macos-setup.sh: Sparkle setup fixes
- mkdir on macos 10.14.6 doesn't have a -f parameter
- set file ownership on tar extraction

Change-Id: I5d6341aba02b56abe0c1aa48e68c4c1b6af15379
Reviewed-on: https://code.wireshark.org/review/35115
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-11-18 11:26:29 +00:00
Gerald Combs 02057200fd macOS: Add support for automatic updates using Sparkle.
Add support for automatic updates using the Sparkle framework. Add
FindSparkle.cmake and associated CMake plumbing. Add a public key and
other info to Info.plist.in. Add ui/macosx/sparkle_bridge.{h,m}, which
wraps the Sparkle API. Make code that's specific to WinSparkle
Windows-only.

Add Sparkle installation steps to the macos-setup scripts. Sparkle
prints a warning if your bundle is unsigned (which is the case during
development) so disable installing it by default.

Updating here takes a long time. We might be able to fix that by
shipping our DSYMs separately.

Change-Id: I6cc6671db5657dadc514bda6bf6e1c8bbc9468a5
Reviewed-on: https://code.wireshark.org/review/35090
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15 18:39:04 +00:00
Guy Harris 9f374047ad We don't compile Qt, we just install a binary.
Change-Id: Ieeaa2b393775ae58782c0f2447b51fd068ffc185
Reviewed-on: https://code.wireshark.org/review/34763
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-10-13 04:26:36 +00:00
Joerg Mayer 0cadd7e4ed Update qt 5.12.1 -> 5.12.4 and update a comment (twice)
Change-Id: I2eab2f73305918a354b8b9b9c5616ef290a40284
Reviewed-on: https://code.wireshark.org/review/34733
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-10-08 15:36:52 +00:00
Joerg Mayer 723433f750 Update ASCIIDOCTOR to current version(s)
Change-Id: Ieb87169ffc7dae709954e2f361202cec88d3dedb
Reviewed-on: https://code.wireshark.org/review/34732
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-10-08 15:34:30 +00:00
Gerald Combs a97c157d0d macos-setup: Add minizip.
Change-Id: I4f668e8a61e62f3c50ad9d39747c0d73b0196c55
Reviewed-on: https://code.wireshark.org/review/34556
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-19 18:25:11 +00:00
Gerald Combs 8428d8f899 macos-setup: Rename libtool* at configure time.
Pass --program-prefix=g to configure, similar to Homebrew's libtool
formula.

Change-Id: I556a0abd0e2715704ddaf4bb94bd5f22dd310d5a
Reviewed-on: https://code.wireshark.org/review/34560
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-18 21:52:11 +00:00
Alexis La Goutte 27ebed0a5c macos-setup: Update to libssh 0.9.0
Bug: 16032
Change-Id: Iaf9a58f76cef7906e00c1f3c3fecf51260b627a5
Reviewed-on: https://code.wireshark.org/review/34477
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-11 15:14:12 +00:00
Piotr Smolinski ad94c4d459 Kafka: include zstd compression in Kafka message batches
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777
Reviewed-on: https://code.wireshark.org/review/34222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-20 13:50:45 +00:00
Gerald Combs b48b1c0e80 macos-setup: Update nghttp2 to 1.39.2.
1.39.2 fixes CVE-2019-9511 and CVE-2019-9513.

Change-Id: Id8f8ed52769522671ffc80c90014cf3b4c6f38ec
Reviewed-on: https://code.wireshark.org/review/34287
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-14 21:39:26 +00:00