diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-02-09 15:00:19 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-02-13 18:35:47 +0000 |
| commit | 6b84ddee83e70aff944da084129624226b7a32fa (patch) | |
| tree | 7cac052f5b5adb25c301b9974e79a334aa36b13b /macosx-setup.sh | |
| parent | b5610a0436f332c664a91b86cb5326f24601bbf1 (diff) | |
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>
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 2ed1811a3a..aff1d76741 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -118,9 +118,14 @@ LIBSMI_VERSION=0.4.8 # LIBGPG_ERROR_VERSION=1.10 # -# libgcrypt is required for GnuTLS. +# libgcrypt is required. # LIBGCRYPT_VERSION=1.5.0 +# +# GnuTLS is optional. +# Note that since GnuTLS 3.0.8, Libgcrypt can no longer be used and nettle is +# needed (which is not yet installed by this script). +# GNUTLS_VERSION=2.12.19 # Use 5.2.4, not 5.3, for now; lua_bitop.c hasn't been ported to 5.3 # yet, and we need to check for compatibility issues (we'd want Lua @@ -1309,9 +1314,8 @@ install_gnutls() { bzcat gnutls-$GNUTLS_VERSION.tar.bz2 | tar xf - || exit 1 cd gnutls-$GNUTLS_VERSION # - # Use libgcrypt, not nettle. - # XXX - is there some reason to prefer nettle? Or does - # Wireshark directly use libgcrypt routines? + # Use libgcrypt instead of nettle since it is already required by + # Wireshark. # CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure --with-libgcrypt --without-p11-kit || exit 1 make $MAKE_BUILD_OPTS || exit 1 |