osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
53,210 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

602 Commits

Author SHA1 Message Date
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0 
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-06-06 15:33:01 +00:00
Pascal Quantin a4c306185b Use -O2 option when compiling with MSVC 
Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3
Reviewed-on: https://code.wireshark.org/review/1948
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-06-04 14:55:40 +00:00
AndersBroman 1f17d0c6bb Use the -Ox compiler option. 
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02
Reviewed-on: https://code.wireshark.org/review/1937
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-06-04 04:26:53 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0. 
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-05-23 20:57:42 +00:00
Gerald Combs 0a249087c3 Build with GTK+ 2.24.23. 
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
 2014-05-16 16:25:38 +00:00
Bill Meier aa5d91284b Add a comment indicating that 'PLATFORM' is apparently set only for X64. 
Change-Id: I5248c421e53a4347789c076433af004697a1b682
Reviewed-on: https://code.wireshark.org/review/1637
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-05-14 15:45:49 +00:00
Gerald Combs 2981ae46ad Add default paths for the Qt online installer for Windows. 
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543
Reviewed-on: https://code.wireshark.org/review/1618
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-05-12 22:17:53 +00:00
Bill Meier b31381dd70 Add a comment re VS2013EE requiring that win32.mak needs to be separately obtained. 
Change-Id: I53413f7bdde50149fd923bbe35c995145d5139f2
Reviewed-on: https://code.wireshark.org/review/1458
Reviewed-by: Bill Meier <wmeier@newsguy.com>
 2014-05-01 15:10:18 +00:00
Pascal Quantin 791dd4e128 Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012 
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f
Reviewed-on: https://code.wireshark.org/review/1176
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-04-17 07:38:51 +00:00
Gerald Combs d73d1f14b3 1.11.3 → 1.11.4. 
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-04-15 17:29:19 +00:00
Pascal Quantin dae96ca72b Switch back Windows 32 bits build to GTK2 
GTK3 does not work great on Windows:
- the GUI is quite ugly
- features like background color in filter box does not work
- x64 builds are still using GTK2
- no one is putting efforts on this to fix those issues

As we are transitioning to Qt, I do not expect any improvement soon.
Let's switch back to a more user friendly GUI.

Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a
Reviewed-on: https://code.wireshark.org/review/1026
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
 2014-04-09 12:53:01 +00:00
Pascal Quantin cc3c05ed5f Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3 
Fixes bug 9957

Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6
Reviewed-on: https://code.wireshark.org/review/991
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-04-07 05:54:19 +00:00
Pascal Quantin 590fcbc66f Upgrade Windows builds to Lua 5.2.3 
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0
Reviewed-on: https://code.wireshark.org/review/974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-04-05 22:41:06 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file 
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-31 18:48:06 +00:00
Pascal Quantin a1d4189c5e Upgrade Windows builds to Lua 5.2.1 
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-29 16:30:53 +00:00
Bill Meier dec951ef88 (Trivial) Fix 2 typos; Reformat some long lines. 
Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464
Reviewed-on: https://code.wireshark.org/review/491
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-03-04 03:13:42 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place. 
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-02-07 23:03:03 +00:00
Graham Bloice d9c018539c Improve windows build 
Allows config.nmake to pick up settings from environment variables.
With the move to git I'm no longer happy with my permanently modified
copy of config.nmake, these changes allow the most often modified
values to be set from environment variables.

As a bonus, some of the variables are set by the vcvarsall.bat for
Visual Studio 2012 or later

Change-Id: I681aeaec9519f6b6c9fa2c33abc706ce335585f5
Reviewed-on: https://code.wireshark.org/review/70
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-02 15:31:42 +00:00
Anders Broman a40f824e0e Make it easier to try GTK 3.6 
svn path=/trunk/; revision=54986
 2014-01-27 19:22:10 +00:00
Alexis La Goutte c6022b3b85 Drop support of Visual Studio 2005 
* Remove _MSC_VER < 1500 check
* Cleanup config.nmake

See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html

svn path=/trunk/; revision=54965
 2014-01-26 12:56:32 +00:00
Gerald Combs 8db4bc2499 More Chocolatey lex/yacc updates. 
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh

Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.

svn path=/trunk/; revision=54828
 2014-01-16 18:57:29 +00:00
Gerald Combs d5b706be51 Allow the use of Win flex-bison and document how to do that. 
svn path=/trunk/; revision=54824
 2014-01-16 01:28:02 +00:00
Michael Mann bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) 
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
 2014-01-08 04:35:28 +00:00
Gerald Combs 2fa2f632ec Add a note and commented-out definitions for Win flex-bison. 
Alex Zhondin was kind enough to create a Chocolatey package for Win
flex-bison.  Unfortunately a bug in Chocolatey's shell wrapper generator
keeps us from using it for the time being.

svn path=/trunk/; revision=54584
 2014-01-04 01:00:19 +00:00
Bill Meier 9e8306c746 Back out inadvertant change introduced in SVN #54340 
to use GTK2 when building Windows Wireshark.

svn path=/trunk/; revision=54390
 2013-12-23 16:47:10 +00:00
Bill Meier 7d5a52f4c8 Add a comment as to a required change to CFLAGS 
if Wireshark is ever to be built with Gtk >= 3.10.

svn path=/trunk/; revision=54340
 2013-12-21 19:12:04 +00:00
Jörg Mayer acccbc79c5 nmake: Allow setting the wireshark base dir via env variable 
svn path=/trunk/; revision=53718
 2013-12-02 13:00:06 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying 
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
 2013-12-01 10:05:16 +00:00
Gerald Combs 16e27047d0 1.11.2 → 1.11.3. 
svn path=/trunk/; revision=53412
 2013-11-18 17:41:00 +00:00
Gerald Combs f772a268db 1.11.1 → 1.11.2. 
svn path=/trunk/; revision=53346
 2013-11-15 22:34:31 +00:00
Alexis La Goutte 4bff9d32a0 Enable Packet Editor by default 
svn path=/trunk/; revision=53132
 2013-11-07 07:42:35 +00:00
Pascal Quantin 1631f12389 From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 : 
Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013

svn path=/trunk/; revision=53095
 2013-11-05 21:49:57 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to 
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
 2013-11-03 12:22:39 +00:00
Pascal Quantin cf9bbdecef From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 : 
Add support for MSVC2013

svn path=/trunk/; revision=52716
 2013-10-20 17:35:30 +00:00
Pascal Quantin 7c2219f301 1.11.0 -> 1.11.1 
svn path=/trunk/; revision=52647
 2013-10-16 17:32:45 +00:00
Gerald Combs fcff2c96e6 QT_DIR → QT5_BASE_DIR. This matches the CMake environment. 
svn path=/trunk/; revision=52557
 2013-10-12 00:12:24 +00:00
Gerald Combs 383ed6465a Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake. 
svn path=/trunk/; revision=52556
 2013-10-11 23:52:19 +00:00
Gerald Combs 2f067f20dd Use the right package name. 
svn path=/trunk/; revision=52521
 2013-10-10 23:52:29 +00:00
Gerald Combs 06a3d1175c Try to discover Qt similar to the way we discover Python. 
svn path=/trunk/; revision=52520
 2013-10-10 23:45:16 +00:00
Gerald Combs b3c844fa64 Add an initial Qt configuration and makefile targets. 
svn path=/trunk/; revision=52456
 2013-10-08 23:03:56 +00:00
Anders Broman 1394b21b88 Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix build for VS 2012 (MSVC_VARIANT==MSVC2012EE)" 
svn path=/trunk/; revision=52433
 2013-10-07 04:49:44 +00:00
Pascal Quantin 35f284caad Revert file committed by accident 
svn path=/trunk/; revision=51565
 2013-08-28 17:33:14 +00:00
Pascal Quantin 519a7778aa Fix copy/paste error introduced in r51541 and spotted by Joerg 
svn path=/trunk/; revision=51564
 2013-08-28 17:31:12 +00:00
Gerald Combs dc87fa2d68 Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try 
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
 2013-08-23 22:18:49 +00:00
Martin Kaiser e8d6b0581b we have to make the manual change for *gtk2* now 
svn path=/trunk/; revision=50873
 2013-07-24 18:48:25 +00:00
Anders Broman 1c92cbf702 Don't enable GTK3 build on win32 - it's not working. 
svn path=/trunk/; revision=50868
 2013-07-24 17:29:52 +00:00
Anders Broman 61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows. 
svn path=/trunk/; revision=50865
 2013-07-24 15:54:55 +00:00
Jörg Mayer 18155bd148 Change default gtk build from version 2 to version 3 for 
autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863
 2013-07-24 11:51:10 +00:00
Gerald Combs a692824160 GeoIP 1.5.1. 
svn path=/trunk/; revision=50742
 2013-07-20 01:01:55 +00:00
Chris Maynard 59ef0c60d9 Change a forward-slash to a back-slash as the path separator.. 
svn path=/trunk/; revision=49677
 2013-06-01 13:05:28 +00:00