diff options
| author | Piotr Smolinski <piotr.smolinski@confluent.io> | 2019-08-12 23:57:45 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-08-20 13:50:45 +0000 |
| commit | ad94c4d459d243c0cbbb9b222d5f7cdf8189ab86 (patch) | |
| tree | 06691a19b55777e1aad0a3f79c1ce6ceac0e9ae7 /packaging | |
| parent | 8b8ce52abcf98f44bea025809c75f22224825ecb (diff) | |
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/rpm/wireshark.spec.in | 14 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 9ccb9e1139..0e3236cfa4 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -141,7 +141,7 @@ foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} # Needed for mmdbresolve ${MAXMINDDB_DLL} ) diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index e411c6f5c8..6e600186fb 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -20,7 +20,7 @@ %bcond_with sdjournal %bcond_with guides %bcond_with brotli - +%bcond_with zstd # Set at most one of these two: # Note that setcap requires rpmbuild 4.7.0 or later. @@ -161,6 +161,15 @@ Requires: brotli %endif %endif +%if %{with zstd} +BuildRequires: libzstd-devel +%if 0%{?suse_version} +Requires: libzstd1 +%else +Requires: libzstd +%endif +%endif + # Uncomment these if you want to be sure you get them... #BuildRequires: krb5-devel #BuildRequires: libsmi-devel @@ -497,6 +506,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/wireshark.pc %changelog +* Wed Aug 15 2019 Gerald Combs +- Add zstd + * Mon Apr 22 2019 Daniel Bakai - Added brotli (as an option, defaulting to not required). diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index f261b15b26..c5bba1a17b 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -120,7 +120,7 @@ foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} # Required for mmdbresolve ${MAXMINDDB_DLL} ) @@ -148,7 +148,7 @@ foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} # mmdbresolve ${MAXMINDDB_DLL} ) |