osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
40,742 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

490 Commits

Author SHA1 Message Date
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try. 
svn path=/trunk/; revision=42623
 2012-05-14 17:54:47 +00:00
Anders Broman 361454b6b8 Add PKG_SUFIX 
svn path=/trunk/; revision=42202
 2012-04-23 07:19:22 +00:00
Anders Broman 2c996e9c18 Make it possible to download the GTK3 package 
svn path=/trunk/; revision=42174
 2012-04-21 08:45:52 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo 
doesn't crash.

svn path=/trunk/; revision=42171
 2012-04-20 23:41:36 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service 
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
 2012-04-19 18:31:11 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2. 
svn path=/trunk/; revision=41971
 2012-04-06 17:27:20 +00:00
Anders Broman 6c902761a8 Revert 
svn path=/trunk/; revision=41928
 2012-04-04 15:42:46 +00:00
Anders Broman 82913779e4 Update to a version which have getopt_long(). 
svn path=/trunk/; revision=41926
 2012-04-04 15:23:47 +00:00
Gerald Combs 3ae3fcee5c Use the GnuTLS 2.12.18-1.2-1 bundle. 
svn path=/trunk/; revision=41829
 2012-03-29 20:18:10 +00:00
Gerald Combs 2a1e0baeac Use GnuTLS 2.12.18. 
svn path=/trunk/; revision=41809
 2012-03-27 22:57:42 +00:00
Anders Broman 665aae16f6 Revert the change of MSVC_VARIANT made by misstake. 
svn path=/trunk/; revision=41238
 2012-02-29 14:50:02 +00:00
Anders Broman 90cf729795 Use GTK 2.24.10 for win32. 
svn path=/trunk/; revision=41237
 2012-02-29 14:44:08 +00:00
Anders Broman 1fb2e2b3e0 Add the package version of GTK 2.24.10(commented out). 
svn path=/trunk/; revision=41236
 2012-02-29 12:03:51 +00:00
Bill Meier a94a0e3b4e (Minor): Add -DG_DISABLE_SINGLE_INCLUDES to GLIB_CFLAGS 
svn path=/trunk/; revision=41076
 2012-02-19 23:26:29 +00:00
Bill Meier e61e93baae Rework optional generation of .sbr & .bsc files. 
svn path=/trunk/; revision=40779
 2012-01-30 22:57:09 +00:00
Bill Meier cd4e301f06 Fix QtShark compile error. 
(Quoting can be tricky ...)

svn path=/trunk/; revision=40766
 2012-01-30 00:44:11 +00:00
Anders Broman 087e6087f0 Part of "Build Browse Information File per default" from 
Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

svn path=/trunk/; revision=40765
 2012-01-29 21:56:35 +00:00
Chris Maynard 6d213e71bd Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown". 
svn path=/trunk/; revision=40740
 2012-01-27 03:41:20 +00:00
Bill Meier 0600db677f Remove support for MSVC < MSVC2005; Update Developer's Guide. 
svn path=/trunk/; revision=40395
 2012-01-06 15:45:46 +00:00
Gerald Combs 50594f1d71 Allow for, but don't yet use, GTK+ 2.24. 
svn path=/trunk/; revision=40032
 2011-11-29 00:07:54 +00:00
Gerald Combs 3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to 
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
 2011-11-17 00:19:03 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1. 
svn path=/trunk/; revision=39769
 2011-11-08 22:35:56 +00:00
Gerald Combs d40223b6fb Add a HAVE_GEOIP_V6 configuration option and enable it by default. 
svn path=/trunk/; revision=39283
 2011-10-05 23:02:31 +00:00
Gerald Combs 996935a5de Add more entries to the Python CRT list. 
svn path=/trunk/; revision=39257
 2011-10-04 20:50:12 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER 
as it is the only option left.

svn path=/trunk/; revision=39138
 2011-09-25 21:27:19 +00:00
Anders Broman af6d7d7963 Make MAIN_MENU_USE_UIMANAGER the default. 
svn path=/trunk/; revision=38650
 2011-08-21 20:39:58 +00:00
Jörg Mayer b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that 
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
 2011-08-17 17:34:56 +00:00
Jörg Mayer e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only 
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
 2011-08-08 20:35:36 +00:00
Jörg Mayer a28af865bc Looks like the Windows code isn't as clean as the Unix path: 
Comment out GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38405
 2011-08-08 14:03:53 +00:00
Jörg Mayer 6ef6042641 GTK3 stuff: 
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
 2011-08-08 13:39:21 +00:00
Anders Broman c11c8b0ee0 svn path=/trunk/; revision=38396 2011-08-07 19:58:13 +00:00
Anders Broman 79501e9198 Revert previous commit. 
(Note to self read the description first)

"Returns :
 
a newly-allocated string, with all the upper case characters in str converted to lower case, with semantics that exactly match g_ascii_tolower(). (Note that this is unlike the old g_strdown(), which modified the string in place.)"

svn path=/trunk/; revision=38395
 2011-08-07 19:15:17 +00:00
Anders Broman e48dcbaf15 Replace deprecated glib functions. 
set DG_DISABLE_DEPRECATED for windows build.

svn path=/trunk/; revision=38394
 2011-08-07 19:08:41 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions. 
- Include pangocairo.

svn path=/trunk/; revision=38317
 2011-08-03 14:54:03 +00:00
Anders Broman 8f54d76a77 - Always build with GSEAL_ENABLE 
svn path=/trunk/; revision=38252
 2011-07-29 10:12:48 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake 
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
 2011-07-19 18:22:46 +00:00
Gerald Combs e7fce8ccb8 Pull WIRESHARK_LIBS from the system environment if it's available. 
svn path=/trunk/; revision=38114
 2011-07-19 16:26:42 +00:00
Anders Broman 46bcd096a8 Include Cairo lib to be able to use caro functions. 
svn path=/trunk/; revision=38066
 2011-07-17 13:18:55 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution 
on 64-bit Windows.

svn path=/trunk/; revision=37808
 2011-06-27 20:48:26 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not 
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
 2011-06-23 23:04:03 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or 
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
 2011-06-17 17:52:31 +00:00
Gerald Combs 6e040f6c0d Bump the wiretap version. 
svn path=/trunk/; revision=37571
 2011-06-06 16:29:23 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP 
svn path=/trunk/; revision=37495
 2011-05-31 21:38:39 +00:00
Gerald Combs 2c5e7ef953 FOP 0.95 → 1.0. 
svn path=/trunk/; revision=37300
 2011-05-19 19:03:22 +00:00
Gerald Combs 1c831b6343 1.5.2 → 1.7.0. 
svn path=/trunk/; revision=37148
 2011-05-14 20:17:37 +00:00
Anders Broman b699fa89ee Move MAIN_MENU_USE_UI_MANAGER outside of if win32. 
svn path=/trunk/; revision=37141
 2011-05-14 13:15:56 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no]. 
svn path=/trunk/; revision=37084
 2011-05-12 17:14:59 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option. 
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
 2011-05-12 10:56:26 +00:00
Jeff Morriss 6ff4737f44 On Windows: don't (try but fail--the code did not work) to define 
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
 2011-04-29 17:30:23 +00:00
Chris Maynard be832727cd Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The 
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
 2011-04-20 05:21:32 +00:00