diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-08-26 15:18:29 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-13 19:26:10 +0000 |
| commit | b1cc056b12702435f6ebdc6ba0a8e17a41e159a0 (patch) | |
| tree | e03028577c61da59952dd3c319aff62faf917a14 /packaging | |
| parent | ad0a016bd2f7f82e4db8bbac13f959ad3bc7ecf4 (diff) | |
| download | wireshark-b1cc056b12702435f6ebdc6ba0a8e17a41e159a0.tar.gz | |
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 10 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index ceef2575f7..341f01828d 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -130,8 +130,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.nsh" "${_config_nsh_contents}") set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh") set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} - ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL} ${LIBSSH_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} + ${NGHTTP2_DLL} ${SMI_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index a9b16c1c26..66af65489b 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -11,6 +11,7 @@ # Set these to 1 if you want to ensure your package includes support for them: %global with_c_ares 1 %global with_portaudio 0 +%global with_nghttp2 1 # Set at most one of these two: # Note that setcap requires rpmbuild 4.7.0 or later. @@ -78,11 +79,17 @@ BuildRequires: c-ares-devel Requires: c-ares %endif %endif + %if %{with lua} BuildRequires: lua-devel < 5.3 Requires: lua < 5.3 %endif +%if %{with_nghttp2} +BuildRequires: libnghttp2-devel +Requires: libnghttp2 +%endif + # Uncomment these if you want to be sure you get them... #BuildRequires: krb5-devel #BuildRequires: libsmi-devel @@ -440,6 +447,9 @@ fi %endif %changelog +* Mon Aug 29 2016 Jeff Morriss +- Add libnghttp2 (as an option, defaulting to required). + * Wed Aug 17 2016 Jeff Morriss - wireshark.pc is now installed with Wireshark, include it in the RPM. diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 2f0c848583..d497f603d2 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -122,8 +122,8 @@ file(APPEND "${_all_manifest_wix}" " <Fragment>\n") file(APPEND "${_all_manifest_wix}" " <DirectoryRef Id=\"INSTALLFOLDER\">\n") SET(unique_component "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} - ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL} ${LIBSSH_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} + ${NGHTTP2_DLL} ${SMI_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") @@ -146,8 +146,8 @@ file(APPEND "${_all_manifest_wix}" " <Fragment>\n") file(APPEND "${_all_manifest_wix}" " <ComponentGroup Id=\"CG.RequiredDependencies\">\n") SET(unique_file "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} - ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL} ${LIBSSH_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} + ${NGHTTP2_DLL} ${SMI_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") |