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
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
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
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
cf0f78ba4b
Fetch version from correct variable, after changes done in r25232.
...
svn path=/trunk/; revision=25338
2008-05-21 12:35:05 +00:00
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
b202c984e3
Update GnuTls to gnutls-2.3.8-1
...
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
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
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
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
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
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
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
73d406c3f6
Make the SVR4 package checkinstall script work with only GTK2+.
...
svn path=/trunk/; revision=24853
2008-04-08 22:38:24 +00:00
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
9d06392749
fix u3 build
...
svn path=/trunk/; revision=24792
2008-04-05 15:15:14 +00:00
5ffcbc7faa
remove -gtk2 suffix
...
svn path=/trunk/; revision=24785
2008-04-05 08:23:37 +00:00
73c84a7d7b
remove more GTK1 stuff from the Win32 build process (incomplete)
...
svn path=/trunk/; revision=24780
2008-04-05 01:22:53 +00:00
12ac5d6859
Start the process of removing GTK1.
...
svn path=/trunk/; revision=24770
2008-04-04 18:18:18 +00:00
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
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
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
79c52c0950
Add the OS X packaging files to the distribution.
...
svn path=/trunk/; revision=24747
2008-03-28 18:49:49 +00:00
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
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
664c9aa38a
From Stig: Fix the call to osx-app.sh.
...
svn path=/trunk/; revision=24692
2008-03-19 00:02:24 +00:00
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
7519d12f8f
Make sure the Infiniband plugin is properly built and packaged.
...
svn path=/trunk/; revision=24634
2008-03-14 21:53:16 +00:00
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
396d5b4c4c
Have the uninstaller remove ws.css.
...
svn path=/trunk/; revision=24437
2008-02-22 22:22:13 +00:00
d41b403367
add rawshark.html to packaging and Wireshark help menu
...
svn path=/trunk/; revision=24431
2008-02-22 20:38:50 +00:00
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
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
5486e7db85
pcre.dll is now pcre3.dll for pcre-7.0
...
svn path=/trunk/; revision=24366
2008-02-16 21:24:52 +00:00
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
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
0d0d86cc57
(Use ifdef not IFDEF for consistency)
...
svn path=/trunk/; revision=24334
2008-02-15 03:12:52 +00:00
395ec8f4a5
iconv is now not normally used;
...
svn path=/trunk/; revision=24333
2008-02-15 03:09:07 +00:00
718b14c7ce
Glib >= 2.14.5 does not require iconv
...
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
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
c785bbf558
Removed even more C++ style comments.
...
svn path=/trunk/; revision=24186
2008-01-24 22:33:49 +00:00
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
207afe82bb
Associate Wireshark with Tektronix K12xx/K15 .rf5 files
...
svn path=/trunk/; revision=24067
2008-01-11 19:25:51 +00:00
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
064496de3a
Added missing Eriscsson.xml
...
svn path=/trunk/; revision=24027
2008-01-07 22:00:26 +00:00
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
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
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
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
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
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
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
d819c7fa95
Add missing \
...
svn path=/trunk/; revision=23495
2007-11-19 17:23:30 +00:00
72fb7227fb
Try to fix reported uninstallation problems
...
svn path=/trunk/; revision=23494
2007-11-19 16:29:41 +00:00
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
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
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
8cdc8e0d57
update WinPcap installer to recent 4.0.2
...
svn path=/trunk/; revision=23429
2007-11-11 20:36:41 +00:00
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
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
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
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
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
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
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
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
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
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
e045016645
And U3 ...
...
svn path=/trunk/; revision=23176
2007-10-14 18:34:22 +00:00
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
2cc36d7876
Also add wimaxasncp TLV desription files to U3 build.
...
svn path=/trunk/; revision=23159
2007-10-12 11:13:59 +00:00
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
4330218b15
Try to fix the U3 build.
...
svn path=/trunk/; revision=22988
2007-09-26 19:00:48 +00:00
6b4a7ba74d
Use GTK+ 2.12
...
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
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
7b6bc7a2b6
Enable NPF by default under Vista.
...
svn path=/trunk/; revision=22894
2007-09-17 18:40:34 +00:00
c42aa86007
Crap - missed this one!
...
svn path=/trunk/; revision=22823
2007-09-07 15:24:43 +00:00
15948507ae
Get smi_modules in the distrib
...
svn path=/trunk/; revision=22694
2007-08-27 22:06:47 +00:00
296a359e5a
And now the MIB's
...
svn path=/trunk/; revision=22681
2007-08-27 06:40:36 +00:00
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
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
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
4bf2ada77f
Update the NSIS files to add the UNISTIM plugin.
...
svn path=/trunk/; revision=22563
2007-08-21 17:49:54 +00:00
bd402b4d16
fix a typo
...
svn path=/trunk/; revision=22489
2007-08-12 23:38:09 +00:00
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
4ec27a3f42
Further synchronisation with wireshark.nsi
...
svn path=/trunk/; revision=22317
2007-07-15 10:59:07 +00:00
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
16d51402d8
Add ETSI e2/e4 Diameter applications
...
svn path=/trunk/; revision=22283
2007-07-10 13:20:37 +00:00
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
4155fb0433
Switch to WinPcap 4.0.1.
...
svn path=/trunk/; revision=22237
2007-07-04 00:53:03 +00:00
ffb54d975a
Add DTD file for xcap-error (RFC 4825)
...
svn path=/trunk/; revision=22148
2007-06-21 11:37:42 +00:00
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
c474b96c17
Add gqpolicy.xml to installed diameter XML files
...
svn path=/trunk/; revision=22080
2007-06-12 15:29:23 +00:00
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
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
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
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
e3f4f4ecb0
Improved cleanup of build artifacts
...
svn path=/trunk/; revision=21249
2007-03-28 16:32:47 +00:00
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
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
Stig Bjørlykke