osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
42,477 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

168 Commits

Author SHA1 Message Date
Gerald Combs 4507b5ed3a Remove a hard-coded path. 
svn path=/trunk/; revision=44085
 2012-07-27 23:30:44 +00:00
Gerald Combs f25ae3613a 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.

svn path=/trunk/; revision=43976
 2012-07-24 23:59:42 +00:00
Gerald Combs 8d050c2828 Remove uninstall_installer.exe when we're done with it so that we don't 
have an extraneous executable in the staging directory.

svn path=/trunk/; revision=43965
 2012-07-24 16:30:03 +00:00
Gerald Combs 6b04299ae4 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.

svn path=/trunk/; revision=43864
 2012-07-20 17:56:16 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) 
svn path=/trunk/; revision=43844
 2012-07-20 01:21:27 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page. 
svn path=/trunk/; revision=43377
 2012-06-19 17:32:49 +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 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
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
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 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
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
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
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
Chris Maynard da1ae8731c Removed duplicate rawshark.html entry from DOC. 
svn path=/trunk/; revision=35239
 2010-12-21 19:45:16 +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 df14866685 WinPcap 4.1.1 -> 4.1.2. 
svn path=/trunk/; revision=33493
 2010-07-12 23:52:35 +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
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
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
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
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
Gerald Combs 7b42cf5135 Use the official kfw packages. 
svn path=/trunk/; revision=31355
 2009-12-23 00:22:12 +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 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
Anders Broman ef2d9da167 Use the latest GTK packages. 
svn path=/trunk/; revision=29943
 2009-09-16 13:34:37 +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
Jaap Keuter 8f7e6b6e55 Include profinet plugin in PLUGINS symbol. 
svn path=/trunk/; revision=28514
 2009-05-28 18:42:40 +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 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 4902722ffe More typos. 
svn path=/trunk/; revision=27706
 2009-03-11 22:16: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