Commit Graph

26 Commits

Author SHA1 Message Date
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
Pascal Quantin d8a2d39d42 Update c-ares to 1.12.0
Change-Id: Icd70f5e4e5e1a41a6a188500874a893433ecb8ed
Reviewed-on: https://code.wireshark.org/review/17985
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-29 20:35:10 +00:00
Pascal Quantin a7dd070d55 Win: switch back to Lua library compiled with MinGW
It does not suffer anymore from bug 9957

Change-Id: I871f01db67101b09a21545ecec5473941997a5cb
Reviewed-on: https://code.wireshark.org/review/17416
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-31 11:56:54 +00:00
Gerald Combs 74e8b539a2 Fix a comparison in win-setup.ps1
"if ($SomeVariable > 0)" is valid PowerShell syntax, but it writes
the value of $SomeVariable to a file named "0". Use the "-gt" operator
instead.

Change-Id: I17e0f7033008ead3b24fed8c0c91869747ff81f1
Reviewed-on: https://code.wireshark.org/review/17093
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-17 21:41:10 +00:00
Pascal Quantin 2227c26cb6 Windows: upgrade Lua library to 5.2.4
Change-Id: Ib0a4afc9b6143cf5ff78f72f0808f9f804549dd9
Reviewed-on: https://code.wireshark.org/review/16979
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-09 20:32:55 +00:00
Pascal Quantin a723a30ad4 Update USBPcap installer packaged in our Windows installer
This new version contains kernel drivers with an EV certificate that is cross-signed
by Microsoft as it will become mandatory.
See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/
for details.

Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625
Reviewed-on: https://code.wireshark.org/review/16862
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-03 21:17:24 +00:00
Pascal Quantin 5a73176a9d Win: convert atkversion.h to UTF-8
Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782
Reviewed-on: https://code.wireshark.org/review/15931
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15 18:53:30 +00:00
Pascal Quantin 95a05790d2 win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code
Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490
Reviewed-on: https://code.wireshark.org/review/15917
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15 16:42:30 +00:00
Pascal Quantin 018765f41a Remove an ellipsis UTF-8 character in gsignal.h
Change-Id: Ic31dab513fc2ff5f2f182ae98c1b665ea4b8916b
Reviewed-on: https://code.wireshark.org/review/15713
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-03 20:08:41 +00:00
Pascal Quantin 6d0e5bbf02 Upgrade c-ares Windows library from 1.9.1 to 1.11.0
Bug: 12412
Change-Id: I5e5f8f86293e391ec425a6e3e314573711947bce
Reviewed-on: https://code.wireshark.org/review/15345
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-11 05:46:02 +00:00
Pascal Quantin ae316e2d88 Compile sshdump and ciscodump for Windows
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support

Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 07:22:28 +00:00
Pascal Quantin c39c365f86 Update USBPcap installer packaged in our Windows installer and add a warning
The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue

Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-09 10:45:52 +00:00
Christian Tellefsen aa002845d9 Add %ProgramW6432% to the list of search paths when looking for 7-Zip.
This allows a 64bit 7-Zip installation to be located even though
win-setup.ps1 is run by a 32-bit process.

This applies to 64bit Windows (7, 10, Server 2008 R2, Server 2012).
Tested on 2012.

Ref:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384274%28v=vs.85%29.aspx

Change-Id: I6f4f3226b25c890cd674bf4c4d9ea73ddfc8ece0
Reviewed-on: https://code.wireshark.org/review/12740
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-20 12:29:54 +00:00
Pascal Quantin 6c38ec1aab Update USBPcap installer packaged
NSIS script modified to:
- check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate)
- do not delete the installation folder if not empty

Bug: 11766
Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213
Reviewed-on: https://code.wireshark.org/review/12546
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-12 07:30:51 +00:00
Pascal Quantin 978d7a8f05 Update user guide for upcoming 2.0 release
Change-Id: Id27365d6bd7085f498edd78111d85de0fbd0abd3
Reviewed-on: https://code.wireshark.org/review/11738
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-11 18:00:31 +00:00
Pascal Quantin 7d252d4b55 Add USBPcap 1.1.0.0-g794bf26 to Windows installer
Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d
Reviewed-on: https://code.wireshark.org/review/10868
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08 04:18:39 +00:00
Pascal Quantin e9614ad7ba Windows: update GeoIP library to 1.6.6
Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d
Reviewed-on: https://code.wireshark.org/review/10333
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-31 20:14:53 +00:00
Pascal Quantin 00087b4751 Add Lua 5.2.3 built with MSVC2015
Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4
Reviewed-on: https://code.wireshark.org/review/10313
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-30 15:33:23 +00:00
Anders 738cf424d6 Make building with MSVC2015 work
TODO:

- LUA is commented out probably needs to be built with MSVC 2015.
- GeoIP is commented out, causes packet-ip* to not build.
- Qt not built, needs Qt with MSVC 2015

Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55
Reviewed-on: https://code.wireshark.org/review/8683
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-13 12:03:53 +00:00
Graham Bloice e2561da034 Fix CMake 7zip search
A further fix for the CMake Windows search for 7-zip.

Add the destination\bin path to the search path.

When downloading from anonsvn only pass the path within the destination
not the whole path.

Change-Id: I2beec925730fae21d6a63bee5332e1002f49d6ae
Reviewed-on: https://code.wireshark.org/review/9770
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-24 16:03:00 +00:00
Graham Bloice 99b58131d8 Fix 7-zip search
The path for a Chocolatey 7zip.commandline install is
$env:ChocolateyInstall\bin

and the version installed by Chocolatey for its own use is in
$env:ChocolateyInstall\tools

Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299
Reviewed-on: https://code.wireshark.org/review/9762
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-23 21:38:56 +00:00
Gerald Combs f38d976cbe Be more careful about variable scope and quoting.
Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5
Reviewed-on: https://code.wireshark.org/review/9738
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-21 15:54:46 +00:00
Gerald Combs 419f67209d Replace Folder.CopyHere with 7-Zip.
Server Core editions of Windows don't have shell.application. As a result
CopyHere and its unzip capabilities aren't guaranteed to be available.
Plus, CopyHere is just plain slow.

Remove the CopyHere code. Search for 7z and 7za in various places and
download the standalone 7za if needed.

Bug: 11151
Change-Id: Ie719effbdcee3141764183bf3535ec9bd1c3e97a
Reviewed-on: https://code.wireshark.org/review/8226
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-25 18:58:30 +00:00
Graham Bloice 7780159c03 Fix zlib cmake
Add support for the locally modified version of zlib to suppress
a CMake warning and disable building of the zlib examples.

Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23
Reviewed-on: https://code.wireshark.org/review/8706
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-31 18:15:06 +00:00
Christoph Schlosser e3785f7aff win-setup.ps1 Make setup script aware of proxies
This will allow the powershell setup script to utilize the system
 proxy configuration, allowing for a download behind a company
 firewall

Change-Id: Id0bfaf4ded219374be6e60a08d620a519f5e4820
Reviewed-on: https://code.wireshark.org/review/8182
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Christoph Schlosser <christoph.schlosser@br-automation.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-27 15:20:35 +00:00
Gerald Combs 1404605513 Start moving win-setup to PowerShell.
Add win-setup.ps1, which duplicates the following tasks performed by
config.nmake + Makefile.nmake + win-setup.sh:

- Create the windows library directory.
- Download files.
- Download and unpack zip files.
- Check and set current-tag.txt

Don't verify applications or libraries. CMakeLists.txt does that.

Update the Developer's Guide.

Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which
appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript".

This removes our dependencies on unzip and wget and reduces our dependency
on bash.

Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614
Reviewed-on: https://code.wireshark.org/review/7990
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 19:09:30 +00:00