Commit Graph

587 Commits

Author SHA1 Message Date
Jörg Mayer 5667e75a50 Get rid of FAQ file completely: It's still available as help/faq.txt
svn path=/trunk/; revision=27359
2009-02-03 08:49:03 +00:00
Ulf Lamping 043532d63e add missing mt.exe calls, to include manifest files into exe / dll files
svn path=/trunk/; revision=27357
2009-02-02 23:09:36 +00:00
Stig Bjørlykke ff602b6a2a Year 2009.
svn path=/trunk/; revision=27193
2009-01-08 10:31:37 +00:00
Gerald Combs 45f8882a52 If you hand
File /oname=bar "foo"
File "foo"

to ws-manifest.pl it will generate an invalid makefile. Put the FAQ in one
place: help\faq.txt.

svn path=/trunk/; revision=27175
2009-01-07 01:06:47 +00:00
Gerald Combs 8395f0ef02 As suggested by Joerg a while back, get rid of FAQ in the build directory.
Copy help/faq.txt to FAQ in the NSIS and zip packages.

Add "help" to the dependency list for "all". Fix a couple of minor bugs
in the top-level Makfile.nmake.

svn path=/trunk/; revision=27173
2009-01-06 21:47:19 +00:00
Anders Broman 8a1b0a0414 Use GTK 2.14.5 and glib 2.18.2
Overview of Changes from GLib 2.18.2 to GLib 2.18.3
===================================================

* Build with libtool 2.x

* Bugs fixed:
 557087 mem leak in g_content_types_get_registered
 558185 'parent' variable in g_local_file_get_child_for_display_name()
         hits g_object_unref(NULL) assertion
 557210 g_compute_checksum_for_* asserts with less than 2 bytes
 528320 Incorrect icons displayed for files with custom mimetype icons
 557592 Missing include in gwinhttpfile.c
 556415 Crash on Windows 2000 in g_winhttp_vfs_init()
 556910 Memory leak: sub
 561352 Leak of icon description
 561375 Leaks mountpoint description
 560569 gkeyfile doesn't use the set list_separator in some cases
 560568 gkeyfile docs buglet
 559413 g_option_group_set_error_hook docs buglet

Overview of Changes from GTK+ 2.14.4 to 2.14.5
==============================================

* Bugs fixed:
 556578 GIMP windows stay on top of other windows
 557059 crash when compositing emblems with icon
 557266 Window Management Problem
 528320 Incorrect icons displayed for files with custom mimetype icons
 557894 Wrong return value for gdk_pointer_grab_info_libgtk_only
 557316 GtkLinkButton should consider user-defined tooltip
 558323 glitches when popping up combos in treeviews
 558278 Crash when calling a callback set by
gdk_add_client_message_filter
 557212 Problem with which window gains focus and is visible
 541391 Unfocussable Treeview swallows focus
 552956 Should check composite extension version
 554567 warning fixes (missing format specifiers and NULL vs 0)

svn path=/trunk/; revision=26960
2008-12-10 20:30:34 +00:00
Stig Bjørlykke 2de0812f1d From Alexis La Goutte (bug 3104):
Add Aruba dictionary.

svn path=/trunk/; revision=26945
2008-12-09 13:57:55 +00:00
Ulf Lamping 29f4204639 I've moved the Wireshark start menu shortcut from it's own directory into the plain start menu and removed the Wireshark start menu dir altogether, which makes it IMHO much more usable than before.
According to the "Windows Vista User Experience Guidelines" http://msdn.microsoft.com/en-us/library/aa511447.aspx (and also my own experience), the number of items in the start menu should be reduced to the minimum.

svn path=/trunk/; revision=26933
2008-12-08 18:39:20 +00:00
Gerald Combs b113a389f0 Trying to call ExecWait on the Wireshark unistaller won't work, since it
returns immediately. Copy the uninstaller to $TEMP, then run it with flags
which make it work as expected.

Fix up the old version removal dialog.

svn path=/trunk/; revision=26664
2008-11-01 00:24:10 +00:00
Stig Bjørlykke ed4c2f893d Fix bug 2844:
Make the OSX application launch when having space in the path.

svn path=/trunk/; revision=26612
2008-10-28 21:53:39 +00:00
Stig Bjørlykke 655b7825a5 Show correct dates in application info.
svn path=/trunk/; revision=26600
2008-10-28 15:14:17 +00:00
Stig Bjørlykke f72527f314 Removed ARCHS to make it build on Intel or PowerPC.
svn path=/trunk/; revision=26598
2008-10-28 13:46:31 +00:00
Stephen Fisher ea0538448d Fix issue reported in bug #2979:
Change Xcode project for ScriptExec to build only i386 ("Intel") instead of
i386 & ppc ("Universal")) since none of the rest of Wireshark or its libraries
are universal.  ScriptExec is placed in Wireshark.app/Contents/MacOS/Wireshark,
which then calls Wireshark.app/Contents/Resources/bin/wireshark-bin.  This
will make Wireshark show up as an Intel only binary instead of universal.
ScriptExec comes from the Platypus application's source code. 


svn path=/trunk/; revision=26597
2008-10-28 06:26:42 +00:00
Gerald Combs 05b7f7314e Fix a copy/paste error.
svn path=/trunk/; revision=26568
2008-10-27 04:38:21 +00:00
Gerald Combs 96fc0e8f98 Detect a previous Wireshark installation and let the user uninstall it first.
svn path=/trunk/; revision=26509
2008-10-21 16:44:35 +00:00
Anders Broman bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Gerald Combs ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs fc70b1100f Add libgail.dll to the list of files to be removed.
svn path=/trunk/; revision=26213
2008-09-16 00:57:46 +00:00
Gerald Combs e953bf064a Fix U3 packaging. Build 1.1.0 again in order to pick up the new GLib/GTK+
libraries.

svn path=/trunk/; revision=26168
2008-09-09 17:16:41 +00:00
Guy Harris d7304a880b Include a missing Diameter dictionary file.
svn path=/trunk/; revision=26167
2008-09-09 03:23:13 +00:00
Anders Broman 987a618d98 Add libgail.dll
svn path=/trunk/; revision=26165
2008-09-08 07:14:52 +00:00
Anders Broman ad54e4ed0e Use GTK+ 2.14.1
What's new in GTK+ 2.14
=======================

GTK+ 2.14 adds new functionality while maintaining source and binary 
compatibility with GTK+ 2.12. Highlights of new features and
improvements in GTK+ 2.14 are:

New widgets and objects

 * GdkAppLaunchContext, provides startup notification with 
   g_app_info_launch()
 * GtkMountOperation, can ask for passwords when mounting 
   volumes with g_volume_mount()
 * GtkToolShell, an interface for containers of GtkToolItems

Noteworthy new APIs
 
 * gtk_show_uri(), a replacement for gnome_vfs_url_show() and
   gnome_url_show()
 * gtk_widget_get_snapshot(), using pixmap redirection to render 
   snapshots of widgets

Changes in the file chooser

 The file chooser uses GIO directly, loadable backends are no longer 
 supported. Autocompletion in the file chooser entry has been improved.

Changes in printing support
 
 The print dialog displays printer status information. Support for
 rearranging pages when printing multiple pages per sheet has been
 added to the cups backend. 

Accessibility support
 
 The gail module is shipped with GTK+, GtkBuilder supports
 accessibility attributes and GtkStatusIcon supports keyboard
 navigation.

Internationalization support

 The compose sequences understood by GTK+'s builtin input method
 have been synchronized with recent X.org compose sequences, adding
 a large number of new sequences. GTK+ no longer uses translations
 when an application is not translated to the current locale.

gdk-pixbuf changes

 * Support loading OS X icns format
 * Support loading JPEG 2000 images
 * Support loading and saving to GIO streams
 * Use GIO for mime information
 
GDK changes

 GDK uses Xrandr instead of Xinerama to provide more (and dynamic)
 monitor information. Font configuration changes are now picked up
 at runtime, without an application restart.

For more details and lists of fixed bugs, see the
announcements for the 2.13.x development releases:

http://mail.gnome.org/archives/gtk-devel-list/2008-February/msg00079.html
http://mail.gnome.org/archives/gtk-devel-list/2008-May/msg00112.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00033.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00158.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00044.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00182.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00023.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00153.html

svn path=/trunk/; revision=26148
2008-09-06 15:25:23 +00:00
Gerald Combs 837f0d9d53 SecFileExtensions was removed in 2005. Don't reference it. Fixes bug 2793.
Replicate the old SecFileExtensions behavior by disabling and unchecking
the file extensions option when Wireshark is unselected.

While we're at it, add a "PLATFORM" variable to config.nmake, and use
it to set the library directory and installer filename and title.

Add a couple of minor fixes.

svn path=/trunk/; revision=26019
2008-08-14 17:54:35 +00:00
Stig Bjørlykke c1ffc9e245 Added some clean targets.
svn path=/trunk/; revision=25983
2008-08-11 19:45:02 +00:00
Gerald Combs dfef2ab632 When copying and renaming files, put quotes around the sources and
destinations.

svn path=/trunk/; revision=25957
2008-08-08 17:15:34 +00:00
Gerald Combs 021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Luis Ontanon 99331d7b99 Remove obsolete "example_snmp_users_file"
svn path=/trunk/; revision=25936
2008-08-05 20:39:31 +00:00
Anders Broman 08e72dc35b From Pascal Quantin:
Rebuilt adns library for msvcrt compatibility is not packaged in NSIS installer

svn path=/trunk/; revision=25859
2008-07-29 14:05:54 +00:00
Guy Harris 1f46ed6f11 COPYING is already put into the tarball; we don't need to add it here.
svn path=/trunk/; revision=25662
2008-07-02 08:50:11 +00:00
Guy Harris 6b1c9b4948 Push EXTRA_DIST entries into the lowest-level Makefile.am available.
svn path=/trunk/; revision=25661
2008-07-02 07:12:42 +00:00
Gerald Combs 72965329b0 Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."

Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.

(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)

svn path=/trunk/; revision=25611
2008-06-26 16:42:07 +00:00
Stig Bjørlykke 9bd7d21dff Do not overwrite existing files when copying dependencies, as this will
overwrite the wireshark libs with libs installed in /opt/local, which is
probably not the ones we want.

svn path=/trunk/; revision=25483
2008-06-18 22:47:58 +00:00
Guy Harris ff8881072b We half-enabled the Mac OS X packaging stuff, which meant that we
weren't including in the tarball stuff the packaging/macosx/Makefile.in
file that that the configure script from the tarball was trying to
expand.  Add macosx to the list of directories in packaging/Makefile.am,
and update the comment in packaging/macosx/Makefile.am to reflect the
enabling of the OS X packaging stuff.

svn path=/trunk/; revision=25449
2008-06-13 16:52:45 +00:00
Guy Harris 5f16d4b797 The change to "Use GTK+ 2.12.10" switched from "libpng13.dll" to
"libpng12-0.dll"; fix a reference to the former.

svn path=/trunk/; revision=25440
2008-06-10 17:23:36 +00:00
Stig Bjørlykke d89cbcdda3 Set SYMROOT to make osx-package work correctly on my computers.
Hopefully this will not break the buildbot.

svn path=/trunk/; revision=25351
2008-05-22 10:34:32 +00:00
Stig Bjørlykke cf0f78ba4b Fetch version from correct variable, after changes done in r25232.
svn path=/trunk/; revision=25338
2008-05-21 12:35:05 +00:00
Jeff Morriss 58459d3fba Create a new "Wireshark utility" library and move the mpeg-audio stuff from
wiretap to this new libwsutil.  This solves
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677 by making libwireshark
no longer depend on libwiretap.

svn path=/trunk/; revision=25330
2008-05-20 21:51:01 +00:00
Tomas Kukosa b202c984e3 Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
Jaap Keuter cacee64927 From Hans-Peter Bock:
Attached to this post you find a patch for integration into wireshark that adds
a dissector for SERCOS III, ethertype 0x88cd.

svn path=/trunk/; revision=25270
2008-05-10 14:44:32 +00:00
Stig Bjørlykke 00f1fcf13c From Chris:
The attached simple patch adds 2 missing help files to HELP and
alphabetizes all of them.

svn path=/trunk/; revision=25067
2008-04-16 06:28:26 +00:00
Jörg Mayer a4dc607922 configure seems to install the manpages into .../share/man/, not .../man/
svn path=/trunk/; revision=25033
2008-04-15 01:26:02 +00:00
Jeff Morriss 41d7d06414 Remove the PSTAMP line (dated 2000-07-16). Instead let the package building tool automatically fill it in so that we can get some idea where/when a particular package was actually built.
svn path=/trunk/; revision=24882
2008-04-10 21:18:55 +00:00
Graeme Lunt ac38a5c7e2 Change of GTK variable name (GTK2_LIB_DIR => GTK_LIB_DIR)
svn path=/trunk/; revision=24865
2008-04-09 17:17:26 +00:00
Ulf Lamping 22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Jeff Morriss 73d406c3f6 Make the SVR4 package checkinstall script work with only GTK2+.
svn path=/trunk/; revision=24853
2008-04-08 22:38:24 +00:00
Jeff Morriss c919e46511 Make the SVR4 package checkinstall script work with GTK1 or GTK2 (previously it only worked with GTK1). This version should go into the 1.0 trunk.
svn path=/trunk/; revision=24852
2008-04-08 22:03:42 +00:00
Ulf Lamping 9d06392749 fix u3 build
svn path=/trunk/; revision=24792
2008-04-05 15:15:14 +00:00
Ulf Lamping 5ffcbc7faa remove -gtk2 suffix
svn path=/trunk/; revision=24785
2008-04-05 08:23:37 +00:00
Ulf Lamping 73c84a7d7b remove more GTK1 stuff from the Win32 build process (incomplete)
svn path=/trunk/; revision=24780
2008-04-05 01:22:53 +00:00
Gerald Combs 12ac5d6859 Start the process of removing GTK1.
svn path=/trunk/; revision=24770
2008-04-04 18:18:18 +00:00
Jeff Morriss 0e941f397e The OS X packaging patch renamed the staging directory to .inst (instead of .stage). Update the SVR4 packaging script to reflect the new name.
svn path=/trunk/; revision=24769
2008-04-04 16:14:17 +00:00
Gerald Combs f25b110907 Remove most of the OS X packaging files from the distribution. The
files in Resources/themes/Clearlooks-Quicksilver-OSX overrun the
99-character file name length limitation imposed by the default tar
format (V7). We can fix this by

  - Feeding "tar-ustar" to AM_INIT_AUTOMAKE, which apparently means
    changing

AM_INIT_AUTOMAKE(wireshark, x.y.z)

    in configure.in to
  
AC_INIT(wireshark, x.y.z)
AM_INIT_AUTOMAKE(tar-ustar)

    Although the automake documentation recommends this, it means
    updating make-version.pl and possibly other scripts.

  - Shortening everything in the Clearlooks-Quicksilver-OSX path.

  - Skipping tar distributions altogether in favor of zip.

None of these fixes are trivial, and version 1.0 awaits. For now,
you'll have to build OS X packages from SVN.

svn path=/trunk/; revision=24752
2008-03-29 00:54:58 +00:00
Gerald Combs ebf0ed08a7 Trying to feed file names with spaces to GNU make will just end in tears.
Don't do that.

svn path=/trunk/; revision=24749
2008-03-28 21:11:53 +00:00
Gerald Combs 79c52c0950 Add the OS X packaging files to the distribution.
svn path=/trunk/; revision=24747
2008-03-28 18:49:49 +00:00
Gerald Combs 0859a2be01 Scale the 128-pixel icon down a little, so that it looks better in the dock.
Strip terminal control characters out of the build scripts, so that their
buildbot output is readable.

svn path=/trunk/; revision=24709
2008-03-21 16:09:04 +00:00
Gerald Combs d4ba88b677 Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
svn path=/trunk/; revision=24703
2008-03-20 00:30:47 +00:00
Gerald Combs 664c9aa38a From Stig: Fix the call to osx-app.sh.
svn path=/trunk/; revision=24692
2008-03-19 00:02:24 +00:00
Gerald Combs 46bcad885a Check in the OS X packaging patch from bug 2341, since I've had
confirmation that the OS X package works on at least one system
other than my laptop.

svn path=/trunk/; revision=24640
2008-03-15 18:31:52 +00:00
Gerald Combs 7519d12f8f Make sure the Infiniband plugin is properly built and packaged.
svn path=/trunk/; revision=24634
2008-03-14 21:53:16 +00:00
Ulf Lamping d171cddc77 add an error message to the NSIS compiler output, if the MSVC_VARIANT setting is obviously wrong
svn path=/trunk/; revision=24439
2008-02-22 23:09:43 +00:00
Gerald Combs 396d5b4c4c Have the uninstaller remove ws.css.
svn path=/trunk/; revision=24437
2008-02-22 22:22:13 +00:00
Ulf Lamping d41b403367 add rawshark.html to packaging and Wireshark help menu
svn path=/trunk/; revision=24431
2008-02-22 20:38:50 +00:00
Gerald Combs 4f996bd670 Use the docbook CSS for the man pages (which assumes your version of
pod2html supports the "--css" flag). Package up the CSS file, and add
missing HTML files where needed.

svn path=/trunk/; revision=24428
2008-02-22 20:03:36 +00:00
Stig Bjørlykke bd24ad1cbe Added $(GTK2_LIB_DIR)\loaders to some makefiles in an attempt to fix the
u3 and portableapp build.

svn path=/trunk/; revision=24369
2008-02-17 10:37:21 +00:00
Bill Meier 5486e7db85 pcre.dll is now pcre3.dll for pcre-7.0
svn path=/trunk/; revision=24366
2008-02-16 21:24:52 +00:00
Anders Broman 363524d728 Use gtk+ 2.12.8 glib 2.12.6-2 and pcre 7.0.
( Problem seemed to be with pxbuffloaders).

svn path=/trunk/; revision=24357
2008-02-16 16:35:49 +00:00
Gerald Combs 98bacb3556 Add rawshark, a utility that, when given raw pcap-formatted packets and
a list of fields, prints the field values found in each packet.

Packet data can be specified as a libpcap DLT, e.g. "EN10MB" or an upper-layer protocol, e.g. "http".

svn path=/trunk/; revision=24339
2008-02-15 23:20:32 +00:00
Bill Meier 0d0d86cc57 (Use ifdef not IFDEF for consistency)
svn path=/trunk/; revision=24334
2008-02-15 03:12:52 +00:00
Bill Meier 395ec8f4a5 iconv is now not normally used;
svn path=/trunk/; revision=24333
2008-02-15 03:09:07 +00:00
Bill Meier 718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Anders Broman 8f3eeff54b Split out the Gmb application AVP:s to at least make it simpler to handle the
AVP "collision".
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1494

svn path=/trunk/; revision=24235
2008-01-31 21:52:47 +00:00
Stig Bjørlykke c785bbf558 Removed even more C++ style comments.
svn path=/trunk/; revision=24186
2008-01-24 22:33:49 +00:00
Gerald Combs 56ae79a3fd Unpack FindProcDLL.dll into $(WIRESHARK_LIBS\nsis-plugins, and tell NSIS
where it is using "!addplugindir".

svn path=/trunk/; revision=24166
2008-01-23 01:23:06 +00:00
Jeff Morriss 207afe82bb Associate Wireshark with Tektronix K12xx/K15 .rf5 files
svn path=/trunk/; revision=24067
2008-01-11 19:25:51 +00:00
Jörg Mayer c0dc930689 Graeme Lunt:
(The fix is to cd back to "../portableapps/win32", rather than
"../u3/win32", at the end of the nsis-bits target in makefile.nmake.)

Me:

Get rid of some whitespace at the end of lines.

svn path=/trunk/; revision=24031
2008-01-08 08:07:45 +00:00
Anders Broman 064496de3a Added missing Eriscsson.xml
svn path=/trunk/; revision=24027
2008-01-07 22:00:26 +00:00
Graeme Lunt 039ad15bbf UPX compression corrupts the WinPcap installer - so don't UPX it.
svn path=/trunk/; revision=24014
2008-01-04 15:28:44 +00:00
Graeme Lunt 105c394521 Update to use the generic manifest and make independent of the U3 packaging.
Also tidy up.


svn path=/trunk/; revision=24013
2008-01-04 14:12:22 +00:00
Graeme Lunt b6dc767069 Changes to use a generic manifest to determine package contents, and also U3 self-certification fixes e.g.
* package size (dependent on use of UPX)
* upgrade 
* shortDescription
* vendor


svn path=/trunk/; revision=24012
2008-01-04 14:10:57 +00:00
Graeme Lunt 906d66181e A script to generate a generic manifest file from the nsis/wireshark.nsi.
The U3 and portableapps packaging will use this generic manifest to package the 
correct set of components. Thus all three packages will be kept in sync.


svn path=/trunk/; revision=24011
2008-01-04 14:07:47 +00:00
Graeme Lunt d8519d3c17 Automatically install the FindProcDll.dll NSIS plug-in required for the WiresharkPortable.exe.
This should allow the builbot to build the PortableApps packaging.


svn path=/trunk/; revision=23881
2007-12-16 08:36:16 +00:00
Graeme Lunt a189f34b84 Fixes to:
a) Check that UPX is configured correctly and offer solutions;
b) Ignore any errors generated from UPX (e.g. from previously compressed files); and
c) Clean up the tools directory when cleaning the U3 distribtion


svn path=/trunk/; revision=23622
2007-11-27 18:07:00 +00:00
Ulf Lamping 07ad3cce07 don't install the *.exe.manifest and *.dll.manifest files. The manifest is embedded in the exe/dll files, so no need to install them seperately.
svn path=/trunk/; revision=23544
2007-11-22 09:04:32 +00:00
Martin Mathieson d819c7fa95 Add missing \
svn path=/trunk/; revision=23495
2007-11-19 17:23:30 +00:00
Martin Mathieson 72fb7227fb Try to fix reported uninstallation problems
svn path=/trunk/; revision=23494
2007-11-19 16:29:41 +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
Ulf Lamping 31f090e495 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23433
2007-11-12 07:34:32 +00:00
Ulf Lamping 634b43c3f9 update various other places, where WinPcap version 4.0.1 was used
svn path=/trunk/; revision=23431
2007-11-12 07:31:38 +00:00
Ulf Lamping 8cdc8e0d57 update WinPcap installer to recent 4.0.2
svn path=/trunk/; revision=23429
2007-11-11 20:36:41 +00:00
Anders Broman 405be3098f From Valery Sigalov:
New dissector for TPNCP protocol.
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1853

svn path=/trunk/; revision=23428
2007-11-11 13:23:17 +00:00
Gerald Combs 6e207e3f34 When checking to see if we should install WinPcap, check the installed
version directly instead of trying to divine it from its name. 

svn path=/trunk/; revision=23385
2007-11-06 20:32:30 +00:00
Graeme Lunt 2314eec9cb A bit of a readme for the Wireshark Portable packaging. Includes details of the NSIS plug-in required.
svn path=/trunk/; revision=23350
2007-11-03 20:27:48 +00:00
Ulf Lamping 90935b972e at least mention in a comment, that you'll need the FindProcDLL plug-in
svn path=/trunk/; revision=23349
2007-11-03 08:48:12 +00:00
Graeme Lunt cea89f8c12 Initial Portable Apps (www.portableapps.com) packaging to produce a "Wireshark Portable" (WSP) distribution.
This allows Wireshark to be run from any USB stick, unlike the U3 packaging which must be installed on a specific U3 device.

The packaging basically builds upon the U3 distribution so new libraries/config only need to be added to the U3 makefile to update both distributions.

It still takes a "dumb" approach to WinPcap - installing it if it is not already installed and removing it (if WSP installed it) when Wireshark quits. (This is worse than the U3 packaging which only uninstalls WinPcap when the device is removed.) Really must talk to the WinPcap guys to see how we can make this less intrusive.

I am talking to John Haller (the Portable Apps guy) about fine tuning the distribution. 


svn path=/trunk/; revision=23340
2007-11-02 13:47:23 +00:00
Bill Meier 8519153567 Small fixes:
1. wireshark.bat: Quote %U3_HOST_EXEC_PATH%\wireshark.exe so pathname
   with spaces will work;
2. makefile.nmake: Use $(MAKE) /$(MAKEFLAGS) so things like 
   invoking nmake at the top level with /E to have environment 
   variables override config.namke definitions will work.

svn path=/trunk/; revision=23297
2007-10-28 18:12:52 +00:00
Graeme Lunt 23ce3f94a2 U3 package update to:
a) include smi.dll if SMI_DIR is set
b) add a batch script to run the U3 wireshark configuration by simulating the U3 environment
c) include a test step in the build process to verify that the U3 package contains all the required files (tries to run "wireshark -D")
d) include the wireshark.bat in the U3 zip file.

This final step means that the U3 package can be unzipped on any drive and run using the wireshark.bat script. (Note this currently creates an unwanted cmd window.) 


svn path=/trunk/; revision=23295
2007-10-28 11:58:16 +00:00
Anders Broman 3c419f798c Make MGCP a builtin dissector to reduce the number of plugins.
(Leave the MGCP plugin dir for now).

svn path=/trunk/; revision=23190
2007-10-15 18:57:10 +00:00
Martin Mathieson bafcd03634 In source tree, move wimaxasncp TLV files from plugin folder -> new top-level wimaxasncp folder.
svn path=/trunk/; revision=23184
2007-10-15 12:32:19 +00:00
Anders Broman 1ab1d61168 From Martin Mathieson:
Hopefully the u3 build will then be able to run to completion.

svn path=/trunk/; revision=23178
2007-10-14 22:05:52 +00:00
Anders Broman e045016645 And U3 ...
svn path=/trunk/; revision=23176
2007-10-14 18:34:22 +00:00
Anders Broman c644b82279 Ethercat plugin
Author :
Richard Kuemmel <r.kuemmel[AT]beckhoff.de>

Updates and bugfixes:
Peter Johansson <peterjohansson73[AT]gmail.com>

svn path=/trunk/; revision=23174
2007-10-14 15:45:24 +00:00
Martin Mathieson 2cc36d7876 Also add wimaxasncp TLV desription files to U3 build.
svn path=/trunk/; revision=23159
2007-10-12 11:13:59 +00:00
Martin Mathieson 5b6be0439d Install wimaxasncp TLV definition files (untested).
Q: are the plugins unconditionally installed by the win32 installer?  i.e. should the installation of these files be conditional?

svn path=/trunk/; revision=23157
2007-10-12 10:01:41 +00:00
Anders Broman 4330218b15 Try to fix the U3 build.
svn path=/trunk/; revision=22988
2007-09-26 19:00:48 +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
Gerald Combs 7b6bc7a2b6 Enable NPF by default under Vista.
svn path=/trunk/; revision=22894
2007-09-17 18:40:34 +00:00
Martin Mathieson c42aa86007 Crap - missed this one!
svn path=/trunk/; revision=22823
2007-09-07 15:24:43 +00:00
Luis Ontanon 15948507ae Get smi_modules in the distrib
svn path=/trunk/; revision=22694
2007-08-27 22:06:47 +00:00
Anders Broman 296a359e5a And now the MIB's
svn path=/trunk/; revision=22681
2007-08-27 06:40:36 +00:00
Anders Broman b4246788a3 Add SMI to the installation, the MIB:s are still missing.
svn path=/trunk/; revision=22680
2007-08-27 06:28:20 +00:00
Gerald Combs a6d76c62a5 Clear out any remaining references to the h223 plugin. Replace the
references to h223 in README.plugins with agentx since it's small and
no one seems to be in a hurry to move it to epan/dissectors. 

svn path=/trunk/; revision=22641
2007-08-24 16:08:31 +00:00
Guy Harris da5a4dac33 Add the UNISTIM plugin, and put the plugins in alphabetical order (to
simplify checking whether we have the full list).

svn path=/trunk/; revision=22565
2007-08-21 18:04:09 +00:00
Guy Harris 4bf2ada77f Update the NSIS files to add the UNISTIM plugin.
svn path=/trunk/; revision=22563
2007-08-21 17:49:54 +00:00
Ulf Lamping bd402b4d16 fix a typo
svn path=/trunk/; revision=22489
2007-08-12 23:38:09 +00:00
Ulf Lamping 0a4e09493a add IANA port-numbers file as a file named "services", with some minor explanations from me at the top of that file
add it to the distributed files, to the Win32 NSIS and U3 packages. UNIX packages will still miss this (optional) file.

svn path=/trunk/; revision=22487
2007-08-12 20:54:30 +00:00
Graeme Lunt 4ec27a3f42 Further synchronisation with wireshark.nsi
svn path=/trunk/; revision=22317
2007-07-15 10:59:07 +00:00
Graeme Lunt bba7d780e9 Include latest configuration files and remove ones no longer shipped.
(Without these configuration files defragmentation was failing - unsure why!)


svn path=/trunk/; revision=22316
2007-07-15 10:26:55 +00:00
Martin Mathieson 16d51402d8 Add ETSI e2/e4 Diameter applications
svn path=/trunk/; revision=22283
2007-07-10 13:20:37 +00:00
Jaap Keuter 1d9162b3a2 Have the installer propose to install 4.0.1 over 4.0.0.
svn path=/trunk/; revision=22259
2007-07-06 20:34:20 +00:00
Gerald Combs 4155fb0433 Switch to WinPcap 4.0.1.
svn path=/trunk/; revision=22237
2007-07-04 00:53:03 +00:00
Martin Mathieson ffb54d975a Add DTD file for xcap-error (RFC 4825)
svn path=/trunk/; revision=22148
2007-06-21 11:37:42 +00:00
Ulf Lamping e6345ad54d Since the integration into the official GTK sources, the name of GTK-Wimp is now "GTK MS Windows Engine". Change the name in the NSIS installer and the docbook docs accordingly.
svn path=/trunk/; revision=22114
2007-06-16 11:09:34 +00:00
Martin Mathieson c474b96c17 Add gqpolicy.xml to installed diameter XML files
svn path=/trunk/; revision=22080
2007-06-12 15:29:23 +00:00
Gerald Combs a491fec183 From Mike Harvey: Support for WiMAX and the WiMAX M2M encapsulation protocol.
Add support for WiMAX and M2M to various makefiles and installer files.  Add
basic support for M2M to randpkt.

svn path=/trunk/; revision=21945
2007-05-25 23:40:42 +00:00
Jörg Mayer e14af5a577 Make sure we compare against something ("") in case
GTK_CONFIG is empty.

svn path=/trunk/; revision=21884
2007-05-22 13:16:36 +00:00
Ulf Lamping 0abc3ba979 instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
2007-05-06 09:17:19 +00:00
Graeme Lunt 9efc4469dd New U3 packaging tool to generate a UUID based on the Wireshark version string within the Wireshark namespace. The Wireshark namespace UUID is:
94630be0-e031-11db-974d-0002a5d5c51b

It is based upon the example code from RFC4122 and links against gcrypt.

Using this tool allows the U3 packaging UUID to be automatically changed for new versions as well as giving each buildbot version a different UUID. 


svn path=/trunk/; revision=21694
2007-05-06 08:15:17 +00:00
Graham Bloice e3f4f4ecb0 Improved cleanup of build artifacts
svn path=/trunk/; revision=21249
2007-03-28 16:32:47 +00:00
Jeff Morriss 9fe056a3d7 Remove references to the megaco plugin from the Windows U3 packaging stuff (hopefully this is the last onegrep megaco *).
svn path=/trunk/; revision=21203
2007-03-26 06:04:17 +00:00
Jeff Morriss 6384a7a98b Remove references to the megaco plugin from the Windows packaging stuff.
svn path=/trunk/; revision=21202
2007-03-26 04:02:05 +00:00
Graeme Lunt ebf5874d29 Ensure that the correct U3 environment variables are set when the U3 Wireshark is started from a file association (e.g. opening a pcap file).
Also tweak the space requirements and restore the VERSION_EXTRA information to the description, both within the manifest.u3i.


svn path=/trunk/; revision=20964
2007-03-03 15:05:03 +00:00
Graeme Lunt 2449bf2db5 If the VERSION_EXTRA is set in config.nmake, this can lead to an invalid U3 package version in the manifest file.
So we now create the U3 package version from the base components.


svn path=/trunk/; revision=20957
2007-03-02 17:28:43 +00:00
Ulf Lamping 44b6dd623e prohibit installation on Win NT 4.0
svn path=/trunk/; revision=20906
2007-02-23 19:48:59 +00:00
Anders Broman bfb0a8f893 Copy the changes done for 0.99.5 to use WinPcap 4.0 to trunk.
svn path=/trunk/; revision=20820
2007-02-16 06:38:59 +00:00
Graeme Lunt fd3f0f3196 Remove version from Launchpad name and include a default dfilter_macros to remove start-up warning.
svn path=/trunk/; revision=20710
2007-02-04 12:35:31 +00:00
Ulf Lamping 276d768e5e quote HHC_DIR here too
svn path=/trunk/; revision=20704
2007-02-04 01:33:48 +00:00
Gerald Combs 320be55388 Add a Windows installer icon. Remove the ARGB versions from the other
Windows icons.

svn path=/trunk/; revision=20685
2007-02-02 18:45:23 +00:00
Ulf Lamping a267fc21e9 slightly better explain the user's guide "component"
svn path=/trunk/; revision=20648
2007-01-31 06:45:46 +00:00
Ulf Lamping 26b3f0b78d - add some links about U3
- fix some typos
- mention that uninstalling WS from the stick removes personal settings

svn path=/trunk/; revision=20643
2007-01-31 03:49:09 +00:00
Gerald Combs 3f00cb0e9b Switch to WinPcap 4.0.
svn path=/trunk/; revision=20622
2007-01-30 07:16:01 +00:00
Ulf Lamping eed4a86d99 if wireshark-gtk2.exe.manifest doesn't exist, don't try to copy it - hopefully fixes the buildbot...
svn path=/trunk/; revision=20618
2007-01-30 01:26:56 +00:00
Ulf Lamping 0137d412ac add some manifest files (on demand), otherwise u3 package won't work with MSVC!=6 (note that it still might need to provide msvcr*.dll files, I currently don't have a machine to test)
svn path=/trunk/; revision=20593
2007-01-28 23:36:13 +00:00
Graeme Lunt 197c6c9995 *) Ask the user if they want to install WinPcap.
*) Associate Wireshark with p7s, p7m and p7c files (if not already associated).


svn path=/trunk/; revision=20582
2007-01-28 10:10:06 +00:00
Graeme Lunt 1a9ea91193 Update manifest file (template) to:
a) remove schema reference
b) assign new GUID for 0.99.6

Update makefile.nmake to:
a) include user-guide.chm - user-guide.chm is copied from the nsis packaging directory
b) include the example_snmp_users_file
c) other tidy-ups


svn path=/trunk/; revision=20555
2007-01-25 17:37:54 +00:00
Ulf Lamping d85f759501 remove example_snmp_users_file at uninstall
svn path=/trunk/; revision=20530
2007-01-23 08:20:59 +00:00
Ulf Lamping 7fd3e76939 instead of getting the user-guide.chm file always from the docbook dir, copy the more recent one from docbook or win32-libs\user-guide dir into local nsis dir, and use that one to build the installer - seems to be the cleanest way
svn path=/trunk/; revision=20492
2007-01-19 00:10:22 +00:00
Graeme Lunt 4ea1d12df8 Update to get_persdatafile_dir() to choose a default directory on the U3 device that Wireshark is being run from.
The U3 Deployment Guide recommends a sub-directory of U3_DEVICE_DOCUMENT_PATH, so the u3util creates a "My Captures" sub-directory to use as the personal data file directory.


svn path=/trunk/; revision=20441
2007-01-15 19:11:29 +00:00
Graeme Lunt 2995e44354 Tidyups:
* clean up more things
* better directory creation
* README update


svn path=/trunk/; revision=20419
2007-01-13 17:01:43 +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
Luis Ontanon 9998032c59 Add the example_snmp_users_file to the ditribution
svn path=/trunk/; revision=20385
2007-01-10 21:48:22 +00:00
Ulf Lamping f6a83887d0 package manifest files only, if MSVC2005 / .NET SDK 2.0 is used - this should remove a warning while packaging the other variants
svn path=/trunk/; revision=20381
2007-01-10 21:37:52 +00:00
Gerald Combs a5a126a88d Fix the GNUTLS DLL names. Add the program version to the package file name.
svn path=/trunk/; revision=20380
2007-01-10 20:26:33 +00:00
Ulf Lamping ce7b1e5169 add wiretap manifest file to packaging
svn path=/trunk/; revision=20298
2007-01-03 23:12:37 +00:00
Ulf Lamping eaa4fa370a fix packaging (for now): copy the manifest files with the /nonfatal switch, so they only issue a warning if none existing (e.g. MSVC6).
This copying should be controlled by the MSVC_VARIANT setting in config.nmake instead (just like all the other alike settings).

svn path=/trunk/; revision=20286
2007-01-03 04:15:18 +00:00
Ulf Lamping 2d20cc40e2 from Laurent Rabret:
"Apply the ugly attached patch to the installer"

... it's not that ugly at all - and installs (deletes) the manifest files if available

svn path=/trunk/; revision=20285
2007-01-03 03:46:48 +00:00
Ulf Lamping 58532e4e8c delete GTK 2.10 files and dirs while uninstalling
svn path=/trunk/; revision=20284
2007-01-03 03:42:33 +00:00
Ulf Lamping 6be40f235a following the Microsoft installer guidelines: as default, an installer should not put an icon on the desktop
svn path=/trunk/; revision=20278
2007-01-02 23:55:47 +00:00
Ulf Lamping 77694f8b8e define SecMIBs only if NET_SNMP_DIR is defined - to prevent a NSIS warning
svn path=/trunk/; revision=20276
2007-01-02 22:19:48 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Bill Meier e4a99fc4dd Add a few missing /$(MAKEFLAGS)
svn path=/trunk/; revision=20046
2006-12-05 12:36:06 +00:00
Graeme Lunt e5f1a984f1 U3 Packaging update for
a) Packaging changes - including the latest GTK/GLIB/PANGO libaries
b) File associations - made when Wireshark is first run and removed when device is removed.
c) Install WinPcap - by running the installer if WinPcap is not installed. Uninstalled (if the U3 device installed it) when the device is removed. (This is an interim approach until the appropriate WinPcap U3 installation can be determined).


svn path=/trunk/; revision=19985
2006-11-26 09:04:00 +00:00
Martin Mathieson b14829d151 From Olivier Jacques:
Here is a DTD for the MSCML protocol, draft-07. This implementation is not entirely up-to-date (draft-09 is out), but this is a good base to start from.
 
I updated the WIKI with info, snapshot and sample capture: http://wiki.wireshark.org/MSCML

svn path=/trunk/; revision=19901
2006-11-15 17:27:04 +00:00
Anders Broman 3b48829115 Add SIP application AVP:s.
svn path=/trunk/; revision=19890
2006-11-14 06:31:47 +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
Guy Harris faed34492b Get rid of another ACN reference.
svn path=/trunk/; revision=19843
2006-11-07 00:56:45 +00:00
Guy Harris 6481d6f8d4 Get rid of another ACN reference.
svn path=/trunk/; revision=19842
2006-11-07 00:56:04 +00:00
Anders Broman 6b45c9b92b Remove the references to acn
svn path=/trunk/; revision=19833
2006-11-06 20:36:43 +00:00
Graeme Lunt a213330a61 Update to U3 packaging to:
*) Assign a new UUID for version 0.99.5 (so different versions of Wireshark can be installed on one U3 device)
*) Include version number in U3 program name to allow user to differentiate versions
*) Catch up with packaging changes


svn path=/trunk/; revision=19790
2006-11-04 08:01:44 +00:00
Ulf Lamping 0ce76b254e don't forget to uninstall pango\1.5.0, we might want to have something like this checked by the buildbot to prevent such problems
svn path=/trunk/; revision=19787
2006-11-03 22:12:57 +00:00
Gerald Combs 4fcbf37533 Update the Windows icons. Use the document icon for capture files.
svn path=/trunk/; revision=19784
2006-11-03 15:54:12 +00:00
Ulf Lamping 003db51709 we don't support 95/98/ME any longer, and indeed WS doesn't work on these versions.
Give a hint that the last known working version was Ethereal 0.99.0 and quit the installer.

svn path=/trunk/; revision=19776
2006-11-02 09:36:47 +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
Ulf Lamping a8b9766b6d remove two packaging warnings - could this be applied to 0.99.4?
svn path=/trunk/; revision=19651
2006-10-21 09:40:18 +00:00
Ulf Lamping fecd95b382 don't fail to create an installer if LUA_DIR or NET_SNMP_DIR are not defined (both optional)
svn path=/trunk/; revision=19642
2006-10-20 20:06:44 +00:00
Martin Mathieson 7958903f7c Add DTD for RFC 4662 (Event Notification Extension for Resource Lists) XML schema.
svn path=/trunk/; revision=19611
2006-10-19 17:37:15 +00:00
Jaap Keuter a3f017648f From Shaun Jackman
The RDM protocol has been accepted as ANSI standard E1.20-2006. The following patch updates the decoder to that spec. 
At the same time it is promoted to a build-in dissector.

svn path=/trunk/; revision=19596
2006-10-18 19:29:05 +00:00
Luis Ontanon c9d6a432a7 Have console.lua and dtd_gen.lua installed by nsis
svn path=/trunk/; revision=19580
2006-10-17 18:21:49 +00:00
Gerald Combs 4e7f9204ca If the user has a WinPcap 4.0 beta installed, force them to uninstall
it by hand before we'll install 3.1.  This avoids problems with users
accidentally downgrading WinPcap.

svn path=/trunk/; revision=19565
2006-10-16 22:47:32 +00:00
Gerald Combs d3c99f876d Set SVN properties.
svn path=/trunk/; revision=19521
2006-10-14 00:27:50 +00:00
Graeme Lunt 562beb764a Update for latest lua changes.
svn path=/trunk/; revision=19380
2006-09-30 12:58:52 +00:00
Gerald Combs bb9eaee6d0 Add lua5.1.dll to the installer.
svn path=/trunk/; revision=19344
2006-09-28 00:33:46 +00:00
Gerald Combs e21c2fe5b5 Make the NSIS distclean target be a bit more thorough about cleaning up old
installers.

svn path=/trunk/; revision=19337
2006-09-27 16:49:53 +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 9a29d41f6b fix a typo, the comment char is ; not !
svn path=/trunk/; revision=19307
2006-09-23 22:08:39 +00:00
Ulf Lamping 74a20adf13 remove AUTHOS-SHORT-FORMAT from NSIS and U3 installation
svn path=/trunk/; revision=19281
2006-09-22 07:41:56 +00:00
Ulf Lamping 85c1588650 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=19096
2006-08-30 23:25:15 +00:00
Graeme Lunt 14be5e2bcc U3 packaging, utility and Wireshark modifications that allows Wireshark to be run from a U3 USB device.
For more details see packaging/u3/win32/README.txt


svn path=/trunk/; revision=19046
2006-08-26 17:55:21 +00:00
Jörg Mayer f1803c788e As reported by Chris Maynard:
wireshark was located in /usr/X11R6/bin while dumpcap
int /usr/bin. That way wireshark couldn't find dumpcap.

Install wireshark in the same path as dumpcap and tshark.

svn path=/trunk/; revision=18874
2006-08-10 12:29:21 +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 84fd6a1f3d make nsis build aware of kerberos for windows if it is available
svn path=/trunk/; revision=18840
2006-08-05 05:12:09 +00:00
Jaap Keuter cc814b527f Fix update URL in Win32 installer
svn path=/trunk/; revision=18792
2006-07-25 13:45:54 +00:00
Anders Broman f53c99a9fa From Martin Mathieson:
Here is a DTD for xcap-caps and changes needed to install it (nsi change 
is untested).

svn path=/trunk/; revision=18767
2006-07-19 19:00:36 +00:00
Ulf Lamping ca62e8820c copy over the files from the Ethereal user profile directory, if the Wireshark dir currently doesn't exist
svn path=/trunk/; revision=18659
2006-07-04 18:40:51 +00:00
Jaap Keuter 1205ee2a14 From Christian Durrer:
I hope this is the right place to send a patch for a new dissector
plugin. The telegram it dissects are for the communication between PLCs
(Programmable logic controller) from the company Saia Burgess Controls
Ltd. (http://www.start-controls.com, http://www.saia-burgess.com or
http://www.sbc-support.ch). The protocol is named Ether-S-Bus (the PLCs
are called PCD2, PCD3, PCD4).

svn path=/trunk/; revision=18526
2006-06-21 06:31:06 +00:00
Anders Broman 94e818ac34 From Martin Mathieson:
new DTD files for the dtds folder.  They are for:
- poc-settings (RFC 4354)
- presence (RFC 3863)
- watcherinfo (RFC 3858)

svn path=/trunk/; revision=18394
2006-06-08 05:56:34 +00:00
Gerald Combs d704554ee2 Ethereal -> Wireshark
svn path=/trunk/; revision=18370
2006-06-06 23:11:31 +00:00
Anders Broman 7d22022fa3 Add a missing dtd.
svn path=/trunk/; revision=18359
2006-06-06 19:30:57 +00:00
Gerald Combs a4a7e7c4f9 Icon cleanup.
svn path=/trunk/; revision=18350
2006-06-05 19:32:44 +00:00
Ulf Lamping 19702c6564 eth -> ws
svn path=/trunk/; revision=18316
2006-06-02 08:48:07 +00:00
Gerald Combs 6a14b9a383 Fix dist/distcheck.
svn path=/trunk/; revision=18302
2006-06-01 14:28:13 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +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
Gerald Combs dedb24695e Transform ethereal.ico to wireshark.ico. Update references accordingly.
Change the name of the Windows package to "wireshark-setup-..."  Other
Ethereal -> Wireshark updates.

We _really_ need a better Wireshark icon.

svn path=/trunk/; revision=18253
2006-05-30 13:19:30 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping dd44762c87 if HHC_DIR is defined in config.nmake, include the user-guide.chm file into the Win32 installer
svn path=/trunk/; revision=17936
2006-04-20 20:33:04 +00:00
Luis Ontanon 78c12304e1 Delete init.lua when asked to delete global settings.
svn path=/trunk/; revision=17775
2006-03-30 19:56:33 +00:00
Luis Ontanon 4bafab904c This time, should be the good one!
svn path=/trunk/; revision=17607
2006-03-12 21:45:18 +00:00
Ulf Lamping 6610672d0c is that what you meant?
svn path=/trunk/; revision=17606
2006-03-12 21:15:01 +00:00
Luis Ontanon 940afa0877 Let's see if at the third attempt I get it right...
svn path=/trunk/; revision=17605
2006-03-12 20:48:14 +00:00
Luis Ontanon b85e0d1a29 Let's try again!
svn path=/trunk/; revision=17604
2006-03-12 19:47:29 +00:00
Luis Ontanon f100efb165 I Hope this works
svn path=/trunk/; revision=17603
2006-03-12 18:57:38 +00:00
Ulf Lamping 40632cc673 add dumpcap.exe and the corresponding HTML manpage to the distribution
svn path=/trunk/; revision=17259
2006-02-11 23:58:07 +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
Anders Broman c61ad2bebc Include the latest diameter.xml files
svn path=/trunk/; revision=16830
2005-12-16 20:58:50 +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
Anders Broman 54f93dda11 From Jaap Keuter:
Ethereal 0.10.13 and trunk have a glitch in the NSIS Makefile.nmake. It still works with WinPcap_3_1_beta4.exe. The attached patch resolves this.


svn path=/trunk/; revision=16299
2005-10-25 05:52:20 +00:00
Anders Broman 7d2f4603c1 Build the h223 plugin
svn path=/trunk/; revision=16140
2005-10-06 06:56:08 +00:00
Guy Harris a275cd2495 Move the Diameter dictionary files to a "diameter" subdirectory, along
the lines of what's done for RADIUS.  That keeps them together (and
separate from other files), and makes the layout of the top-level source
directory closer to the layout of the installation directory, so that if
you run Ethereal or Tethereal from the top-level directory on Windows
it'll pick up the Diameter dictionary files (if it supports loading
them), and can do so on UN*X if we support a mechanism to let it find
its control files in the directory in which the binary resides.

Use the diameter_DATA, dtds_DATA, and radius_DATA macros in the
EXTRA_DIST macro, so you only have to change the lists of Diameter, DTD,
and RADIUS files in one place if you add or remove a file.

svn path=/trunk/; revision=16050
2005-09-29 02:20:29 +00:00
Anders Broman 3832c9c86b Add disctionary.ericsson
svn path=/trunk/; revision=16041
2005-09-28 16:39:20 +00:00
Luis Ontanon 5aa2e7bf23 Get the first few dtds installed.
svn path=/trunk/; revision=15852
2005-09-17 17:17:42 +00:00
Ulf Lamping a7e184cb59 fix #388: add /desktopicon and /quicklaunchicon command line options to the NSIS installer
update the User's Guide accordingly

svn path=/trunk/; revision=15792
2005-09-14 02:07:20 +00:00
Ulf Lamping c20ffb9fd9 NSIS warning removed: the label "lbl_winpcap_dont_install" is currently unused
svn path=/trunk/; revision=15743
2005-09-09 21:04:19 +00:00
Luis Ontanon ff03ea6ef2 the xml plugin was removed
svn path=/trunk/; revision=15734
2005-09-08 22:55:39 +00:00
Ulf Lamping bff42b2dec fix #339: don't try to install WinPcap with a silent installer
svn path=/trunk/; revision=15536
2005-08-26 00:59:07 +00:00
Ulf Lamping 8615ff5f80 fix #378:
use "ip.checksum_bad == 1" instead of simply "ip.checksum_bad" in the example colorfilter file, as the implementation of that filter string changed

install the global example files unconditionally by the win32 installer, to fix this problem and be compatible with the unix install process

svn path=/trunk/; revision=15535
2005-08-26 00:01:49 +00:00
Ulf Lamping 7761e8ef56 Use the now released WinPcap 3.1 version instead of the beta 4.
We don't need to uninstall an old WinPcap version first, as this is done by the WinPcap installer itself now.

svn path=/trunk/; revision=15256
2005-08-07 23:10:06 +00:00
Jörg Mayer d65168e9ec Fix svn properties where needed:
Remove svn:executable
         Add svn:executable
         Add svn:eol-style
         Add svn:keywords


svn path=/trunk/; revision=15183
2005-08-02 06:15:02 +00:00
Gerald Combs 40101cf2b1 Update RPM builds.
svn path=/trunk/; revision=15165
2005-08-01 18:04:37 +00:00
Ulf Lamping fb1a52e028 fix from previous check in, set compression back to on :-(
svn path=/trunk/; revision=15096
2005-07-26 18:17:09 +00:00
Ulf Lamping 3d0e2f6464 fix detection of old/new WinPcap version, so WinPcap get's only installed by default if the user has a version lower than the delivered 3.1 beta 4
fix statistics tree caption

svn path=/trunk/; revision=15093
2005-07-26 17:58:17 +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 1894f6a949 bugfix: default for NPF service was default on for NT and above, but it has to be off (secure default)
stop NPF service and set it back to "On demand" if user deselected the corresponding checkbox

when upgrading from a previous Ethereal install, try to detect which choices of icons and alike was used last time, and set this as default (e.g. don't install desktop icon if I choose not to install last time)

minor text changes

svn path=/trunk/; revision=15055
2005-07-25 17:56:19 +00:00
Ulf Lamping 10f6e3ba94 as the buildbot is updated now:
using the /SOLID switch in SetCompressor again, making NSIS at least 2.07 a requirement

svn path=/trunk/; revision=15052
2005-07-25 07:42:06 +00:00
Ulf Lamping 0ef752136a make the default to not use the /SOLID switch for SetCompressor, so buildbot is working again
svn path=/trunk/; revision=15049
2005-07-24 21:25:29 +00:00
Ulf Lamping 38f827806a ... I should switch compression back on, the installer would otherwise become a bit large ...
svn path=/trunk/; revision=15017
2005-07-23 20:37:00 +00:00
Ulf Lamping dda9beb85c Installer:
- Installer now includes and installs WinPcap 3.0 (with detection)
- Install Sections are grouped now
- New Seperate page to select additional tasks like: icons, file extensions ...
- New Seperate page for WinPcap detection/installation
- Start WinPcap "NPF" service doesn't require a reboot

Uninstaller:
- New Uninstall sections page (uninstall, settings, plugins, WinPcap)
- If uninstallation selected, plugins will now be completely uninstalled (all versions, not only the current one)
- If selected, uninstallation of WinPcap

svn path=/trunk/; revision=15016
2005-07-23 20:34:43 +00:00
Ulf Lamping 3b1e369776 remove the radius dir and all it's files while uninstalling
svn path=/trunk/; revision=14978
2005-07-21 20:17:52 +00:00
Ulf Lamping 5959cdea61 Make GTK Wimp the default, so the installation type isn't always "Custom" on recent OS like 2K or XP (it will be disabled, if an "unappropriate" OS like Win98 is detected)
Grouping the sections together, so getting an idea of the available sections become an easier task

svn path=/trunk/; revision=14977
2005-07-21 20:05:37 +00:00
Luis Ontanon a9b684d48d comments are ";" not ":"
svn path=/trunk/; revision=14930
2005-07-15 22:36:21 +00:00
Luis Ontanon 853501a452 Radius Dictionary Support
Part 3: the makefiles


svn path=/trunk/; revision=14926
2005-07-15 21:18:32 +00:00
Jörg Mayer 5b442f2279 After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"
returned quite a list of files. Add them to MAINTAINERCLEANFILES.

Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.


svn path=/trunk/; revision=14891
2005-07-10 08:04:27 +00:00
Anders Broman 37915b4dd7 Add parlay.dll and tango.dll to the installer.
svn path=/trunk/; revision=14870
2005-07-07 19:48:06 +00:00
Ulf Lamping 45bac4dda7 provide global default files for cfilters/colorfilters/dfilters
at least the colorfilters file needs some more "finetuning"

NSIS (Win32): install these files into the Ethereal Program dir, but don't overwrite existing ones

makefile.am: I've added the three files to EXTRA_DIST and pkgdata_DATA, which *seems* to be the right places

svn path=/trunk/; revision=14595
2005-06-09 07:43:32 +00:00
Anders Broman 86226ad09f From Mike Duigou:
Fixes a problem with the RPM spec which prevents it from 
working with current versions of rpmbuild.

svn path=/trunk/; revision=14539
2005-06-03 06:37:05 +00:00