Commit Graph

727 Commits

Author SHA1 Message Date
Anders Broman 2592e50101 Don't install main-menubar-ui.xml
svn path=/trunk/; revision=43368
2012-06-19 14:54:11 +00:00
Gerald Combs 089a048d4d Add back an absolute path prefix.
svn path=/trunk/; revision=43264
2012-06-14 19:49:57 +00:00
Gerald Combs 7931a2baf6 More NSIS cleanup.
svn path=/trunk/; revision=43261
2012-06-14 18:53:55 +00:00
Gerald Combs f6e2b64a8f Fix things to match what we're doing in our portableapps counterpart.
svn path=/trunk/; revision=43246
2012-06-13 23:04:57 +00:00
Gerald Combs b5e5d6ac35 Don't add uninstall.exe to the U3/PortableApps manifest. Define
STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
2012-06-13 22:28:28 +00:00
Gerald Combs bcb021c25f Define STAGING_DIR and use it in various places instead of hard-coding
"..\.." or "..\..\wireshark-gtk2".

svn path=/trunk/; revision=43239
2012-06-13 21:03:54 +00:00
Gerald Combs c548b1097f Use terminology that conforms better with the MSDN documentation and a
style that conforms better with the rest of the NSIS output.

svn path=/trunk/; revision=43237
2012-06-13 20:11:41 +00:00
Gerald Combs a9cb4061d4 Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the
common parts to common.nsh. Creating an installer now requires two
NSIS runs:

  - uninstaller.nsi, which creates an installer (uninstall_installer.exe)
    that only writes uninstall.exe to ../../wireshark-gtk2.

  - wireshark.nsi, which bundles uninstall.exe along with the rest of
    our installation files.

If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.

Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.

svn path=/trunk/; revision=43236
2012-06-13 19:06:27 +00:00
Pascal Quantin 3be09ce941 Add TGPPS9.xml to makefile and NSIS installer
svn path=/trunk/; revision=43202
2012-06-11 13:48:11 +00:00
Guy Harris b018e77f7b No more GIOP plugins, no more GIOP loadable DLL.
svn path=/trunk/; revision=42981
2012-06-01 17:11:00 +00:00
Anders Broman 9d6d0cf275 Replace IDL generated dissector with common dll
svn path=/trunk/; revision=42926
2012-05-30 19:03:56 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
Guy Harris ed15123049 Add .ntar as a suffix (some pcap-ng files use it).
Sort the suffixes alphabetically.

svn path=/trunk/; revision=42329
2012-04-29 02:38:55 +00:00
Guy Harris c492f45a1e Make the extension lower case.
Say "Pcap" rather than "Libpcap" - pcap format is used by WinPcap as
well (and it's also read and written by this library called Wiretap
:-)).

Add an additional entry for pcap-NG.

svn path=/trunk/; revision=42328
2012-04-29 02:27:08 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo
doesn't crash.

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

svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
Gerald Combs 16a4af2d67 Add and update a bunch of Programs and Features-related registry
keys. Sort the keys by name. Calculate the installation size after all
of the files have been installed and add that in the "EstimatedSize"
key. Fix the display icon. Add a hint about our target platform. Add
version information.

We now look like a grown-up application in the Programs and Features
control panel.

svn path=/trunk/; revision=41914
2012-04-04 00:47:21 +00:00
Gerald Combs 0ef57966fc Update a couple of keys.
svn path=/trunk/; revision=41832
2012-03-29 20:22:50 +00:00
Guy Harris b7cfa1359d Now, isn't that swell! Leopard's dseditgroup doesn't return a failure
exit status if the group in question doesn't exist, so we can't use
dseditgroup on Leopard to check whether the access_bpf group exists.

Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
-read /groups/{group}" instead; the suggestion came from the addgroup.sh
script in

	https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf

svn path=/trunk/; revision=41680
2012-03-20 04:06:36 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names.
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00
Guy Harris fe37c0ccb8 Add @configure_input@ to a bunch of .in files that didn't have it.
Add $Id$ to those of said files that didn't have it, and fix one $Id to
be $Id$.

svn path=/trunk/; revision=41594
2012-03-16 03:39:51 +00:00
Alexis La Goutte d23c469785 Rename the Xylan dictionnary to Alcatel-Lucent Xylan dictionnary
Alcatel (now Alcatel-Lucent) buy Xylan in 1999...
And now Attributs RADIUS is used in Alcatel-Lucent Omniswitch Product.

svn path=/trunk/; revision=41474
2012-03-10 18:30:20 +00:00
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Jeff Morriss 149f655c58 As suggested on the -dev list today, add Wireshark_package.pmdoc to the source
distribution.

To do this, however, requires renaming that directory because automake can't
handle files with spaces in their names.

svn path=/trunk/; revision=41040
2012-02-16 16:31:09 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Stig Bjørlykke 92528dad84 Happy New Year!
svn path=/trunk/; revision=40353
2012-01-01 10:02:11 +00:00
Gerald Combs 1fc129282b Remove some NSIS 1.x cruft.
svn path=/trunk/; revision=40318
2011-12-28 22:42:40 +00:00
Gerald Combs 5ce69a0445 Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
directory.  This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.

svn path=/trunk/; revision=40317
2011-12-28 22:37:38 +00:00
Bill Meier 02c8228bd2 Add svn:executable to props
svn path=/trunk/; revision=39858
2011-11-15 17:44:14 +00:00
Guy Harris 475b93f975 Requiescat in pace, osx-build.sh.
svn path=/trunk/; revision=39714
2011-11-02 18:01:27 +00:00
Gerald Combs 376c998cff Remove osx-build.sh. It was never fully ported to the Wireshark build
environment and has been unused for 3 years.

svn path=/trunk/; revision=39713
2011-11-02 17:36:20 +00:00
Anders Broman 5198e05412 Remove the obsolete files fom the installer
svn path=/trunk/; revision=38816
2011-08-31 10:25:57 +00:00
Guy Harris c85d377856 I guess this is the right thing to do with the "ui" directory to put it
into the U3 package.

svn path=/trunk/; revision=38764
2011-08-28 19:28:17 +00:00
Anders Broman a08c67c558 Add the main menubar UI description.
svn path=/trunk/; revision=38762
2011-08-28 18:34:52 +00:00
Anders Broman 3b203417d5 Add the treeView popup UI description.
svn path=/trunk/; revision=38760
2011-08-28 16:18:58 +00:00
Anders Broman 65c3879f2d Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
svn path=/trunk/; revision=38756
2011-08-28 15:08:31 +00:00
Gerald Combs 5520a452b5 The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.

svn path=/trunk/; revision=38584
2011-08-17 16:54:24 +00:00
Gerald Combs 17351102dd Add some distclean / clean targets.
svn path=/trunk/; revision=38457
2011-08-10 20:02:31 +00:00
Chris Maynard 716766aa27 Add a cast to avoid "conversion from size_t to int, possible loss of data" warning found when attempting to create the U3 package on Windows 7-x64. Hmm, why doesn't the Window 7-x64 buildbot build U3 or portableapps packages?
svn path=/trunk/; revision=38237
2011-07-28 12:28:06 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
2011-07-19 18:22:46 +00:00
Guy Harris b1d83d8d8b We don't have an "--enable-osxapp" configure option; update a comment.
svn path=/trunk/; revision=38075
2011-07-17 23:47:10 +00:00
Guy Harris 2730ef6563 Get rid of the .pkg and .dmg with "make clean".
svn path=/trunk/; revision=38074
2011-07-17 20:40:13 +00:00
Guy Harris 0b967aa242 Handle versions of GTK+ where gdk-pixbuf is a separate library.
svn path=/trunk/; revision=38072
2011-07-17 20:23:07 +00:00
Stig Bjørlykke 8443bbbf75 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.

svn path=/trunk/; revision=37812
2011-06-28 09:00:11 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.

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

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Gerald Combs 79a0fbdca0 Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.

svn path=/trunk/; revision=37649
2011-06-10 17:25:55 +00:00
Anders Broman 85195d1e02 From Madhusudhan M:
Cisco and Vodafone Diameter AVP:s

I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972

svn path=/trunk/; revision=37627
2011-06-09 06:36:40 +00:00
Anders Broman afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Anders Broman d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Anders Broman 1ec3c2e6fd Add files to distribution.
svn path=/trunk/; revision=37589
2011-06-07 14:15:50 +00:00
Bill Meier 467cb54139 Add new dictionary from freeradius.org: GIT 2.1.x branch.
svn path=/trunk/; revision=37385
2011-05-25 00:40:35 +00:00
Bill Meier e31b02861d Remove blank line added by mistake ...
svn path=/trunk/; revision=37381
2011-05-24 19:20:59 +00:00
Bill Meier 9e31617933 Update list of radius dictionary files to reflect adds/deletes.
svn path=/trunk/; revision=37380
2011-05-24 19:13:04 +00:00
Guy Harris a9447bddf0 Fix annoying typo.
svn path=/trunk/; revision=37318
2011-05-20 02:44:12 +00:00
Guy Harris 4b7cc99d00 In at least some versions of OS X SystemStarter gets cranky if the
startup item is group-writable.

svn path=/trunk/; revision=37316
2011-05-20 02:35:05 +00:00
Gerald Combs 99d4de66e5 From Dirk Jagdmann via bug 5875:
My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.

The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.

To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml".  Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.

You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.


From me:

Minor fixups.

svn path=/trunk/; revision=37298
2011-05-19 18:10:21 +00:00
Gerald Combs cdca166a64 Fix the ChmodBPF startup item permissions. Handling this within
PackageMaker would be a more correct fix. Replacing PackageMaker with
something that fits our development and deployment model would be an
even more correct fix.

svn path=/trunk/; revision=37167
2011-05-15 19:25:50 +00:00
Gerald Combs 67a005df11 Fix items pointed out by Guy in bug 5756.
svn path=/trunk/; revision=37129
2011-05-13 18:23:27 +00:00
Guy Harris 26a6f4aac4 That's *application*/vnd.tcpdump.pcap to you.
svn path=/trunk/; revision=37116
2011-05-13 06:55:11 +00:00
Guy Harris d16a7ec2b6 Pcap files now have an official MIME type.
svn path=/trunk/; revision=37114
2011-05-13 06:11:19 +00:00
Gerald Combs e7f42e46b2 Try to fix distcheck.
svn path=/trunk/; revision=37108
2011-05-13 00:29:10 +00:00
Gerald Combs 1fc831c211 More OS X installer fixes and tweaks.
svn path=/trunk/; revision=37107
2011-05-12 23:46:31 +00:00
Gerald Combs 0d1658db91 Fix the OS X packaging build.
svn path=/trunk/; revision=37105
2011-05-12 21:42:55 +00:00
Gerald Combs 3c274a3bfe Remove "--version ..." to see if it fixes the builds.
svn path=/trunk/; revision=37096
2011-05-12 19:09:53 +00:00
Gerald Combs 835d5e4ec7 Switch to an installer package for OS X instead of a draggable app
bundle. There are still a few rough edges but it's an improvement over
what we currently have. Fixes bug 5756.

svn path=/trunk/; revision=37093
2011-05-12 18:02:00 +00:00
Gerald Combs 92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
2011-04-05 22:38:12 +00:00
Gerald Combs 303539c005 More manifest fixes.
svn path=/trunk/; revision=36482
2011-04-05 22:33:37 +00:00
Gerald Combs 977ccf7f9b Remove the manifest as a prerequisite for packaging.
svn path=/trunk/; revision=36476
2011-04-05 16:14:19 +00:00
Gerald Combs 89de0e74a0 Don't build a manifest if we don't need one.
svn path=/trunk/; revision=36448
2011-04-04 15:41:07 +00:00
Gerald Combs 2009cc6f17 Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
2011-03-01 19:40:51 +00:00
Gerald Combs b83634d5a9 Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.
svn path=/trunk/; revision=35930
2011-02-12 17:54:36 +00:00
Jaap Keuter 78ee220881 makefile.nmake => Makefile.nmake
svn path=/trunk/; revision=35752
2011-02-02 06:14:27 +00:00
Bill Meier 917a367ba0 makefile.nmake => Makefile.nmake
svn path=/trunk/; revision=35750
2011-02-02 02:52:53 +00:00
Bill Meier 81a35645ef Use $(WARNINGS_ARE_ERRORS) (defined in config.nmake) iso -WX
svn path=/trunk/; revision=35748
2011-02-02 02:10:24 +00:00
Chris Maynard b808a5f5e6 Revert back to NSIS from NSIS Unicode to resolve bug 5558.
svn path=/trunk/; revision=35455
2011-01-10 16:27:09 +00:00
Stig Bjørlykke 388453b79d New Year.
svn path=/trunk/; revision=35322
2011-01-01 12:23:21 +00:00
Chris Maynard 252861e6af Updates for Wireshark portable installer. Using nsis unicode now.
svn path=/trunk/; revision=35300
2010-12-29 20:41:53 +00:00
Chris Maynard da1ae8731c Removed duplicate rawshark.html entry from DOC.
svn path=/trunk/; revision=35239
2010-12-21 19:45:16 +00:00
Chris Maynard 1b38a8f876 Allow more than one instance of Wireshark to be started. For now, the stuff
that disallowed it is just commented out.  Later, we might choose to make use
of AllowMultipleInstances like other portableapps do, such as Firefox, et al.
This change was made as a result of the following query on the -users list:

    http://www.wireshark.org/lists/wireshark-users/201012/msg00008.html

svn path=/trunk/; revision=35104
2010-12-02 20:05:19 +00:00
Stephen Fisher 68241fa66f Now the Microsoft Visual C++ 2010 redistributable for x86 (32-bit) brings up a confusing dialog asking the user to repair or remove it if it's already installed. Change it to (re-)install quietly (/q command-line option) like we do with the 64-bit version.
svn path=/trunk/; revision=35094
2010-12-01 20:48:44 +00:00
Bill Meier d1b6eacf21 Add $Id$; Fix some properties.
svn path=/trunk/; revision=34996
2010-11-21 19:03:17 +00:00
Anders Broman fd44a8829a From Taras Kotov:
Add RADIUS dictionary for vendor Eltex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5415

svn path=/trunk/; revision=34943
2010-11-18 09:51:50 +00:00
Chris Maynard 61d26e2c7b Use Wireshark installer icon for portable apps installer. Fixes bug 4374.
svn path=/trunk/; revision=34687
2010-10-29 15:57:47 +00:00
Stig Bjørlykke 8be03c48ec Copy GDK pixbuf loaders libs to the Wireshark.app.
svn path=/trunk/; revision=34583
2010-10-20 10:37:11 +00:00
Jeff Morriss dd53f9a1bd Use PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version.
svn path=/trunk/; revision=33922
2010-08-25 15:28:26 +00:00
Gerald Combs 4f5057e218 Add !ENDIF if needed.
svn path=/trunk/; revision=33880
2010-08-22 00:41:06 +00:00
Guy Harris ad3d20d9c5 Don't speak of XQuartz - at least one person thought we meant that you
had to install XQuartz from Mac OS X Forge, rather than just installing
the X11 that comes with OS X.

svn path=/trunk/; revision=33736
2010-08-08 21:04:42 +00:00
Gerald Combs df14866685 WinPcap 4.1.1 -> 4.1.2.
svn path=/trunk/; revision=33493
2010-07-12 23:52:35 +00:00
Guy Harris 8ce7b20cf3 Don't set SDKROOT - which SDK we want depends on which OS we want this
to run on, and not setting it should default to the OS on which we're
building it (as opposed to an OS for which we might not *have* an SDK).

svn path=/trunk/; revision=33458
2010-07-06 19:37:17 +00:00
Gerald Combs 195f3ba118 The .dmg packages can come in 32-bit and 64-bit flavors. Name them
accordingly.

svn path=/trunk/; revision=33222
2010-06-13 23:02:18 +00:00
Gerald Combs 423669df7d Back out r33088 for now.
svn path=/trunk/; revision=33102
2010-06-05 00:29:31 +00:00
Gerald Combs f6b2458924 From Matt Poduska via bug 1957 (with minor changes):
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader
protocol (see llrp.org for more information). This dissector has passed fuzz
testing.

svn path=/trunk/; revision=33088
2010-06-04 18:45:02 +00:00
Jeff Morriss beca46d33b From Jay Moran via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4697 :
Fix generation of ~/.wireshark-etc/pangorc to fix font issue.

svn path=/trunk/; revision=32751
2010-05-11 13:42:13 +00:00
Jeff Morriss eebecd3a72 Attempt (blindly--I don't have a Mac) to fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2844 :

Quote all references to $HOME in case that variable has a space in it.

svn path=/trunk/; revision=32449
2010-04-12 16:26:27 +00:00
Gerald Combs 64fce08dc7 Fix the U3 and PortableApps builds.
svn path=/trunk/; revision=32441
2010-04-09 23:51:22 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00
Anders Broman 5b6b7c4262 Revert incorrect change.
svn path=/trunk/; revision=32430
2010-04-08 19:06:27 +00:00
Anders Broman 2ed3c977fc Add Windows 7(Untested).
svn path=/trunk/; revision=32402
2010-04-06 16:20:19 +00:00
Bill Meier 2b75413d3a Set svn:executable property for some .py and .pl files
svn path=/trunk/; revision=32287
2010-03-25 22:22:45 +00:00
Anders Broman ed3838ac13 From KATAOKA Toshihiro:
Diameter Mobile IPv6 is not decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4597
(I added some more IANA updates as well).

svn path=/trunk/; revision=32235
2010-03-18 21:29:58 +00:00
Uwe Girlich c4d29dfd99 This adds a new dissector plugin: INTERLINK. This protocol is used in
(real and simulated) BMW cars for all kinds of gadget communication.
My plugin only dissects the high level infrastructure and not any particular
messages. It uses a heuristic dissector to detect INTERLINK packets.

svn path=/trunk/; revision=32202
2010-03-16 06:58:25 +00:00
Anders Broman fd56c2087d Add a missing port from 1.2
svn path=/trunk/; revision=31884
2010-02-15 22:18:42 +00:00
Anders Broman 72cfbf1e01 Use the latest GTK bundle (2.18.7)
svn path=/trunk/; revision=31882
2010-02-15 20:57:50 +00:00
Gerald Combs 2e0cc063c0 Drop support for Windows 2000 in 1.3 and later.
svn path=/trunk/; revision=31849
2010-02-09 19:13:57 +00:00
Bill Meier a36e595c8d Don't try to build NSIS installer if MAKENSIS not defined in config.nmake.
Fixes Bug #3362.
Also: Use _FORCE_ instead of FORCE as dummy target.

svn path=/trunk/; revision=31510
2010-01-12 22:27:41 +00:00
Gerald Combs 5e1f4c871e From Elliott: Add contrast to the border.
svn path=/trunk/; revision=31505
2010-01-12 18:03:12 +00:00
Anders Broman 907be7ccf6 Make it easy to add custom plugins to the installer.
svn path=/trunk/; revision=31497
2010-01-11 14:48:28 +00:00
Bill Meier 19beda3aff Change "Source" to use http://wireshark.org/download/automated/src/...
i

svn path=/trunk/; revision=31483
2010-01-10 19:40:18 +00:00
Bill Meier bb1873f343 Fix 'make rpm-package' so it works again ...
Specifically: configure.in was changed in SVN 31068
 to "Switch to .tar.bz2 for the "dist" target since
 that's what most people download".

So: This patch has the required additional changes.


svn path=/trunk/; revision=31481
2010-01-10 19:24:26 +00:00
Stig Bjørlykke e6a0b91f06 Remove copying gnome-vfs modules, we don't use it.
svn path=/trunk/; revision=31405
2010-01-01 23:42:38 +00:00
Stig Bjørlykke 8c3069eadb Happy New Year!
svn path=/trunk/; revision=31396
2010-01-01 12:15:27 +00:00
Gerald Combs 7b42cf5135 Use the official kfw packages.
svn path=/trunk/; revision=31355
2009-12-23 00:22:12 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
2009-12-21 21:06:01 +00:00
Gerald Combs 7524c0b963 Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer
build.

svn path=/trunk/; revision=31301
2009-12-17 22:01:13 +00:00
Gerald Combs 3fb88e20df Add u3util.exe.manifest to the distribution.
svn path=/trunk/; revision=31067
2009-11-24 22:13:56 +00:00
Gerald Combs e18f01d410 Use INTL_DLL for the gettext DLL name.
svn path=/trunk/; revision=31028
2009-11-19 22:02:44 +00:00
Gerald Combs 907bf4e36b Switch from individual GLib, GTK+, and related packages to the all-in-one
versions.

svn path=/trunk/; revision=31023
2009-11-19 20:27:08 +00:00
Gerald Combs 2d68938fc0 Rename the doc icon for consistency.
svn path=/trunk/; revision=30991
2009-11-17 17:18:59 +00:00
Gerald Combs 4c7a787b3d Update the document icons.
svn path=/trunk/; revision=30990
2009-11-17 17:07:06 +00:00
Gerald Combs 1bc9218ac2 Add a missing file.
svn path=/trunk/; revision=30732
2009-10-27 19:35:40 +00:00
Gerald Combs b3e5d2f39d More fixes from John T. Haller via bug 4158, with some cleanups from me.
svn path=/trunk/; revision=30696
2009-10-25 19:33:36 +00:00
Gerald Combs b1a5c989ee Add updates from bug 4158.
svn path=/trunk/; revision=30681
2009-10-23 21:38:38 +00:00
Gerald Combs 09a0650607 Update WinPcap and the developer's pack to 4.1.1.
svn path=/trunk/; revision=30652
2009-10-21 03:13:42 +00:00
Gerald Combs ccdf52a4cc Update the WinPcap installer to 4.1. The WinPcap installer now enables
NPF at startp, so remove the checkbox and associated code from the
Wireshark installer.

svn path=/trunk/; revision=30640
2009-10-20 16:22:14 +00:00
Gerald Combs 76a108ab01 Install the CRT DLLs using the Visual C++ Redistributable Package
(vcredist_x64.exe) on Win64. This should fix bug 4024.

svn path=/trunk/; revision=29977
2009-09-17 21:54:52 +00:00
Anders Broman ef2d9da167 Use the latest GTK packages.
svn path=/trunk/; revision=29943
2009-09-16 13:34:37 +00:00
Gerald Combs f218286db5 More Finder tweaks.
svn path=/trunk/; revision=29903
2009-09-14 18:00:01 +00:00
Gerald Combs 9accb15581 Tweak the Finder windows a bit.
svn path=/trunk/; revision=29886
2009-09-14 00:38:54 +00:00
Guy Harris e89ad210c7 Put in a note about the Snow Leopard bug that requires that you have BPF
devices open for writing in order to capture outgoing traffic.

svn path=/trunk/; revision=29831
2009-09-10 00:37:16 +00:00
Guy Harris 6efbdf6cc9 To quote
http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/Articles/StartupItems.html

"Table 1  StartupParameters.plist key-value pairs

Key		Type	Value
Description	String	A short description of the startup item,
			used by administrative tools.

Provides	Array	The names of the services provided by this
			startup item.  Although a startup item can
			potentially provide multiple services, it is
			recommended that you limit your startup items
			to only one service each."

Fix "Provides" to be the name of the service, not a description of the
helpful operations that it provides.

(Propagated from tcpdump.org git repository.)

svn path=/trunk/; revision=29830
2009-09-09 23:56:27 +00:00
Stig Bjørlykke dae465ed6f Fixed some warnings and removed unused code.
svn path=/trunk/; revision=29765
2009-09-07 12:24:38 +00:00
Kovarththanan Rajaratnam 974849a9a0 Remove strcasecmp. We use g_ascii_strcasecmp exclusively
svn path=/trunk/; revision=29643
2009-08-31 19:47:50 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs 4c7f40f3f5 Add a compile-time option to use a separate thread for reading from
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).

This should fix bug 1759.

svn path=/trunk/; revision=29574
2009-08-26 23:16:37 +00:00
Guy Harris 9d9d2f4156 Add another theme candidate.
svn path=/trunk/; revision=29571
2009-08-26 19:58:23 +00:00
Guy Harris 70416bc4a3 Note that we might want to look at some other themes, to see if any are
more like OS X (especially more like Leopard).

svn path=/trunk/; revision=29567
2009-08-26 19:17:25 +00:00
Kovarththanan Rajaratnam 66afe84075 Use <gcrypt.h> instead of 'gcrypt.h'
svn path=/trunk/; revision=29501
2009-08-21 20:40:49 +00:00
Kovarththanan Rajaratnam d36637e8f5 Pass on WinPcap/MSVC redistributable executables to the WiresharkPortable launcher and not the extractor.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3547.

svn path=/trunk/; revision=29335
2009-08-08 09:22:58 +00:00
Bill Meier e10eb5770c Revised packaging for the Radius directory:
include new Radius dictionary files & etc.

svn path=/trunk/; revision=29043
2009-07-09 20:31:22 +00:00
Stig Bjørlykke bb810ef093 WiresharkPortable.ini -> WiresharkPortable.tmpl
svn path=/trunk/; revision=28882
2009-06-29 20:16:20 +00:00
Graeme Lunt a539aa732c Changes to address bug 3547:
1) Make sure WiresharkPortable.nsi uses correct WinPcap version (from config.nmake), and also vcredist.
2) Automatically generate WiresharkPortable.ini with correct default values
3) Include readme.txt in the distribution so that users know how to use WiresharkPortable.ini

Thanks to Kovarththanan Rajaratnam for basic patch.


svn path=/trunk/; revision=28880
2009-06-29 13:01:54 +00:00
Anders Broman 6a5ea97ff6 From Sebastien Decugis:
Add Missing Diameter EAP support.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3600

svn path=/trunk/; revision=28849
2009-06-26 05:48:03 +00:00
Jeff Morriss aabbf43197 AUTHORS-SHORT is now in the doc subdirectory
svn path=/trunk/; revision=28788
2009-06-21 15:47:40 +00:00
Graeme Lunt b96499fb63 Update for the latest WinPcap and also installation of the VC redistributable.
svn path=/trunk/; revision=28717
2009-06-13 08:20:46 +00:00
Gerald Combs 114574229a Back out the previous change, after reading the System Startup documentation.
svn path=/trunk/; revision=28714
2009-06-12 15:37:28 +00:00
Gerald Combs 043a17b387 As pointed out by Aaron Outhier, we need to call StartService instead of
RunService.

svn path=/trunk/; revision=28713
2009-06-12 15:26:34 +00:00
Gerald Combs 1d0ae8dadb Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
2009-06-10 01:30:49 +00:00
Graeme Lunt bb14641726 Update to install latest WinPcap and silently install/uninstall the Visual C++ 2008 Redistributable.
svn path=/trunk/; revision=28594
2009-06-02 11:56:28 +00:00
Stig Bjørlykke 257180c801 Added support for python bindings in the OSX package.
svn path=/trunk/; revision=28548
2009-05-31 18:30:46 +00:00
Gerald Combs cdb0465761 Add WinPcap_4_1_beta5.exe to the distribution.
svn path=/trunk/; revision=28523
2009-05-29 17:06:25 +00:00
Gerald Combs 3c0f8a4f52 Install WinPcap 4.1 beta5. It's stable, and is required for Win64.
svn path=/trunk/; revision=28521
2009-05-29 16:28:20 +00:00
Jaap Keuter 8f7e6b6e55 Include profinet plugin in PLUGINS symbol.
svn path=/trunk/; revision=28514
2009-05-28 18:42:40 +00:00
Gerald Combs 0ae0a4e0b3 Update the .svg files as well.
svn path=/trunk/; revision=28474
2009-05-25 23:07:12 +00:00
Gerald Combs c63055e010 Increase the size of the Finder windows slightly.
svn path=/trunk/; revision=28473
2009-05-25 23:02:34 +00:00
Gerald Combs c6f8385a44 Strip single quotes around our output paths. This should fix the current
U3 buildbot failure.

svn path=/trunk/; revision=28438
2009-05-21 19:53:35 +00:00
Gerald Combs a5f53652c6 From Andreas Heise via bug 3357: Allow spaces in VERSION_EXTRA.
svn path=/trunk/; revision=28384
2009-05-17 18:46:50 +00:00
Gerald Combs 163ee4356b Add missing files to the distribution.
svn path=/trunk/; revision=28136
2009-04-23 00:12:16 +00:00
Gerald Combs 8a6694ccd5 Don't rename the "ChmodBPF" directory to "Startup". Add an alias to
/Library/StartupItems with an arrow similar to the top-level directory.
Update the arrow image in the top-level directory. Adjust the layouts of
the top-level and Utilities directories. Update the documentation.

svn path=/trunk/; revision=28135
2009-04-22 20:37:48 +00:00
Jeff Morriss bf1e65fac0 From Anders: add the OPCUA plugin to the Windows distribution
svn path=/trunk/; revision=28123
2009-04-22 12:19:59 +00:00
Gerald Combs db297df99a Remove some backslashes that were inadvertently continuing lines.
svn path=/trunk/; revision=28100
2009-04-20 21:20:47 +00:00
Gerald Combs 1106881244 If our target is Win64, install into $PROGRAMFILES64\Wireshark by default.
(This doesn't work on my test system, but appears to be correct).

svn path=/trunk/; revision=28082
2009-04-17 22:09:26 +00:00
Gerald Combs a6265b13e6 Try to handle attempts at installing 64-bit Wireshark on a 32-bit system.
Fix Win64 package building.

svn path=/trunk/; revision=28077
2009-04-17 17:32:48 +00:00
Gerald Combs beede77106 Associate .pcapng files with Wireshark.
svn path=/trunk/; revision=28056
2009-04-15 18:10:30 +00:00
Anders Broman 83d1303053 From Naoyoshi Ueda:
Radius dissector enhancement to support WiMAX vendor specific attributes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3176

svn path=/trunk/; revision=27937
2009-04-02 19:05:52 +00:00
Gerald Combs 411f9c9cf1 Add a note about 10.5.
svn path=/trunk/; revision=27867
2009-03-27 16:25:49 +00:00
Martin Mathieson 26059e7558 From Anders: Fix a typo
svn path=/trunk/; revision=27710
2009-03-12 10:58:53 +00:00
Gerald Combs 4902722ffe More typos.
svn path=/trunk/; revision=27706
2009-03-11 22:16:35 +00:00
Gerald Combs 3208754486 Fix a tpo.
svn path=/trunk/; revision=27705
2009-03-11 22:15:35 +00:00
Gerald Combs a0afeb9cce Convert more PLATFORMs to WIRESHARK_TARGET_PLATFORM.
svn path=/trunk/; revision=27702
2009-03-11 18:23:02 +00:00
Jaap Keuter 23461c4382 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27506
2009-02-22 12:01:19 +00:00
Jaap Keuter 9da243b13c Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27505
2009-02-22 11:43:37 +00:00
Jaap Keuter 4683efcfe2 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27504
2009-02-22 11:25:16 +00:00
Jaap Keuter 80863f9568 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27503
2009-02-22 11:10:29 +00:00
Jaap Keuter 9fb248f1c0 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27502
2009-02-22 10:52:05 +00:00
Jaap Keuter 03bbd18a0b Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27501
2009-02-22 10:29:14 +00:00
Jaap Keuter eb77f8a35e Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27500
2009-02-22 10:04:39 +00:00
Jaap Keuter 1948ad3985 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27499
2009-02-22 09:41:05 +00:00
Jaap Keuter b171a36a4f Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27498
2009-02-22 09:24:27 +00:00
Jaap Keuter 56a1139bc0 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27497
2009-02-22 09:09:27 +00:00
Jaap Keuter 663f835c1e Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27496
2009-02-22 00:04:14 +00:00
Jaap Keuter 47f31f3f91 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27495
2009-02-21 22:22:16 +00:00
Jaap Keuter 715fd1d169 Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27492
2009-02-21 20:22:40 +00:00
Gerald Combs b399825028 Guy pointed out that we were still checking for the Microsoft Layer for
Unicode, which is only needed for platforms we no longer support.

svn path=/trunk/; revision=27485
2009-02-18 22:24:21 +00:00
Gerald Combs 0931527997 Make the dialog that confirms uninstalling the previous version of
Wireshark default to "yes" for silent installs. Add silent default
actions for other dialogs. Don't do so for error messages, since we
probably want the user to see those no matter what. Fixes bug 3260.

Switch back to using the uninstaller icon (which got clobbered 2 weeks
after it was introduced in 2007).

svn path=/trunk/; revision=27484
2009-02-18 20:27:16 +00:00
Guy Harris 3ee3e3ee51 Add ipmap.html to the list of files installed and uninstalled.
svn path=/trunk/; revision=27466
2009-02-16 18:27:29 +00:00
Stig Bjørlykke a10b54dc85 Corrected directory for Info.plist.in
svn path=/trunk/; revision=27400
2009-02-09 11:19:26 +00:00
Jörg Mayer a04a5d70e6 Chris Maynard:
Fix for part one of bug 3120: Add packaging/macosx/Info.plist.in
to the distribution list.

svn path=/trunk/; revision=27395
2009-02-08 21:33:51 +00:00
Ulf Lamping b0ceb7cf93 fix the buildbot: linking u3util.exe won't create a manifest file, so don't try to include it
svn path=/trunk/; revision=27368
2009-02-04 21:31:34 +00:00
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