Commit Graph

359 Commits

Author SHA1 Message Date
Stig Bjørlykke 7715fe8c8c Use the new gettext-runtime.
svn path=/trunk/; revision=24217
2008-01-28 20:23:08 +00:00
Anders Broman 6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Guy Harris 947e70b4b7 Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.

svn path=/trunk/; revision=23802
2007-12-07 23:58:46 +00:00
Tomas Kukosa 08bbd29c71 Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)
- retrieving the list of remote PCAP interfaces
  - password authentication support
  - UDP data fransfer
  - packet sampling (available in WinPcap 4.x)
  etc.

fix problem if non-default rpcap port is used

svn path=/trunk/; revision=23750
2007-12-04 11:19:29 +00:00
Ulf Lamping 99d60cce59 first steps to support MSVC 2008 Express Edition
svn path=/trunk/; revision=23691
2007-11-30 22:01:05 +00:00
Anders Broman 26c07ee766 Update to gtk+ 2.14.2 and glib glib-2.14.4
svn path=/trunk/; revision=23674
2007-11-29 21:34:38 +00:00
Anders Broman aeb3263d8f Add a link to NASM
svn path=/trunk/; revision=23652
2007-11-28 21:33:01 +00:00
Bill Meier 7f9585782d Fixes for Windows build w/o ZLIB
svn path=/trunk/; revision=23651
2007-11-28 20:06:21 +00:00
Tomas Kukosa ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Graeme Lunt 24f27a48ec Support for the automatic configuration of the UPX dll/exe packer.
config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)


svn path=/trunk/; revision=23562
2007-11-24 11:45:51 +00:00
Gerald Combs 7a4d6fbf36 Bump the trunk to 0.99.8.
svn path=/trunk/; revision=23525
2007-11-21 00:09:38 +00:00
Graeme Lunt 04b798cbf4 Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker. 


svn path=/trunk/; revision=23484
2007-11-18 10:20:26 +00:00
Tomas Kukosa 6055995bf1 revert changes in config.nmake committed by mistake and commit configure.in
svn path=/trunk/; revision=22996
2007-09-27 08:33:53 +00:00
Tomas Kukosa 706e13b44d put next few simple ASN.1 dissectors into the new makefile structure
svn path=/trunk/; revision=22994
2007-09-27 06:03:45 +00:00
Anders Broman 6b4a7ba74d Use GTK+ 2.12
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
Jörg Mayer 094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Ulf Lamping 7f299f9bcf remove comment which compiler version works - they all work
svn path=/trunk/; revision=22798
2007-09-05 23:03:58 +00:00
Ulf Lamping a8d0136ed8 always compile zlib.dll from source (even on MSVC6 now), this simplifies the makefiles a bit and (more important) removes an annoying behaviour if you switch between compiler versions - you'll need to run the setup target each time you switch
svn path=/trunk/; revision=22714
2007-08-28 20:31:48 +00:00
Anders Broman c2c385fc9f Minor tweeks.
svn path=/trunk/; revision=22674
2007-08-26 21:01:13 +00:00
Anders Broman ef9971610c Use config and makefile from Chris Maynard and Luis instead.
svn path=/trunk/; revision=22672
2007-08-26 20:03:23 +00:00
Anders Broman d4e158db74 Download libsmi
svn path=/trunk/; revision=22671
2007-08-26 19:17:03 +00:00
Gerald Combs ad56f2ee36 0.99.6 has been split off. Bump the trunk to 0.99.7.
svn path=/trunk/; revision=22111
2007-06-15 18:44:43 +00:00
Gerald Combs b713a968bd Revert back to having a local copy of airpcap.h. This should fix building
with AirPcap.  Re-define AIRPCAP_DIR.

svn path=/trunk/; revision=21846
2007-05-20 22:32:14 +00:00
Anders Broman 001d89c183 Undefine AIRPCAP_DIR to get the Windows build going again.
svn path=/trunk/; revision=21841
2007-05-20 19:55:34 +00:00
Gerald Combs 55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Anders Broman 4c92cbef0e Use the latest GTK stuff.
svn path=/trunk/; revision=21122
2007-03-22 22:26:59 +00:00
Ulf Lamping 90a418243c Python V2.5 is the latest stable version. Add a comment to config.nmake (but keep the 2.4 alive for now) and update version strings in the devel guide.
If the buildbot will be updated, we could also activate the new version in config.nmake.

svn path=/trunk/; revision=20750
2007-02-08 18:25:45 +00:00
Ulf Lamping 77dd618f96 some minor cleanup
svn path=/trunk/; revision=20702
2007-02-03 20:57:24 +00:00
Ulf Lamping 591611ff4e as discussed on the list:
- GTK 2.10 is mainline now
- WINPCAP_VERSION is just confusing without benefit, remove it

svn path=/trunk/; revision=20701
2007-02-03 20:40:11 +00:00
Ulf Lamping 6060578121 ... no it won't, that's why I removed them ...
Put the quotes around the places where HHC_DIR is used, that should work.

svn path=/trunk/; revision=20699
2007-02-03 19:37:59 +00:00
Bill Meier 07ab8a268b Quotes around HHC_DIR required so build doesn't fail;
Will the buildbot "build docs" step work ? Let's see

svn path=/trunk/; revision=20698
2007-02-03 19:33:32 +00:00
Ulf Lamping acaa675c25 fix HHC_DIR to work
svn path=/trunk/; revision=20693
2007-02-03 07:54:18 +00:00
Ulf Lamping f95f5a5437 cleanup docbook related comments
svn path=/trunk/; revision=20692
2007-02-03 05:13:39 +00:00
Ulf Lamping 34c0a4447c move docbook related settings from docbook/Makefile.nmake to config.nmake - having only one place to configure it all :-)
svn path=/trunk/; revision=20690
2007-02-03 04:06:43 +00:00
Ulf Lamping b7eca1050c fix a cut-n-paste error, to fix buildbot problem
svn path=/trunk/; revision=20645
2007-01-31 04:34:58 +00:00
Ulf Lamping 5698c994ca C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
svn path=/trunk/; revision=20637
2007-01-31 02:23:06 +00:00
Gerald Combs 9f8fa9cfe2 Bump the trunk version to 0.99.6.
svn path=/trunk/; revision=20526
2007-01-22 22:57:32 +00:00
Ulf Lamping 852551cd86 user-guide final step:
enable HHC_DIR as default, hopefully the buildbot will "get it right" now :-)

svn path=/trunk/; revision=20496
2007-01-19 01:21:17 +00:00
Ulf Lamping 2d760bf075 in effect use the User's Guide as the online help system now (for GTK > V1)!
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)

svn path=/trunk/; revision=20446
2007-01-16 04:08:35 +00:00
Ulf Lamping 13a095e055 no, we're still not using MSVC2005 as default :-(
should fix the Win32 buildbot ...

svn path=/trunk/; revision=20413
2007-01-13 04:28:26 +00:00
Ulf Lamping 19bd3956a2 fix some remaining MSVC != V6 issues:
- add redistributables (msvcr*.dll) to the NSIS installer (depending on MSVC_VARIANT)
- split MSVC2006 and MSVC2006EE (Express Edition) settings in config.nmake, as redistributable settings for NSIS are different
- remove Platform SDK setting from config.nmake, it's not needed

svn path=/trunk/; revision=20411
2007-01-13 00:59:39 +00:00
Ulf Lamping ab31b4fa4d add the ".NET Framework SDK V1.0" to the list of working MSVC_VARIANTS :-)
svn path=/trunk/; revision=20390
2007-01-11 07:53:01 +00:00
Ulf Lamping dab6935453 various msvc / zlib config cleanup
svn path=/trunk/; revision=20383
2007-01-10 21:45:19 +00:00
Ulf Lamping 393537a7f8 fix the HHC_DIR settings for none MSVC6 variants
svn path=/trunk/; revision=20375
2007-01-10 09:56:39 +00:00
Ulf Lamping 49fd1e07c8 from Laurent Rabret:
use /MD switch instead of direct linker switches
(hopefully this will fix linker issues mentioned by Andrew and Stephen)

svn path=/trunk/; revision=20370
2007-01-10 03:11:13 +00:00
Ulf Lamping e71b416608 fix compilation for:
- Visual Studio .NET (2002)
- Visual Studio .NET 2003

svn path=/trunk/; revision=20349
2007-01-08 22:29:18 +00:00
Ulf Lamping 7a7c7ea302 Oops, I did it again ;-)
C:\Programme -> C:\Program Files

svn path=/trunk/; revision=20339
2007-01-08 03:31:28 +00:00
Ulf Lamping e456b4fcd6 if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
svn path=/trunk/; revision=20337
2007-01-08 02:40:06 +00:00
Ulf Lamping 8fb030d900 fix GNUTLS compiling issue on recent MSVC versions by switching off Wincrypt.h, see: http://www.mail-archive.com/openssl-dev@openssl.org/msg03802.html for details
svn path=/trunk/; revision=20336
2007-01-07 19:50:16 +00:00
Ulf Lamping cc164653a0 add experimental support for some more of the MSVC_VARIANTs:
- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
2007-01-06 01:05:59 +00:00
Ulf Lamping 1a25d263d6 don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594
svn path=/trunk/; revision=20324
2007-01-05 05:23:02 +00:00
Ulf Lamping 3a1a07c46a compile error in openssl.h depends on the Platform SDK, not the MSVC variant used
change the !IFDEF around GNUTLS accordingly

svn path=/trunk/; revision=20323
2007-01-05 05:03:15 +00:00
Ulf Lamping b6fd719414 move the directory settings more to the top, add an optional platform SDK setting
svn path=/trunk/; revision=20322
2007-01-05 04:58:52 +00:00
Gerald Combs 7d0118ff10 Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable
AirPcap.

svn path=/trunk/; revision=20321
2007-01-05 01:35:23 +00:00
Ulf Lamping ba961e3ba8 add the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is the one described in the corresponding Wiki page)
mark "Visual Studio 2005" (without Express) as EXPERIMENTAL too, seems to be working just like the Express Edition :-)

svn path=/trunk/; revision=20313
2007-01-04 20:51:18 +00:00
Ulf Lamping d736a37664 another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ...
svn path=/trunk/; revision=20297
2007-01-03 22:09:15 +00:00
Ulf Lamping 97df0c4a56 hmmm, maybe he don't like mixing slashes and backslashes ...
svn path=/trunk/; revision=20292
2007-01-03 06:41:17 +00:00
Ulf Lamping 59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping 17d57d538c Instead of hard coding "C:/program files", use the corresponding environment variable %ProgramFiles% (hopefully this is available on all supported platforms). This makes it possible to use the same unchanged setting even for internationalised Windows versions (e.g. in the german version this is: "C:\Programme")
svn path=/trunk/; revision=20288
2007-01-03 04:28:28 +00:00
Ulf Lamping 15fd728985 move the MSVC "block" towards the top of the file
don't use GNUTLS and ZLIB when compiling with MSVC != Version 6 - it currently doesn't work

svn path=/trunk/; revision=20283
2007-01-03 02:53:30 +00:00
Ulf Lamping 578e62131e make MSVC6 the default for MSVC_VARIANT, not MSVC2005
svn path=/trunk/; revision=20265
2007-01-02 13:05:04 +00:00
Ulf Lamping 6bb21fbafd first MSVC 2005 changes:
- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)

svn path=/trunk/; revision=20258
2007-01-02 01:19:40 +00:00
Anders Broman 0e063dc29c Use portaudio v19.
svn path=/trunk/; revision=20225
2006-12-27 22:21:46 +00:00
Bill Meier 81ab78cddb Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221
2006-12-26 22:40:49 +00:00
Ulf Lamping a672d53330 cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are)
set VERSION_EXTRA back to empty - I guess this was checked in by mistake

svn path=/trunk/; revision=20218
2006-12-26 20:20:52 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Anders Broman 686b41801c Update to use gtk 2.10.6 and friends.
svn path=/trunk/; revision=20188
2006-12-21 22:15:34 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Gerald Combs 8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Bill Meier bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Anders Broman 09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Gerald Combs a076a8731d Bump the version to 0.99.5.
svn path=/trunk/; revision=19781
2006-11-03 06:55:30 +00:00
Ulf Lamping 15260339d7 change the default GTK version from GTK2.6 to GTK2.8
svn path=/trunk/; revision=19728
2006-10-29 14:41:16 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Anders Broman 0880bc54d0 Preparations for using the latest GTK 2.8 files for now only gettext is updated.
svn path=/trunk/; revision=19695
2006-10-26 07:25:07 +00:00
Jörg Mayer 926ed8aa01 Alejandro Vaquero:
Add portaudio v19 support in addition to v18:

   Here is a patch using the API 2 (v19). I tested it only in Windows.
Attached also the Windows v19 zip file used. I did not modify the
Makefile.nmake to download this new version (when running the "setup"),
because Windows v18 it is still good.


svn path=/trunk/; revision=19446
2006-10-07 14:24:32 +00:00
Gerald Combs 2649d26145 Fix WEP key bug in the AirPcap code that could cause a crash. Enable
AirPcap by default. Add initial support for the "Any" device in AirPcap
(more to come).

svn path=/trunk/; revision=19401
2006-10-02 23:44:10 +00:00
Gerald Combs 0678c4f7c4 Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should
fix bug 1096.

Switch back to fetching a date-stamped URL in win32-setup.sh.  This
ensures backward compatibility with previous releases and non-updated
SVN trees.

svn path=/trunk/; revision=19339
2006-09-27 18:02:40 +00:00
Luis Ontanon 354983d30d use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
svn path=/trunk/; revision=19331
2006-09-27 00:45:55 +00:00
Luis Ontanon c8a95a0548 Lua 5.1.1 for windows
svn path=/trunk/; revision=19324
2006-09-26 03:31:00 +00:00
Ulf Lamping 3fa7bc5f0c change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files.
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...

svn path=/trunk/; revision=19302
2006-09-23 01:39:07 +00:00
Ulf Lamping 1048fafb27 so it's HAVE_LIBPORTAUDIO
svn path=/trunk/; revision=19228
2006-09-13 11:28:36 +00:00
Ulf Lamping edae542c06 it's HAVE_PORTAUDIO, not HAVE_LIBPORTAUDIO
svn path=/trunk/; revision=19215
2006-09-12 17:45:43 +00:00
Ulf Lamping 04fe34d711 various nmake related build file cleanups
svn path=/trunk/; revision=19198
2006-09-12 00:27:03 +00:00
Ulf Lamping 9fee393b87 tweak the nmake build so the NET-SNMP library is in fact optional (as it is in the UNIX builds)
svn path=/trunk/; revision=19196
2006-09-11 22:47:57 +00:00
Ulf Lamping 1d1f904321 let the user only specify the PortAudio version and do the "ugly details" in the part below, just as we do it for most other libs
svn path=/trunk/; revision=19195
2006-09-11 22:43:00 +00:00
Anders Broman a1f8b7e084 From Alejandro Vaquero:
Need to use HAVE_LIBPORTAUDIO instead 
of PORTAUDIO_DIR in voip_calls.c

And build the windows version with Port audio.

svn path=/trunk/; revision=19187
2006-09-10 18:03:22 +00:00
Anders Broman 5534f7472b Add comments about PORTAUDIO API version comment out use of PORTAUDIO library for now.
svn path=/trunk/; revision=19161
2006-09-06 05:23:38 +00:00
Anders Broman 1129da54e8 Handle PORTAUDIO_API_1 and add clean-deps target to distclean.
svn path=/trunk/; revision=19159
2006-09-05 20:35:41 +00:00
Ulf Lamping f274a56104 a huge redesign of the settings in config.nmake
most changes are related to comments and the sequence of the settings, so by comparing the old and the new file, any merge conflicts will be hopefully easily resolved at least manually.

svn path=/trunk/; revision=19098
2006-08-31 01:50:11 +00:00
Ulf Lamping 9ffebf10bd remove the MAKENSIS_MODERN_UI, as the modern UI of NSIS is very stable now so there's no need for this setting any longer (removing some unnecessary complexity)
svn path=/trunk/; revision=19097
2006-08-30 23:27:37 +00:00
Anders Broman 7eac3c2879 From Alejandro Vaquero:
- Change the "listen_rtp" to "rtp_player"
- Change from a plugin to be part of the core
- By default it will not compile with the rtp_player. In order to 
compile it is necessary to:
       + For windows: uncomment the line 
"PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1" in config.nmake
       + For linux: using the "--with-portaudio=yes"

svn path=/trunk/; revision=19094
2006-08-30 21:51:31 +00:00
Gerald Combs 52e5d6bb19 Bump the version to 0.99.4.
svn path=/trunk/; revision=19014
2006-08-24 16:23:32 +00:00
Ulf Lamping 513649aad0 rollback some IMO unintended changes to the config settings
svn path=/trunk/; revision=18932
2006-08-16 22:45:51 +00:00
Gerald Combs f9661850d1 Add support for AirPcap, an upcoming wireless product from CACE. Support
is disabled by default, and can be enabled by setting AIRPCAP_CONFIG
in config.nmake.  The code is currently limited to Windows, but should
be adaptable to other platforms.

The official announcement won't come until next week, so you'll have to
read the source for details.  :)

svn path=/trunk/; revision=18928
2006-08-16 18:01:25 +00:00
Ulf Lamping f42021ee23 fix #1007: using PCAP_BREAKLOOP breaks compatibility with WinPcap 3.0, without providing any benefit on Win32, so don't use it
svn path=/trunk/; revision=18890
2006-08-13 01:07:46 +00:00
Gerald Combs 4f16b6b178 Point to the newest (1.5.0-1) GnuTLS package. Since it contains
libgcrypt, enable it in the Windows build.

In packet-ipsec.c:

  - Remove non-constants from variable declaration initializations.
  - Use ep_alloc() in a couple of places.
  - Fix an off-by-one error.
  - Reduce the number of SAs in the preferences from 4 to 2.  4 made the
    preferences window absolutely enormous.  This is probably the wrong
    way to fix this.
  - Fix up whitespace.

svn path=/trunk/; revision=18856
2006-08-09 02:00:05 +00:00
Ronnie Sahlberg 0238e4a076 enable kerberos for windows for the win32 build
svn path=/trunk/; revision=18852
2006-08-08 07:52:15 +00:00
Gerald Combs 0213f60e4b Add GNUTLS to the Windows build.
In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
2006-08-07 19:52:18 +00:00
Ronnie Sahlberg db179bb768 config and makefile magic we need when we integrate kerberos for windows with the w32 build
disabled for now


svn path=/trunk/; revision=18838
2006-08-05 04:32:57 +00:00
Gerald Combs 6c787afdb4 Bump the trunk version to 0.99.3.
svn path=/trunk/; revision=18749
2006-07-17 16:05:58 +00:00
Gerald Combs 68b631ac45 Switch to Net-SNMP 5.3.1.
svn path=/trunk/; revision=18744
2006-07-17 14:11:42 +00:00
Gerald Combs f357915f4c Set the version to 0.99.2, since we're building releases from /trunk again.
svn path=/trunk/; revision=18674
2006-07-06 20:19:01 +00:00
Gerald Combs 6cda517c79 Update to Net-SNMP 5.3.0.1.
svn path=/trunk/; revision=18673
2006-07-06 19:52:48 +00:00
Gerald Combs 8d6c73e567 More ethereal -> wireshark.
svn path=/trunk/; revision=18292
2006-05-31 22:34:21 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Gerald Combs ee4b9b7549 ethereal.nsi -> wireshark.nsi
svn path=/trunk/; revision=18254
2006-05-30 14:28:20 +00:00
Anders Broman 7e68c9c370 Ethereal->Wireshark
svn path=/trunk/; revision=18246
2006-05-29 18:44:53 +00:00
Gerald Combs c0b00c8a2c Use GTK-Wimp 0.7.0.
svn path=/trunk/; revision=18222
2006-05-27 02:11:19 +00:00
Guy Harris aa1e053ce6 If we have pcap_breakloop(), at least on UN*X we can stop the capture
with a pcap_breakloop() call - we don't need to call select() before
calling pcap_dispatch().

Even if we do need to call select(), we don't need to supply it with a
timeout - it's OK if we block indefinitely, as the signal will interrupt
select().

That also means we can pass -1 as the count to pcap_dispatch(), as
pcap_breakloop() will terminate the loop in pcap_dispatch().

Use sigaction() to catch SIGUSR1, so we can make sure that the signal
handler doesn't get reset when the signal is delivered, and that system
calls don't restart when we return from the signal handler.

svn path=/trunk/; revision=18201
2006-05-21 21:32:04 +00:00
Gerald Combs 08dea4588e Bump the version number to 1.1. Clean up the release notes.
svn path=/trunk/; revision=18062
2006-05-01 19:21:00 +00:00
Ulf Lamping 3cd547dc0a change the HHC setting to HHC_DIR, so we can use it also to call the HtmlHelp function
svn path=/trunk/; revision=17951
2006-04-21 22:47:19 +00:00
Gerald Combs e9fb9fe971 0.10.14 -> 0.99.0.
svn path=/trunk/; revision=17849
2006-04-12 20:54:40 +00:00
Gerald Combs acebebcd61 Update Lua.
svn path=/trunk/; revision=17847
2006-04-12 20:36:31 +00:00
Luis Ontanon e21b984570 One day I'll be able to do change something in windows in a single attempt
svn path=/trunk/; revision=17641
2006-03-15 22:58:40 +00:00
Gerald Combs 050525cfb5 Add Lua support by default for Win32. Fix some compilation problems.
Add Lua information to the version paragraph.

svn path=/trunk/; revision=17440
2006-03-01 21:31:07 +00:00
Gerald Combs 0d3244a6fe Split the version under Windows into its major, minor, and micro
components.  Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting).  This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.

svn path=/trunk/; revision=17302
2006-02-14 15:14:41 +00:00
Jörg Mayer 83068a9b9d Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.


The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.


svn path=/trunk/; revision=17200
2006-02-07 10:26:20 +00:00
Lars Roland 5f1e470cc2 changes to build lua plugin with MSVC6:
- nmake makefile for lua plugin added.
- declare variables at the beginning of a function.
- proto_reg_handoff_lua was removed, remove remaining calls, too.
- missing functions to libethereal.def added.

add lua plugin to installer, if available.

svn path=/trunk/; revision=17196
2006-02-07 09:12:43 +00:00
Guy Harris ad3cb359b6 From Paolo Abeni:
Set up to build on Windows if we have GNU TLS.

	Define "ssl_data_set()" regardless of whether we have GNU TLS or
	not, as it's used in either case.

	Get rid of an extra #include of epan/gnuc_format_check.h.

svn path=/trunk/; revision=17177
2006-02-06 09:09:06 +00:00
Gerald Combs 306fbc3fdb Update to Net-SNMP 5.2.2.
svn path=/trunk/; revision=16907
2005-12-27 18:33:58 +00:00
Gerald Combs 5dd7ff581e Prep for 0.10.14.
svn path=/trunk/; revision=16872
2005-12-21 16:49:47 +00:00
Ulf Lamping f2291acd18 Declare the GTK 2.6 as the official mainline now!!!
(as per mailing list discussions and mainly as the Gimp windows port also uses this version)


fix the NSIS install settings for GTK 2.6 of GTK-Wimp

svn path=/trunk/; revision=16820
2005-12-16 08:20:22 +00:00
Gerald Combs 7463a0e9fb Fix themeing for GTK+ 2.8. This hasn't been tested under 2.6 or 2.4.
svn path=/trunk/; revision=16810
2005-12-15 19:12:51 +00:00
Gerald Combs 0616a4bedb Make sure we install the libpng and cairo DLLs if needed.
svn path=/trunk/; revision=16809
2005-12-15 03:36:17 +00:00
Gerald Combs 253b96e81f Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
2005-12-14 21:19:39 +00:00
Ulf Lamping ede79e4d3c Win32: first steps towards using GTK2.6, add zipfile and dir name definitions
svn path=/trunk/; revision=16282
2005-10-21 18:47:04 +00:00
Gerald Combs f57b54eeb2 Updates for 0.10.13.
svn path=/trunk/; revision=16201
2005-10-12 16:17:03 +00:00
Ulf Lamping e6f26721f4 replace WinPcap devel pack 3.0 with current 3.1 version
svn path=/trunk/; revision=15972
2005-09-22 23:18:34 +00:00
Gerald Combs 33cfe1725a Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing.  Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake.  The rest of the occurrences of xcopy will have to
be taken care of at some point.

svn path=/trunk/; revision=15840
2005-09-16 16:25:53 +00:00
Ulf Lamping 2b82bb3df7 Turn around the sequence of PATH, so the former PATH will be in front of the newly added things.
This way, the cygwin link.exe command will be behind the link.exe from MSVC.

Also added a definition of the docbook dir, floating around in my personal file for a while. This will be needed if the User's Guide is included in the NSIS installer later.

svn path=/trunk/; revision=15790
2005-09-13 19:01:08 +00:00
Anders Broman cffb22628b From Peter Johansson
PATH contents one had before starting the  build, that PATH is added to the new PATH variable 5 additional times 
instead of 1.
I have made changes (supplied) to config.nmake that takes care of this 
problem.

svn path=/trunk/; revision=15782
2005-09-13 16:48:13 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Gerald Combs 4ba88078f9 Move to the latest ethereal-win32-libs tag.
svn path=/trunk/; revision=15706
2005-09-06 19:48:57 +00:00
Ulf Lamping 996d5b98c8 bump up the wiretap.dll version from 0.2 to 0.3 as I've recently changed the wiretap API in an incompatible way
the timestamps now contain nseconds instead of microseconds and there's a new function added.

Is there a similar place for the Unix builds where this version has to be changed too?

svn path=/trunk/; revision=15551
2005-08-27 00:37:48 +00:00
Guy Harris 4c43d63594 We've changed the Wiretap ABI (removed one routine), so bump the library
version number.

WinPcap 3.1 is no longer in alpha.  (Should we make WINPCAP_VERSION 3.1,
so we default to assuming WinPcap 3.1?)

svn path=/trunk/; revision=15438
2005-08-19 19:44:21 +00:00
Gerald Combs a64a4043c3 Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4.
svn path=/trunk/; revision=15091
2005-07-26 16:44:57 +00:00
Ulf Lamping ed92a140e4 found by Thomas Boehne: corrected GTK_WIMP_DIR, used by the NSIS installer
svn path=/trunk/; revision=15061
2005-07-25 18:44:59 +00:00
Ulf Lamping 818a760aca update to latest zlib version 123
svn path=/trunk/; revision=15060
2005-07-25 18:30:35 +00:00
Gerald Combs 7bb59ba7ed Bump the version and add a few entries to the NEWS file.
svn path=/trunk/; revision=14995
2005-07-22 16:43:05 +00:00
Gerald Combs e1c7558d93 Point to the latest Windows library tag and versions.
svn path=/trunk/; revision=14923
2005-07-15 20:50:34 +00:00
Lars Roland 7523f78185 Add a note to config.nmake that it is required to set ENABLE_LIBETHEREAL to get plugin support in Ethereal.
Change Makefile.nmake of the stats_tree plugin to the current scheme.

svn path=/trunk/; revision=14512
2005-05-31 21:34:14 +00:00
Gerald Combs f2ffbf0a46 Prep for the next release. ETA Wednesday (the 4th).
svn path=/trunk/; revision=14270
2005-05-02 16:34:24 +00:00
Guy Harris 596a4f865b It doesn't matter whether, when building with WinPcap, we have
pcap_lib_version() in the WinPcap on the system on which we're building.

svn path=/trunk/; revision=13873
2005-03-23 01:55:11 +00:00
Guy Harris 46e1907f13 If we have "pcap_freecode()", use it to free the instructions for a BPF
filter after installing the filter.

Set HAVE_PCAP_LIB_VERSION if we're building with WinPcap 3.1; it's not
present in earlier versions, but is present in current 3.1 betas.

Check HAVE_PCAP_LIB_VERSION when building capture-wpcap.c.

svn path=/trunk/; revision=13872
2005-03-23 01:25:01 +00:00
Gerald Combs f34e80a2cf Prep for 0.10.10: Update the ChangeLog and NEWS files, bump the version
number.

svn path=/trunk/; revision=13685
2005-03-09 23:49:55 +00:00
Lars Roland 138c474428 Another step towards getting the old plugin API retired:
Official plugins get linked with libethereal.dll's import library by default now. 

svn path=/trunk/; revision=13153
2005-01-21 18:50:12 +00:00
Gerald Combs 9dd5452d3e Bump the version to 0.10.9.
svn path=/trunk/; revision=13049
2005-01-15 18:18:09 +00:00
Gerald Combs 5222b52e2c Move "c:\cygwin\bin" to the end of the PATH. The latest Cygwin includes a
"link" command which collides with the MSVC linker.

svn path=/trunk/; revision=12944
2005-01-03 20:03:16 +00:00