aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2019-01-23Windows: upgrade Npcap to 0.99-r9Pascal Quantin1-4/+4
Change-Id: Ie2b90a448415d7b8637aac03cee07fa9e5ab217f Reviewed-on: https://code.wireshark.org/review/31691 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-18Windows: upgrade libxml2 to 2.9.9Pascal Quantin1-5/+5
Change-Id: I0496974b09e9183879e2f1421e69aab06040d23a Reviewed-on: https://code.wireshark.org/review/31585 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-18macos-setup.sh: Bump our libxml2 version.Gerald Combs1-1/+1
Libxml2 2.9.9 was recently released and fixes a couple of security flaws. Change-Id: I59865a35c97e05d7bf41ca9b7688c3dd89507a66 Reviewed-on: https://code.wireshark.org/review/31578 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-17make-version.pl: Add a comment about version.h.Gerald Combs1-0/+3
Note that we might want to give CMakeLists.txt the ability to generate version.h independently. Change-Id: I4864504790aee4c40805f5ae3584db027a2762f5 Reviewed-on: https://code.wireshark.org/review/31569 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-15make-version.pl updates.Gerald Combs1-152/+185
Read our major, minor, and micro versions from CMakeLists.txt. Add the ability to set our extra version information differently if our Git commit is tagged or untagged. Change our extra version placeholder from "%#" to "{vcsinfo}". Add --tagged-version-extra (-t) and --untagged-version-extra (-u) arguments for specifying the tagged and untagged extra formats. Add --force-extra (-f) so that we can force one format or the other. Require the major.minor.micro version to be specified when using --set-version (-v). Update appveyor.yml and the Developer's Guide to match the new behavior. Change-Id: I6e5d55470aff7e7c61e75f208e24c4105276905a Reviewed-on: https://code.wireshark.org/review/31479 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-14Windows: Use a c-ares DLL built with vcpkg.Gerald Combs1-4/+4
Update the Windows build environment to use c-ares packages built from a VS 2017 command prompt with set CARES_VERSION=1.15.0 vcpkg install c-ares:x86-windows c-ares:x64-windows vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip The packages also include a PDB, so copy it to the build directory and add it to the PDB .zip. Change-Id: I1887ca89d897bea184144315219b366096519961 Reviewed-on: https://code.wireshark.org/review/31376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-14RPM: remove dependency on the which utilityPeter Wu1-6/+8
It is not necessary to know the full path to a program. Instead use the 'type' shell builtin (part of POSIX) to detect availability. Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80 Reviewed-on: https://code.wireshark.org/review/31540 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-14tarball+RPM: Fetch our version from CMake.Gerald Combs1-85/+0
Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-13tools/gitlab-ci: add missing packages for rpm builds.Dario Lombardo1-0/+3
Change-Id: I04e3414ff27e18db8c83581116f4099bbb696a08 Reviewed-on: https://code.wireshark.org/review/31516 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-12travis: initial Windows support with non-interactive Qt installerPeter Wu1-0/+92
The current preview release of Windows support on Travis lacks many packages (like Qt and Python 3) and is very much tied to git-bash (unlike AppVeyor which has a more native Windows experience). Several workarounds were necessary, such as reimplementing refreshenv, setting CMAKE_PROGRAM_PATH) and setting a supported language. See also https://travis-ci.community/t/feedback-from-windows-integration-for-a-cmake-qt-c-python-perl-project/1706 I wrote the Qt installer script originally for Qt 5.6, ported it to Qt 5.9.5 and finally updated it for 5.12, some comments could be outdated. Duration as measured for one x64 build: - 3m00s - restore cache (Qt and wireshark-libs) - 2m22s - choco install - 0m8s - pip install - 2m20s - cmake - 18m5s - build all - 0m20s - build test-programs - 5m34s - pytest -v - 2m46s - store cache (Qt and wireshark-libs) - (total duration about 36m) - (installing Qt 5.12.0 from scratch would add 7m) Cache size for extracted x64 build: wireshark-libs is 187M, Qt 604M. (179M and 516M for 32-bit respectively.) Change-Id: I9881ab6439e9ca99efad16a6c861862ab9d35252 Reviewed-on: https://code.wireshark.org/review/31454 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10Move make-version.pl to tools.Gerald Combs2-1/+744
Move make-version.pl to the tools directory. Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4 Reviewed-on: https://code.wireshark.org/review/31473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09Add validate-clang-check script for Petri DishAlexis La Goutte1-0/+19
Launch clang-check -analyze for each file... Change-Id: Ic4132d563ccaa5d375f27d08366ba6fc052f095c Reviewed-on: https://code.wireshark.org/review/30482 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-01-09valgrind-wireshark: default to looking in run/ for our binaries.Jeff Morriss1-2/+2
If33a39c26714ebe699463d1c8c67469025767efb made this change for the other scripts. Change-Id: I158c1c2d0b564a115443e96a6d90733c2ffff071 Reviewed-on: https://code.wireshark.org/review/31459 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04debian: add dh-python to debian deps.Dario Lombardo1-0/+1
Basic Ubuntu installation lacks it. Change-Id: I208952d15bd32a7813c20625fe94656fb71ae824 Reviewed-on: https://code.wireshark.org/review/31322 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2019-01-04commit-msg: accept commit messages with backslashesPeter Wu1-2/+2
Dash (/bin/sh on Ubuntu) treats backslashes specially in an echo command. This could fail the validate-commit.py script when '\r' or '\n' occur anywhere in a commit message. Change-Id: Icec2c1e8ad1b365b4326ecc6ba9667ac64866fdd Reviewed-on: https://code.wireshark.org/review/31368 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03Windows: use lua-unicode as built with VS 2017Peter Wu1-4/+4
These binaries were built by AppVeyor using VS 2017 (MSVC 19.16.27025.1) and replaces locally built binaries using VS 2015 (MSVC 19.0.24215.1). I believe that these are the same as both of them use VCRUNTIME140.dll and import the same symbols. Using a newer compiler should however remove any doubt of compatibility with VS 2017 and should address concerns from Anders and Graham. These files are actually the "msvc2017_*.zip" files from https://github.com/Lekensteyn/lua-unicode/releases/tag/5.2.4-release1 Change-Id: Ib3fdf4678267fa10c0729f98ae0ce3153ac278a4 Reviewed-on: https://code.wireshark.org/review/31307 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02tools: fix trailing messages.Dario Lombardo1-3/+8
Change-Id: If4f213daaa27f51b1659939244945d9fdddc7772 Reviewed-on: https://code.wireshark.org/review/31309 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-01Fix asn2wrs.py: always add BASE_VAL64_STRINGChristophe GUERBER1-6/+2
In some cases (e.g. when a field has a user defined dissection function) the type reported for this field is a 'virtual' one and the latter is not contained in selt.type. Consequently, BASE_VAL64_STRING is not set. Function eth_get_type_attr should return all the attributes of a type and it seems resonable to expect it to return the BASE_VAL64_STRING. This will solve the above mentioned error and may solve any possible issue in other parts that call this function. Change-Id: Iaee9ce5bd30f2a768cfcecf628df23bf1ed54e55 Reviewed-on: https://code.wireshark.org/review/31287 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-31asn2wrs.py: use BASE_VAL64_STRING and val64_stringChristophe GUERBER1-5/+24
When UINT64 contains value strings, in addition to using VALS64 to give the list of names, the type of the structure has to be val64_string and the display parameter has to be ORed with BASE_VAL64_STRING. Change-Id: I0a619c91027df1eaae8209ada816f45b85d6431d Reviewed-on: https://code.wireshark.org/review/31268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Windows: Upgrade GnuTLS to 1.6.3Peter Wu1-5/+3
Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages: mingw64-gnutls-3.6.3-1.fc29.noarch.rpm mingw64-gcc-8.2.0-3.fc29.x86_64.rpm mingw64-gmp-6.1.2-4.fc29.noarch.rpm mingw64-nettle-3.4-2.fc29.noarch.rpm mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm mingw64-libffi-3.1-4.fc29.noarch.rpm mingw64-libtasn1-4.13-3.fc29.noarch.rpm mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll (32-bit, previously included with glib2). Built with https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2 The main motivation is improved PKCS #11 support: - 3.6.0: fix potential compatibility issue with SafeNet HSMs https://gitlab.com/gnutls/gnutls/merge_requests/398/ - 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info. - 3.6.3: new APIs for low-level PKCS #11 token or object operations. Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89 Reviewed-on: https://code.wireshark.org/review/31128 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30asn2wrs.py: fix regression introduced by gf4b0b2109Pascal Quantin1-1/+2
FT_(U)INT64 are restricted to integer types only currently. Do not use VALS64() for other types. Change-Id: Id2299a9291c53ef246b90d732eb84811510ccb85 Reviewed-on: https://code.wireshark.org/review/31257 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-30Fixes ASN.1 generation for VALS using 64 bitsChristophe GUERBER1-1/+4
VALS generation did not take into account the constraints on integers. We now generate VALS if no constraints are present and VALS64 if the interger needs 64 bits. Change-Id: Ia044ee1ba1bd5b45554c19a458876e20110b1b7f Reviewed-on: https://code.wireshark.org/review/31252 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Add support for RSA decryption using PKCS #11 tokensPeter Wu1-12/+39
Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Windows: fix handling of Unicode paths in LuaPeter Wu1-6/+6
Lua internally uses ANSI C APIs (such as fopen). On many systems (macOS and Linux for example) these work fine with UTF-8. Windows however requires special Unicode APIs (such as _wfopen), so patch the Lua library to interpret paths are UTF-8 and call appropriate Unicode APIs. Changes compared to the previous LuaBinaries zip archive: - Patched with UTF-8 support for loadfile, os.execute, etc. - Built with VS 2015 (VCRUNTIME140.dll) instead of MinGW (MSVCRT.dll). - Includes PDB file for lua52.dll - Includes lua52.exe and luac52.exe with UTF-8 argv support (wmain). - Includes build scripts, source files and README.md. - Extra subdirectory named after the zip file. These zip files are taken from https://github.com/Lekensteyn/lua-unicode (the "prepared" source zips can be found here as well.) Bug: 15118 Change-Id: I219f046d6e0fd5093287b5d6503a48ba7d1fc6a4 Reviewed-on: https://code.wireshark.org/review/31165 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23Fix AUTHORS.Gerald Combs1-1/+1
Change-Id: I8d755bff9d85765ef1b24a7c875dd4a2e2284137 Reviewed-on: https://code.wireshark.org/review/31182 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-22AUTHORS: Add an acknowledgement for Npcap.Gerald Combs1-6/+4
Add an acknowledgement to Insecure.com for letting us redistribute Npcap. Nmap and Wireshark were originally granted distribution rights via https://github.com/nmap/npcap/commit/167d4710. While we're here, remove acknowledgements for code we no longer use. webbrowser.c was removed in 9c5049a80b with the rest of ui/gtk and sha1.h was removed in f1c75cf6ef when we migrated to Libgcrypt. Change-Id: Ifb5581f8d1fd1a1b9bd5375a4e96c3ada7d8fc61 Reviewed-on: https://code.wireshark.org/review/31163 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20tools: exclude Revert prefixes from 80 chars limitPeter Wu2-4/+17
When commits are reverted, the subject line might exceed 80 chars. Adjust the pre-commit hook to gracefully handle a higher length and let validate-commit.py (as used by Petri-Dish) validate the original subject length. Change-Id: I54f2a99f95b7fca2f683aa1e98f0349dcf4ed1b7 Reviewed-on: https://code.wireshark.org/review/31120 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18Windows: upgrade Npcap to 0.99-r8Pascal Quantin1-4/+4
While we are at it, let's propose by default to upgrade to Npcap when WinPcap is intalled. Change-Id: Id9aeb3a507127b5956185fba2b74c60cf1dfdf96 Reviewed-on: https://code.wireshark.org/review/31079 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13macOS: fixup qt_base_path in macos-setup.shJim Young1-1/+1
Recent Qt installations include the entire 3-tuple version string (e.g. 5.9.7) for the parent folder name directly above the clang_64 folder. Use the entire version string when constructing the recommended build environment export statements. Change-Id: I779d487a3b794dde57214639a79727edb111835f Reviewed-on: https://code.wireshark.org/review/30983 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13Put the main() and wmain() routines for CLI programs into a separate file.Guy Harris1-0/+1
That means that code is only in one place, rather than having copies of it in each of those programs. CLI programs that, on Windows, should get UTF-8 arguments rather than arguments in the local code page should: include the top-level cli_main.h header; define the main function as real_main(); be built with the top-level cli_main.c file. On UN*X, cli_main.c has a main() program, and just passes the arguments on to real_main(). On Windows, cli_main.c has a wmain() function that converts the UTF-16 arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so that it doesn't use any functions other than those provided by the system, and then calls real_main() with the argument count and UTF-8 arguments. Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e Reviewed-on: https://code.wireshark.org/review/31017 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-03update-tx: fix typoAlexis La Goutte1-1/+1
Change-Id: I7ba88e9f1764a8d01c3754e032de1abd940a365c Reviewed-on: https://code.wireshark.org/review/30868 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-02Win32: update the zlib 1.2.11 CMake filePascal Quantin1-4/+4
- get rid of the CMP0048 deprecation warning - fix the absolute install path (João Valverde) Change-Id: If2353987483b17b38a43a2400b97f1446c312e28 Reviewed-on: https://code.wireshark.org/review/30886 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-30CMake: Generate cmake target exports on WindowsJoão Valverde1-4/+5
CMake requires zlib to be added to the exports via epan and wiretap targets. Ping-Bug: 15301 Change-Id: I5cfe746e67c195eb83b1d159a2cc2a645c8c47ea Reviewed-on: https://code.wireshark.org/review/30793 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-30NSIS: Install NPcap instead of WinPcap.Gerald Combs1-4/+4
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-30debian-setup: accept GnuTLS 3.2.11 on Ubuntu 14.04 for TravisPeter Wu1-1/+1
Travis still uses Ubuntu 14.04 which ships with GnuTLS 3.2.11-2ubuntu1. That package uses libgmp10 5.1.3+dfsg-1ubuntu1 which is not GPLv2+ compliant (libgmp10 6 or newer is needed), but aside from that it still works. Drop the version requirement to enable GnuTLS with Travis builds. Change-Id: I235f1127e4f56df3e16b5fa279f1929a1b9577f6 Reviewed-on: https://code.wireshark.org/review/30842 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-29Add Apple Wireless Direct Link (AWDL) dissectorMilan Stute1-0/+1
More information on Apple's proprietary AWDL protocol can be found in Milan Stute, David Kreitschmann, and Matthias Hollick. "One Billion Apples' Secret Sauce: Recipe for the Apple Wireless Direct Link Ad hoc Protocol" in ACM MobiCom '18. https://doi.org/10.1145/3241539.3241566 Bug: 15245 Change-Id: I5ce18125b3c957f338909e46f18e30405a3d3941 Reviewed-on: https://code.wireshark.org/review/30413 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29Drop support for GnuTLS 2.12.x, require GnuTLS 3.2 or newerPeter Wu1-3/+1
Upcoming changes need GnuTLS >= 3.0.2. Require GnuTLS 3.2 (or newer) for licensing reasons. The Debian control file still mentions 3.2.14 because older packages linked with a GMP library that was not GPLv2+ compatible. RHEL6 only has 2.12.23, but is already unsupported anyway. Change-Id: I024b2a734ebb16b73a624bb2435c254e963d8b7d Reviewed-on: https://code.wireshark.org/review/30832 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-27Fixup the "No Reassembly" profile.Gerald Combs1-12/+13
Fix the pattern match in make-no-reassembly-profile.py. Have it only write changed preferences. Change-Id: I14f23a56f9ec598930591fae9eac2f14747c55bb Reviewed-on: https://code.wireshark.org/review/30805 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-27Add a "No Reassembly" profile.Gerald Combs1-0/+63
Add a script that disables all of our desegmentation and reassembly preferences and use it to create a "No Reassembly" profile. Change-Id: Icd0b72e9e271a511e637acde9018f3aae018e589 Reviewed-on: https://code.wireshark.org/review/30799 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-27nl80211: update fields to Linux v4.20-rc4Peter Wu1-1/+1
Fix `tools/generate-nl80211-fields.py --update` to match the output from v2.9.0rc0-1896-g43134ae252 ("netlink-*: fix various VALS/TFS misuse"). Update to match nl80211.h from Linux v4.19-rc6-1865-g0d4e14a32dca. Change-Id: I101146867a62f2f881752c42229a218c12d6dda7 Reviewed-on: https://code.wireshark.org/review/30794 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-21tools/validate-commit.py: enforce short summary followed by blank linePeter Wu1-3/+25
To keep git logs readable, enforce a short summary line. Strive for 80 characters, reject everything past 120. Descriptions should also stay under 80 characters, but as error messages and links to protocol specifications can be quite long, do not check the description. Change-Id: Ife46b9ef6330aab015fc4ee5cc774a8ef6b9ad4e Reviewed-on: https://code.wireshark.org/review/30667 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Drop JSON-GLib completelyPeter Wu6-64/+2
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h). Remove the remaining traces and additionally remove GObject from FindGLIB2.cmake since it was only added for JSON-GLib. Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0 Reviewed-on: https://code.wireshark.org/review/30733 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-19rpm-setup.sh: We no longer use FOP or AsciiDoc.Gerald Combs1-2/+0
Change-Id: I3b6e200be149d12a42604528a695aae98d310b9c Reviewed-on: https://code.wireshark.org/review/30719 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-14macos-setup.sh: Update library and tool versions.Gerald Combs1-6/+6
Update the following versions: CMake: 3.7.2 to 3.12.4 Qt: 5.9.5 to 5.9.7 (Current LTS) libxml2: 2.9.4 to 2.9.7 (2.9.4 has security issues) c-ares: 1.12.0 to 1.15.0 (1.12.0 has security issues) libssh: 0.7.4 to 0.8.5 (0.7.4 has security issues) Change-Id: Ia97b436981705a4d99c0b0a2f238738e18394d45 Reviewed-on: https://code.wireshark.org/review/30589 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-12fix documentation and tests for cmake run directory.Dario Lombardo1-2/+2
Change-Id: If33a39c26714ebe699463d1c8c67469025767efb Reviewed-on: https://code.wireshark.org/review/30581 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09macos-setup.sh: Remove unused variables and code.Gerald Combs1-42/+0
Remove unused variables found by shellcheck. Remove a dead check for 10.5 (which we no longer support) which enables 32-bit builds (which we no longer support). Change-Id: I8f987f31025c74d27e46c7f74f514857ec8cdd3b Reviewed-on: https://code.wireshark.org/review/30549 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-08macos-setup.sh: fix Python 3 installation for OS X 10.8 and olderPeter Wu1-2/+9
Change-Id: I3c5b7fa272fbef770b06430edadb8abfc688e951 Fixes: v2.9.0rc0-2460-ge9f7bb5127 ("Require Python 3, drop Python 2 support") Reviewed-on: https://code.wireshark.org/review/30548 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2018-11-08rpm: update all rpm files for using python3.Dario Lombardo1-1/+5
This includes: - tools/rpm-setup.sh - packaging/rpm/wireshark.spec.in Fixes: v2.9.0rc0-2460-ge9f7bb5127 ("Require Python 3, drop Python 2 support") Change-Id: I9fb92be936dec5fdb819a54e132e64521fa95bbb Reviewed-on: https://code.wireshark.org/review/30543 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-07Require Python 3, drop Python 2 supportPeter Wu3-3/+63
Python 3 is widely available. All major Linux distributions support it. RHEL is covered via EPEL (which is already required for cmake3). Drop support for Python 2 in order to reduce maintenance costs. The main motivation is being able to simplify the tests. CMake is updated to search for Python >= 3.4 and will fail if unavailable (generating dissectors.c requires Python, so it is quite an important piece to have). The documentation is updated to reflect the Python 3.7 paths used by Chocolatey. Tested the git-review installation instructions in Windows 7 x64 without a previous Chocolatey installation. macOS brew now installs Python 3 (its dependencies are already installed by python@2 for libxml2). The macOS (non-brew variant) is updated to use the official 64-bit installer to install Python 3. Change-Id: I80b1e36957f338e0dad1bfcc173b6418682cddba Reviewed-on: https://code.wireshark.org/review/30192 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-04tools: fix LUA version and add more libs to the brew script.Dario Lombardo1-1/+1
brew installs lua 5.3 by default, that is not Wireshark compatible. lua@5.1 is installed instead since lua@5.2 is not available, see https://github.com/Homebrew/homebrew-core/issues/24409 Change-Id: I82c98bc3314e367dbdb71109887c37372f6293d2 Reviewed-on: https://code.wireshark.org/review/30494 Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 16:09:18 +0000