Commit graph

279 commits

Author SHA1 Message Date
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
Ulf Lamping
3bb534f338 bugfix: add the profinet plugin to NSIS
svn path=/trunk/; revision=14404
2005-05-20 21:40:03 +00:00
Ulf Lamping
5049fe87b6 add GetWindowsVersion.nsh to the additional packaging files
svn path=/trunk/; revision=14320
2005-05-05 15:25:04 +00:00
Ulf Lamping
96a1fab95e fix descriptive texts, so they fit into the window
svn path=/trunk/; revision=14037
2005-04-10 13:43:07 +00:00
Ulf Lamping
8825aaf338 add the comment "The Ethereal Network Protocol Analyzer" to some shortcuts
svn path=/trunk/; revision=13801
2005-03-18 18:58:56 +00:00
Lars Roland
e695d5c1fc add xml and stats_tree plugin to the installer.
svn path=/trunk/; revision=13657
2005-03-07 22:31:13 +00:00
Guy Harris
6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Guy Harris
ba7e8f3b81 From Oleg Terletsky: AgentX support.
svn path=/trunk/; revision=13372
2005-02-10 06:36:21 +00:00
Lars Roland
050f70e8e0 Set Registry key for starting NPF service to "Auto Start" and not "System Start".
svn path=/trunk/; revision=13358
2005-02-08 22:10:04 +00:00