Commit graph

169 commits

Author SHA1 Message Date
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