Commit Graph

144 Commits

Author SHA1 Message Date
Ahmad Fatoum d25c33cc0b macosx-setup.sh: Skip downloading GMP if downloaded before
We were downloading gmp-*.lz, but checking for gmp-*.gz instead.

Change-Id: I3c9a29400d389555db7b5f003919ce22aaacf3a1
Reviewed-on: https://code.wireshark.org/review/22338
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-22 07:01:22 +00:00
Guy Harris d01e9df472 Put the {un}install_XXX() definitions in the right order.
Put them in the same order as the order in which the _VERSION values are
defined and in which they're invoked.

Similarly, do the "make sure we have the requested version installed"
tests in the same order as the un-installation order (which is the
reverse of the installation order).

Change-Id: I0e2bd1d249832090c3d81bacfe010de19de54cdf
Reviewed-on: https://code.wireshark.org/review/22158
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16 07:38:30 +00:00
Guy Harris 2486b7e8fa Move libgcrypt and libgpg-error to the set of required libraries.
We now require libgcrypt, and libgcrypt requires libgpg-error.

Change-Id: Ifdf40acb11fef84485310321523500b1396736b6
Reviewed-on: https://code.wireshark.org/review/22157
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16 07:31:44 +00:00
Guy Harris 0ad7607478 Update to newer versions of libgcrypt and GnuTLS.
We want a newer version of libgcrypt to get additional crypto functions.
Update to the current release, 1.7.7.

Update to the current release of libgpg-error, 1.27, while we're at it.

Update to the current "stable" version of GnuTLS, 3.4.17; 2.12.19
doesn't work with libgcrypt 1.7.7.  3.4.17 requires Nettle, and Nettle
requires GMP, so, if we're building with GnuTLS, download and install
the current versions of Nettle and GMP.

GMP requires lzip, so download and install it as well.

Clean up some "version >= x.y.z" checks to check the major version
number in all cases.

Change-Id: I39cccd34e0d7f49ac35b0bbacdab03251d42a1de
Reviewed-on: https://code.wireshark.org/review/22156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16 07:20:30 +00:00
Guy Harris 5bda98586b Don't add /usr/X11/lib/pkgconfig if we're not using GTK+.
Qt for macOS doesn't use X11, so you don't need X11.

Change-Id: Ibc09a2d802f21b5be38baf735d2f6d582d6bf41f
Reviewed-on: https://code.wireshark.org/review/21401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-29 03:00:50 +00:00
Ahmad Fatoum cb018b4cc6 macosx-setup.sh: Allow downloading packages without installation
For offline installation, or for checking if all links are working

Change-Id: I0447d99b2accf6757b944a02a682b3ee7ed63846
Reviewed-on: https://code.wireshark.org/review/21223
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-19 19:22:45 +00:00
Ahmad Fatoum cfab5ef035 Add libxml2 as optional dependency
This can be used by dissectors that need to parse out-of-band
configuration.

Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Reviewed-on: https://code.wireshark.org/review/20912
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-19 10:41:55 +00:00
Guy Harris 3fefb19168 Update to GeoIP 1.6.10.
That's the most recent version of the GeoIP legacy API.

GeoIP 1.6.1, and later, are available from GitHub, but not from
MaxMind's Web site.

Change-Id: I67b1b5b47761beac2fc303e18e39d9accac86e3b
Reviewed-on: https://code.wireshark.org/review/21081
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-13 21:48:07 +00:00
Guy Harris 1f94d34f43 Update comments.
The OS is now called macOS.

In newer versions of macOS, tar can uncompress xz'ed tarballs, but older
versions don't support that.

Change-Id: Ife8ac7fc7da69586ad6b718def4a52588740686b
Reviewed-on: https://code.wireshark.org/review/20931
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 17:51:34 +00:00
Ahmad Fatoum 71905a34b7 Follow HTTP redirects when fetching tarballs in macosx-setup.sh
xz now hosts older releases on SourceForge and does a 302 redirect
to SourceForge, which cURL without -L won't follow.
The default value of 50 redirects before giving up is left unchanged.

Change-Id: I2d73301f025737ad84438d01a445fe6f257ba9d5
Reviewed-on: https://code.wireshark.org/review/20926
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 17:44:51 +00:00
Joerg Mayer 993e0989f9 Change Qt setup from 5.5.0 to 5.8.0
Change-Id: Ic98922a9e3bf784487512c28921eb5c7d9914e53
Reviewed-on: https://code.wireshark.org/review/19962
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-13 22:02:31 +00:00
Peter Wu 6b84ddee83 Make Libgcrypt a mandatory dependency
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to
error out if it is not available. Update release notes, developer
documentation and README with the new status. Clarify relation with
GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script.

Motivation for this change is that many dissectors depend on Libgcrypt
and having it optional increases the maintenance burden (there have been
several compile issues in the past due to the optional status).
Furthermore, wsutil has crypto code that can be replaced by Libgcrypt.

Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f
Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
Reviewed-on: https://code.wireshark.org/review/20030
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-13 18:35:47 +00:00
Joerg Mayer fe72fe0ca7 Don't provide GTK setup by default.
Update comments to reflect the behaviour as well.

Update comment inside the

Change-Id: Id3629b217a2adc096fd6b0cb0221270e92ebd5da
Reviewed-on: https://code.wireshark.org/review/19875
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-01-31 23:21:22 +00:00
Joerg Mayer 5ec8186268 Add snappy compression library setup
Change-Id: I060d3056dc386f44aec703ddd0fe024866a51fcf
Reviewed-on: https://code.wireshark.org/review/18611
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-11-02 06:00:01 +00:00
Joerg Mayer 21b4de0e19 Add lz4 setup.
Change-Id: If3b51e719a0a745eac0862f882b912e1d0f72587
Reviewed-on: https://code.wireshark.org/review/18608
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-11-02 00:54:47 +00:00
Guy Harris 211f321f85 Update libssh to 0.7.3.
Also, don't try to uninstall it, as CMake helpfully provides no
uninstall target.

Change-Id: I936a8adeecc3c1f0ca71d044467846ffc33ae7b2
Reviewed-on: https://code.wireshark.org/review/18574
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30 09:09:01 +00:00
Joerg Mayer 1e69a5e569 Support setting up sbc on macOS.
Not tested with an actual capture file.
Should not be too hard to get this working on Windows as well.

Change-Id: Iae4b744361f0c4b62e919ad77e3d2b69ba45a8f3
Reviewed-on: https://code.wireshark.org/review/18331
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-20 09:03:53 +00:00
Joerg Mayer 632b7d19d7 Fix typo in a message
Change-Id: Ic1651c4ff0fd7ba7f13cd52b596f3d54cf6c3e00
Reviewed-on: https://code.wireshark.org/review/18245
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17 13:48:32 +00:00
Balint Reczey b1cc056b12 Remove nghttp2 code and use system' nghttp2
Update debian, macos (setup / homebrew) download script
Update testsuite (don't try HPACK when build without nghttp2)

Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112
Reviewed-on: https://code.wireshark.org/review/17347
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13 19:26:10 +00:00
Gerald Combs 5f69295c47 macosx-setup: Upgrade c-ares to 1.12.0.
Change the download protocol to https as well.

Change-Id: Id2043141d3b89449f2a0c739c05142af0a7b46ba
Reviewed-on: https://code.wireshark.org/review/17983
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-29 17:32:20 +00:00
Guy Harris 76d97c39c9 Fix the "do we have Xcode?" test for older versions of Xcode.
Change-Id: I35853b6cb2985bf9bc36175ec8085929e66db349
Reviewed-on: https://code.wireshark.org/review/17872
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22 20:54:40 +00:00
Guy Harris 46595f4ad0 Point people to the Mac App Store for Xcode.
Don't give a URL that doesn't work any more.

Change-Id: I3d2dbef2dda4a96aff9382e687eb8eb64218d14d
Reviewed-on: https://code.wireshark.org/review/17859
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22 10:11:59 +00:00
Guy Harris 4e53f5d975 Make it detect command-line-toos-only installations.
/usr/bin/xcodebuild is present, but appears not to work, if you have
only the command-line tools for Xcode 8 installed, not Xcode 8 itself.

Change-Id: I4a55e30f8afcc7e575e661d2b4ea944c967790ec
Reviewed-on: https://code.wireshark.org/review/17856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22 10:00:40 +00:00
Guy Harris bf95ccca2e Don't mention a particular version of XQuartz.
The version we were using is out of date and, because we don't download
it in the script, we don't *need* the version, we can just point people
to http://www.xquartz.org.

Change-Id: I049e55c11a6877a1ad888288a157cc8527740b16
Reviewed-on: https://code.wireshark.org/review/17850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-22 03:49:09 +00:00
Guy Harris 3d7524c206 Fix a test to work with Xcode 8.
(Hopefully it still does what it's supposed to; I don't have any
machine, real or virtual, that has the command-line tools installed
without Xcode being installed on which to test it.)

Change-Id: I0ce8ce4f8532fcc6ab121641dde238180dfa69ce
Reviewed-on: https://code.wireshark.org/review/17704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-15 00:06:53 +00:00
Guy Harris e812c0e384 Update to Lua 5.2.4.
Change-Id: Icadf4001799a58c5bc686caff4ffa99289bf08a8
Reviewed-on: https://code.wireshark.org/review/16980
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-09 19:51:34 +00:00
Guy Harris 3e48148e1e Upgrade to libtool 2.4.6.
As per bug 12689, earlier versions of libtool had a bug wherein they
assumed a 1-digit second component of the OS version number, and thought
OS X 10.10 was OS X 10.1 and used the wrong linker flags.  A build from
Git would succeed, but a build from the source tarball wouldn't.

Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05
Ping-Bug: 12689
Reviewed-on: https://code.wireshark.org/review/16773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-29 20:22:09 +00:00
Guy Harris c873c0bef3 Install GNU autotools even on Snow Leopard.
The Snow Leopard versions are too old for current Wireshark.

Change-Id: I25936370164d69d6b0eaca4ac9e3253772e0ac73
Reviewed-on: https://code.wireshark.org/review/14712
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-30 21:30:58 +00:00
Guy Harris 0c6959837a HTTPS is now needed to download the pkg-config source.
Bug: 12214
Change-Id: Ic23632d19733b7504dcde3735af36942803ceac9
Reviewed-on: https://code.wireshark.org/review/14272
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01 23:44:46 +00:00
Guy Harris c3b84afa1e Update the current XZ version.
5.0.4 is no longer available; the current version is 5.0.8.

Change-Id: I982a4809ae87362837561297967a8eb63485676c
Ping-Bug: 12214
Reviewed-on: https://code.wireshark.org/review/14257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01 04:20:33 +00:00
Michael Tüxen 088f57fa9b Add support for libssh.
Change-Id: Iffb0ea15c76659f5c1f73e2b7b11bcfdeb859c6a
Reviewed-on: https://code.wireshark.org/review/13925
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2016-02-13 20:06:41 +00:00
Joerg Mayer 945251627e Update PNG_VERSION to the only version that actually exists.
At least with Qt5.5.1 there is no duplicate clang_64 in the qt path.

Change-Id: I2ac66f246b3c9dbe2155ee8394d31e7d560faaf9
Reviewed-on: https://code.wireshark.org/review/13000
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-01-02 00:11:21 +00:00
Guy Harris cefe1881b2 Expand a comment.
Also fix the capitalization of "Qt", and don't have a commented-out
definition of GTK_VERSION to 3.5.2; if you want GTK+ 3.5.2, you'd do it
by setting the environment variable GTK_VERSION to 3.5.2 when running
the script.

Change-Id: I71a5d8caf87c08a5f98730aea65f994aff611590
Reviewed-on: https://code.wireshark.org/review/12939
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-30 01:42:04 +00:00
Joerg Mayer d1149414de CMake updates
- make CMAKE_VERSION configurable via environment variable
- Fix download URL (no www. and httpS)

Change-Id: Id347b2f837d26063d889667f69bb1b4418e8e86d
Reviewed-on: https://code.wireshark.org/review/12934
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-12-29 23:18:55 +00:00
Joerg Mayer 41ba1d7995 Allow overriding of the GTK and QT versions without modifying the script.
Change-Id: I6e43845ee199232b53887d970996ca273564338c
Reviewed-on: https://code.wireshark.org/review/12923
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-12-29 23:12:43 +00:00
Guy Harris 83abbfe2c2 Build Lua with all the appropriate flags.
It doesn't use a configure script, so we have to pass in -arch flags,
minimum version flags, "where's the SDK" flags, etc. by setting MYCFLAGS
and MYLDFLAGS for the make, rather than for the configure script.

Change-Id: I8c95851051cd2a9ddd7a9caf6faccd2e9fd2b4a7
Reviewed-on: https://code.wireshark.org/review/10995
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-14 05:19:55 +00:00
Guy Harris ae6df90c61 On 10.5, don't set GTK+ etc. versions if we haven't already set them.
When building for 10.5, if the version numbers of GTK+ and its support
libraries haven't been set, don't override the settings to get older
versions; that way, if you've changed macosx-setup.sh not to bother
installing GTK+, this won't force it to be installed.

Change-Id: Ia05f45fb6bd469b568a28a8769f3130a99180d7e
Reviewed-on: https://code.wireshark.org/review/10945
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11 23:39:01 +00:00
Guy Harris a6673b3fde Handle installing Qt 4.x.
Or, at least, 4.8.6.  I guess they had to do an updated build or
something, as the actual dmg has "4.8.6-1", so handle that extra
versioning.

Clean up some white space while we're at it.

Change-Id: I62b99dd99e7e5cb84cca68bdc59b02e4bf65411f
Reviewed-on: https://code.wireshark.org/review/10943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-11 21:36:18 +00:00
Guy Harris 9cf43d88a4 It's "-Wno-XXX", not "-WnoXXX".
Change-Id: I90ac4872e2a792dac07a6c12c8f059795f7f6bc3
Reviewed-on: https://code.wireshark.org/review/10712
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-30 22:24:47 +00:00
Guy Harris df7281064b Another big hammer to shut Apple's deprecation squealing up.
Change-Id: Ifeb37566468fca0afceab1d74baa23fd05a46057
Reviewed-on: https://code.wireshark.org/review/10711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-30 22:21:20 +00:00
Guy Harris ec1e099dc0 Note the Qt bugs about the broken .pc files.
Change-Id: I050caef2a20b0c6c567f810465a3bcfe40b04a11
Reviewed-on: https://code.wireshark.org/review/9603
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-11 21:36:07 +00:00
Guy Harris 0bcbb2c20b Update to Qt 5.5.0, to fix context menu issues.
This requires still *more* .pc file fixes.

Change-Id: I74a385e272063b3342a29122c87331bc8191f7f5
Ping-Bug: 11355
Reviewed-on: https://code.wireshark.org/review/9601
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-11 21:16:02 +00:00
Joerg Mayer d4bdbb971e 1.5.17 seems to be a typo. Change it to the probably intended 1.6.17
Change-Id: I43fc4962e1fdc9fb264b313afd3f5612de42116a
Reviewed-on: https://code.wireshark.org/review/9196
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-28 10:53:55 +00:00
Joerg Mayer 4975c068b5 Disabling GTK by default in the official source was not intentional
(but maybe it should be).

Change-Id: I9dba032951265204e1ced517ad7eb331ec71a6a2
Reviewed-on: https://code.wireshark.org/review/9167
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-26 06:51:02 +00:00
Joerg Mayer 227f0af79c Make autotools install optional.
Reformat build and install instructions at the end a bit.

Change-Id: I0f6be9e4b58f3987615abcec6521f59ba33b3b0a
Reviewed-on: https://code.wireshark.org/review/9166
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-26 00:23:44 +00:00
Joerg Mayer 58b03547f1 Add a bunch of " I missed in my previous patch.
Change-Id: Ia94034bdb2148bca641b7c9bc6ec3f900c7574d3
Reviewed-on: https://code.wireshark.org/review/9097
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-24 17:47:14 +00:00
Joerg Mayer ae92a8347e Update build instructions for cmake near the end a bit
Change-Id: I7d5b8ab3479cc4268b6cc5ae7822066a69b740dc
Reviewed-on: https://code.wireshark.org/review/9085
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-24 02:31:15 +00:00
Guy Harris 14252551b2 Handle downloading and installing CMake 3.x.
Change-Id: I2347e3e36008fee006e9f66997d45b562eacc7dc
Reviewed-on: https://code.wireshark.org/review/9084
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-24 02:09:35 +00:00
Guy Harris 9992063c6f Download the Qt dmg and just do a binary installation.
That's a *lot* faster than building from source.

That means we should suggest adding the Qt pkg-config directory to
PKG_CONFIG_PATH; do so.

Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e
Reviewed-on: https://code.wireshark.org/review/8105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17 06:19:48 +00:00
Guy Harris a0254ff9d4 Mount the CMake dmg we downloaded, don't download it again.
Amazingly, "hdiutil attach" can take a URL as an argument; it will
attempt to download the file in question and mount it.  We've already
downloaded the file, so there's no point in downloading it again
(especially not with a URL with "v2.8" coded in).

Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297
Reviewed-on: https://code.wireshark.org/review/8103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17 01:58:57 +00:00