Commit Graph

565 Commits

Author SHA1 Message Date
gerald 68f755f336 Get the package version using configure.in, not grep+sed. Make sure we
exit with an error in a few places where it would be useful.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44572 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-19 00:49:55 +00:00
gerald 550fbda337 Remove a hard-coded path.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44085 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-27 23:30:44 +00:00
gerald 7023a83df5 Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43976 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-24 23:59:42 +00:00
gerald 6d0684a5e1 Remove uninstall_installer.exe when we're done with it so that we don't
have an extraneous executable in the staging directory.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43965 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-24 16:30:03 +00:00
gerald b67440b15c Add a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43866 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-20 18:04:00 +00:00
gerald 2f5ea45cc7 According to
http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx

and bug 7507 the Visual C++ 2010 redistributable installer might want
to reboot the system. Tell it not to do that and request a reboot at
the end of the installation process if needed.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43864 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-20 17:56:16 +00:00
mmann f13604d380 WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43844 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-20 01:21:27 +00:00
etxrab 4fcfa718e0 Make it possible to add custom/private MIBs to the Windows installer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43819 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-19 08:02:50 +00:00
darkjames 65b03d0135 Update Free Software Foundation address.
(COPYING will be updated in next commit)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43536 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-28 22:56:06 +00:00
gerald 6a65f724a0 Try to fix tarball compilation on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43428 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-21 17:35:59 +00:00
morriss c8391561bf Use separate filters for the RTT found on a SACK and the RTT found on a
DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-20 13:30:07 +00:00
wmeier 99beffec42 CVARSDLL hasn't been used (is undefined) for a while....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41180 f5534014-38df-0310-8fa8-9805f1628bb7
2012-02-24 16:23:38 +00:00
morriss 37b6d4a612 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41040 f5534014-38df-0310-8fa8-9805f1628bb7
2012-02-16 16:31:09 +00:00
jmayer c0faf6289a Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40518 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-15 21:59:11 +00:00
stig 1bfb21fdce Happy New Year!
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40353 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-01 10:02:11 +00:00
gerald 86ff12e2f0 Remove some NSIS 1.x cruft.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40318 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-28 22:42:40 +00:00
gerald c6f84043a1 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40317 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-28 22:37:38 +00:00
wmeier fc7e53fc52 Add svn:executable to props
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39858 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-15 17:44:14 +00:00
guy e1de0b2a36 Requiescat in pace, osx-build.sh.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39714 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-02 18:01:27 +00:00
gerald dc2b353257 Remove osx-build.sh. It was never fully ported to the Wireshark build
environment and has been unused for 3 years.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39713 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-02 17:36:20 +00:00
etxrab 4786061340 Remove the obsolete files fom the installer
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38816 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-31 10:25:57 +00:00
guy 2a72185ecf I guess this is the right thing to do with the "ui" directory to put it
into the U3 package.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38764 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28 19:28:17 +00:00
etxrab ef840669e1 Add the main menubar UI description.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38762 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28 18:34:52 +00:00
etxrab 4816f36030 Add the treeView popup UI description.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38760 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28 16:18:58 +00:00
etxrab f1b378e417 Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38756 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-28 15:08:31 +00:00
gerald 5edf55b717 The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38584 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-17 16:54:24 +00:00
gerald 23926eac4b Add some distclean / clean targets.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38457 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-10 20:02:31 +00:00
cmaynard 23cf35c64b 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?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38237 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-28 12:28:06 +00:00
gerald 2601a97f93 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38119 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-19 18:22:46 +00:00
guy 386224d506 We don't have an "--enable-osxapp" configure option; update a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38075 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-17 23:47:10 +00:00
guy ab12b6aa11 Get rid of the .pkg and .dmg with "make clean".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38074 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-17 20:40:13 +00:00
guy c574ce814b Handle versions of GTK+ where gdk-pixbuf is a separate library.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38072 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-17 20:23:07 +00:00
stig bd2648f6d0 Replace all strerror() with g_strerror().
Remove our local strerror implementation.
Mark strerror as locale unsafe API.

This fixes bug 5715.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37812 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-28 09:00:11 +00:00
gerald 14261ddd42 Use the latest libsmi package. Note that we now support OID resolution
on 64-bit Windows.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37808 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27 20:48:26 +00:00
gerald ab6154f867 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37778 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-23 23:04:03 +00:00
gerald 0961d988af Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37649 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-10 17:25:55 +00:00
etxrab c0753ae1e0 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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37627 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-09 06:36:40 +00:00
etxrab bcfbcce77e From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37610 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-08 05:20:43 +00:00
etxrab e67518678c Move packet-sercosiii.c to be a builtin dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37597 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07 20:33:26 +00:00
etxrab 9226a31487 Add files to distribution.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37589 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07 14:15:50 +00:00
wmeier 52a3047cdf Add new dictionary from freeradius.org: GIT 2.1.x branch.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37385 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-25 00:40:35 +00:00
wmeier bd53604d0c Remove blank line added by mistake ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37381 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24 19:20:59 +00:00
wmeier 767f417675 Update list of radius dictionary files to reflect adds/deletes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37380 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24 19:13:04 +00:00
guy e26a79320c Fix annoying typo.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37318 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-20 02:44:12 +00:00
guy 2a654e2bc4 In at least some versions of OS X SystemStarter gets cranky if the
startup item is group-writable.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37316 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-20 02:35:05 +00:00
gerald 9da930effd 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37298 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19 18:10:21 +00:00
gerald aafe3a9645 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37167 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-15 19:25:50 +00:00
gerald 3df50dc30e Fix items pointed out by Guy in bug 5756.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37129 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-13 18:23:27 +00:00
guy d78ea53b71 That's *application*/vnd.tcpdump.pcap to you.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37116 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-13 06:55:11 +00:00
guy 8980763110 Pcap files now have an official MIME type.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37114 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-13 06:11:19 +00:00