Based on the one from Richard Hughes.
A French translation of the description field is included.
Links to two screenshots are provided--they are stored in my home directory
on wireshark.org (for lack of a better place that I can put them).
Bug: 10479
Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54
Reviewed-on: https://code.wireshark.org/review/4178
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
commit 852f15c72d41c637865776d5b80097e8ffbbb444
Author: Alan T. DeKok <aland@freeradius.org>
Date: Mon Jan 26 13:08:21 2015 -0500
As found on the net
commit 53bf263d6ca9010acdc004bada894b1bfe0ed676
Author: Tobias Hachmer <tobias@hachmer.de>
Date: Mon Jan 26 13:45:04 2015 +0100
add perle dictionary
Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0
Reviewed-on: https://code.wireshark.org/review/6835
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
First, it appears some packagers actually ship a pkg-config file for Lua.
Try to use it. (Unfortunately the package name varies so we have to try
several package names.)
If that fails, try to find Lua directly, accounting for the various naming
conventions we've seen.
Bug: 10475
Bug: 10572
Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a
Reviewed-on: https://code.wireshark.org/review/6756
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
(yet) use libcodec.
Also, there's no need to explicitly call pkg-config to get SBC's
CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.
Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
Reviewed-on: https://code.wireshark.org/review/6700
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.
Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
reverts commit 89291ad4f3
Protect the new macro with "m4_ifdef" instead.
Add comments to keep the old and the new flags in sync.
Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0
Reviewed-on: https://code.wireshark.org/review/6343
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
It may have been part of the "build Qt Wireshark as C++" hacks, and is
now causing build problems.
Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c
Reviewed-on: https://code.wireshark.org/review/6200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
if it is ever created during the build process.
Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360
Reviewed-on: https://code.wireshark.org/review/6030
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
It will be reused form generate AUTHORS file
Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Use it to check whether we need -lm for various math functions -
including floorl(). Let it handle adding -lm, rather than having that
in the various _LDADD macros.
Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81
Reviewed-on: https://code.wireshark.org/review/5908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.
Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.
Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.
Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.
Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Our "make install" process does nothing with 'alternatives'. Our RPMs do use
alternatives but they do the necessary update-alternatives stuff already.
(If someone wants to set up Linux "make install"s to use alternatives it would
make sense to put these notes to the user back in.)
Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e
Reviewed-on: https://code.wireshark.org/review/5622
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Wireshark is the desktop app; if we're not building it (i.e., we're only
building the command-line TShark), we don't need any desktop files.
Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
Reviewed-on: https://code.wireshark.org/review/5615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It doesn't need it, so don't install those files, or uninstall them, or
suggest running various unnecessary commands after the installation
finishes.
Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967
Reviewed-on: https://code.wireshark.org/review/5614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This covers a bunch of commands that might have to be run after "make
install". ("might" - none are needed on OS X, for example, as it's a
different desktop and its dynamic loader doesn't have a cache that you
have to manually update whenever you install a new shared library.)
Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6
Reviewed-on: https://code.wireshark.org/review/5606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(And remove them with "make uninstall".)
Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5
Reviewed-on: https://code.wireshark.org/review/5582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We're not necessarily running from the top-level source directory.
Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308
Reviewed-on: https://code.wireshark.org/review/5579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Just in case not all shells expand {list}, create the apps/icons and
apps/mimetypes directories separately; that makes it a bit clearer in
any case.
Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7
Reviewed-on: https://code.wireshark.org/review/5578
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We always install them because of bug 10737.
We install them under $(datadir) because that's where we should install
our data - if your desktop environment can't find the icons there,
either it's broken (file a bug) or misconfigured (fix the configuration
or, if you didn't configure it, file a bug).
Bug: 10737
Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f
Reviewed-on: https://code.wireshark.org/review/5576
Reviewed-by: Guy Harris <guy@alum.mit.edu>
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Nov 25 16:45:45 2014 -0500
as found on the net
commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu Nov 13 17:39:46 2014 -0500
Add memcached rlm_cache_driver
commit 6277960bc830891123b00400af56912e51d4d311
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Oct 28 17:01:49 2014 -0400
Add FreeRADIUS-Response-Delay-USec
Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
Reviewed-on: https://code.wireshark.org/review/5510
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
c++ compiler to automatically create a dummy.cpp file and remove it when
make clean is issued. This allows make tags to work again since the
file isn't missing.
Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
Reviewed-on: https://code.wireshark.org/review/5494
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update.
Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25
Reviewed-on: https://code.wireshark.org/review/4947
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Optimize the toolbar PNGs.
To do: The rest of the PNGs.
Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802
Reviewed-on: https://code.wireshark.org/review/4978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a -cb/--create-bundle option to osx-app.sh which builds the
application bundle. Use it in Autotools. (CMake does this by default.)
Copy over linker flags from configure.ac to CMakeLists.txt to support
rpathification and code signing.
Add an osx-app custom target to CMake.
Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803
Reviewed-on: https://code.wireshark.org/review/4918
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Set the main window icon to the "wsiconcap" version while we're capturing
similar to the GTK+ version. Verified on Windows. Not sure if this will
do anything on other platforms.
Change-Id: I9b082601a2c47e5f52cc38ac8d9b4d9f5fb9a4d9
Reviewed-on: https://code.wireshark.org/review/4230
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add ".on" versions of the x-capture-start icon along with corresponding
code in the StockIcon constructor to look for ".on" variants and add
them with the QIcon::On state.
Make the plain versions of x-capture-start blue to match the general
application icon. The goal is to make the toolbar and app icon fins blue
when Wireshark is "at rest" and green when it's capturing.
Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7
Reviewed-on: https://code.wireshark.org/review/4225
Reviewed-by: Gerald Combs <gerald@wireshark.org>
The new icons are patterned after the existing capture icons. They could
probably benefit from some adjustments here and there.
Start moving toward icon names and a directory layout compliant with
freedesktop.org's Icon Naming Specification and Icon Theme
Specification. We aren't fully compliant and might never be but anyone
with exposure to FDO icon themes should at least know where everything
is.
Make Capture Start (x-capture-start) the first icon in the toolbar.
Define the Colorize Packets, Auto Scroll, and zoom icons even though the
Qt UI doesn't use them yet.
Leave the Capture Filter, Display Filter, Coloring Rules, Preferences,
and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm
not sure they're necessary.
Try not to break ui/gtk/toolbar_icons.h.
Remove welcome.qrc. I initially added it in case we needed to overlay
the welcome screen with translucent .pngs but that never happened.
To do:
- Move the old GTK+ icons to their own directory.
- Find a better name for the "toolbar" directory. "stock"?
- Make the toolbar configurable.
Change-Id: Ie07592113d307b8db786aedace672312a870fe38
Reviewed-on: https://code.wireshark.org/review/4182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
The main site URI scheme is now https. Update the URL in some other
places while we're here.
Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525
Reviewed-on: https://code.wireshark.org/review/4133
Reviewed-by: Gerald Combs <gerald@wireshark.org>
If it's not there, "make distcheck" fails. In addition, 1) "make
distclean" doesn't clean out the Makefile.in files under asn1 and 2) you
don't get to see the source from which the ASN.1 dissectors were built
if you have a source tarball.
Change-Id: Ied59d42950373476a535fcf9cfccece46de92599
Reviewed-on: https://code.wireshark.org/review/4013
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".
It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.
Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
Tested:
- Nmake builds
- NSIS packaging
- CMake builds (Windows, OS X)
- Autotools build and distcheck
- RPM packaging
To do:
- Test Debian packaging
- Fix PortableApps
Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
We can't know, in autofoo, what arguments are necessary to make 'cmake' actually run successfully on a given system. We should probably just add a buildbot step to build cmake from the source tarball.
This reverts commit 70a6d204a7.
Change-Id: I1961b79ece2e26bafad3eddb189bd0cfab2af846
Reviewed-on: https://code.wireshark.org/review/3460
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This change doesn't help: we can't get cmake to run properly.
This reverts commit 956f4423df.
Change-Id: If1c0ec13ff35fdaa266dcd491350477e2bd91bd1
Reviewed-on: https://code.wireshark.org/review/3459
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
that it can build Wireshark.
The purpose of the cmake check is to ensure we are distributing all the of
necessary cmake files. We don't want to get into the business of giving cmake
all the options required to actually build Wireshark (e.g., which version of
Qt is installed and where).
This also means that distcheck doesn't compile Wireshark twice.
Change-Id: I62f5c42df7c710f7695bd020b0dda80e54435829
Reviewed-on: https://code.wireshark.org/review/3432
Reviewed-by: Evan Huus <eapache@gmail.com>
necessary to do a cmake build.
Note that this does mean that anyone doing "make distcheck" needs cmake.
Bug: 10331
Change-Id: I4360a305aa7f6ffc1b5a5dffad24b928eed45016
Reviewed-on: https://code.wireshark.org/review/3326
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
We decided at sharkfest that this wasn't the right design for file dissection;
we have more-or-less settled on way forward, but nobody's shown interest in
implementing it. Whether or not that ever happens, this code is effectively
dead and should be removed.
Change-Id: I14d6086df3204fffb6485228db39d9f407661417
Reviewed-on: https://code.wireshark.org/review/3400
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Files from the debian directory, documents from the doc directory,
graphics from the docbook/wsug_graphics directory, and the echld
Makefile.nmake.
Change-Id: Iccccc58811753581b0b180053defd937aea22f95
Reviewed-on: https://code.wireshark.org/review/3283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
You have to run macosx-support-lib-patches/qt-fix-pc-files manually,
telling it where Qt was installed, but so it goes....
Change-Id: I8668a1fc4254cc002aee068749edb3cf3bdb854f
Reviewed-on: https://code.wireshark.org/review/3215
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Prepend $(srcdir)/ to the sources in install commands, and get rid of
the -T flag, as it's GNU coreutils install-specific; some versions of
install don't support -T at all, and FreeBSD's install has a -T flag
that takes an argument and has a completely different meaning.
Fixes bug 10292; fix came from
http://marc.info/?l=openbsd-ports&m=140571104528980&w=2
Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82
Reviewed-on: https://code.wireshark.org/review/3107
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Some of those routines are used only in dumpcap; others are used in
TShark and Wireshark as well.
Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7
Reviewed-on: https://code.wireshark.org/review/2841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap
installation as themselves rather than as root will not "succeed" but
leave dumpcap installed without enhanced privileges, so the underlying
problem in bugs such as bug 10247 will be more obvious.
Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b
Reviewed-on: https://code.wireshark.org/review/2781
Reviewed-by: Guy Harris <guy@alum.mit.edu>
I have ***NO*** idea why this makes a difference, but, without this
change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly
for wsutil/CMakeLists.txt, and, with this change, it is. I guess
there's something magic involved here with "global" CMake variables or
something crazy such as that.
Change-Id: I7a0046b9c249568cd666720838104f48e854e203
Reviewed-on: https://code.wireshark.org/review/2612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This pulls some stuff out of the top-level directory, and means we don't
have to build them once for every program using them.
Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5
Reviewed-on: https://code.wireshark.org/review/2591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bereft of life, it rests in peace.
Change-Id: I8b9bc8c6cef0635d5526aa6b389aa33bc41fbc66
Reviewed-on: https://code.wireshark.org/review/2284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add autotools macros to distribution
Call AX_EXT to define HAVE_SSE4_2
Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302
Reviewed-on: https://code.wireshark.org/review/2110
Tested-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This makes .deb generation not depending on autotools and also removes
debian-package target from autotools-generated Makefile.
Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984
Reviewed-on: https://code.wireshark.org/review/2052
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
No rule to make target `cmake/modules/FeatureSummary.cmake', needed by `distdir'. Stop.
Change-Id: I66124151ded4d9e3aeed3f9f27aa2fca81a962cb
Reviewed-on: https://code.wireshark.org/review/1817
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir)
from Makefile.am to allow out-of-source 'make checkapi'.
Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973
Reviewed-on: https://code.wireshark.org/review/1294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)
Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git)
Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0
Reviewed-on: https://code.wireshark.org/review/681
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
I'm not sure why it's associated with GLIB_LIBS in most entries - at
some point, was it the case that we didn't use libmath routines but GLib
did? - but there's no guarantee that other libraries don't use them, so
put them at the end of the lists. That also makes the lists a bit more
consistent.
(Yes, I know, the wireshark_ldadd list is followed by some other
libraries in the library lists that use it, so -lm isn't *really* at the
end everywhere.)
Change-Id: Ia2e0b295fdaae771fdee7d5eecdefaa83fae9992
Reviewed-on: https://code.wireshark.org/review/622
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
programs that use {lib,win}pcap but that don't capture traffic, such as
rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake.
svn path=/trunk/; revision=54671
This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)
This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!).
svn path=/trunk/; revision=54646
on what libwiretap thinks it is.
Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.
svn path=/trunk/; revision=54015
knowledge of particular types of plugins. Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.
In particular applications, only process the relevant plugin types.
Add a Makefile.common to the codecs directory.
svn path=/trunk/; revision=53710
./configure's options for gtk2 vs gtk3 vs qt.
Make it possible to not build the GNOME package (now both UIs' packages are
optional). I think Chris requested this a while ago.
If this works out it may make sense to control the rest of the options via
./configure .
svn path=/trunk/; revision=53607
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.
Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).
The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one). Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664
svn path=/trunk/; revision=52940
Debian still uses XPMs for their menu system[1] so distribute wsicon32.xpm in
the source tarball again (reverting part of r48565). This is the icon that
debian/wireshark.menu refers to.
[1] http://lintian.debian.org/tags/menu-icon-not-in-xpm-format.html
svn path=/trunk/; revision=52441
configure Wireshark, so we don't, for example, do "make distcheck" with
no options, and thus default to GTK+ 3, on a system without GTK+ 3 where
Wireshark was configured with --with-gtk2. (This also means that if
we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck"
will check with those.)
svn path=/trunk/; revision=51456
fails.
Fix radius/Custom.make so that automake likes it (remove the \ followed by
nothing). Once that's done, make the inclusion of that file mandatory so
that it actually (as I supposed--incorrectly--would happen in r47243) gets
distributed in the source tarball.
svn path=/trunk/; revision=50883
packages, providing macros that we use in our configure script in case
somebody building from SVN doesn't happen to have the package installed
and thus doesn't happen to have those macros defined.
In the case of Qt, there *isn't* such a .m4 file, so we had to create
the macro. Move it to acinclude.m4, and rename it to
AC_WIRESHARK_QT_CHECK to indicate that it's our own check.
svn path=/trunk/; revision=50881
Remove the 03-preferences patch: there's an ongoing discussion over at Debian
about using xdg-open to open URLs[1] (instead of sensible-browser as this
patch was doing) and anyway xdg-open behaves better for Balint.
Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested
by Balint).
Both changes are untested.
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436
svn path=/trunk/; revision=50611
no need to set it for the GTK+ version, so don't. (For Qt, we should
find some other way of forcing it to link wireshark-qt as a C++ program,
perhaps by having a wireshark-qt.cpp file in the top-level source
directory that contains main() and that calls the ui/qt code.)
svn path=/trunk/; revision=50544
for Leopard. Fix some issues that came up with the older versions.
We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.
When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.
We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.
The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.
svn path=/trunk/; revision=50456
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET
environment variable to be set when building (so that, for example, we
don't use linker features available on the version on which we're
building but not on the minimum OS version for which we're building),
and causes the SDK for that version to be used (so that, for example, we
don't link with libraries with later version numbers than the ones
provided with the OS version for which we're building).
svn path=/trunk/; revision=50410
against the Gtk+ libraries.
(I didn't notice this before because the resulting programs aren't, on my
system, actually linked against the libraries they don't use--presumably
because of the "-Wl,--as-needed" flag.)
svn path=/trunk/; revision=50170
./configure now accepts:
--with-gtk2 : enabled by default; exclusive of --with-gtk3
--with-gtk3 : disabled by default; exclusive of --with-gtk2
--with-qt : disabled by default, can be specified with gtk
--enable-wireshark : controls whether *any* GUI is built
If Qt is enabled then a new program is created: "wireshark-qt". "wireshark"
remains the Gtk+ version.
svn path=/trunk/; revision=50147
core, epan, and ui, and link them to each other to varying degrees. This
seems to be the best way to organize our documentation. The alternative
is to switch to a single doxygen.cfg and manually add files to different
groups or sections.
Add a wireshark.dox file which contains markup for the main page. Add
.dox and .txt to svnadd. Clean up our tag files. Force wsar_html to
rebuild each time.
svn path=/trunk/; revision=49091
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each doxygen.cfg.in move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.
svn path=/trunk/; revision=49043
Use the PNG versions of the new application icons.
Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).
Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.
Update image/README.
svn path=/trunk/; revision=48565
a theme-specific icon (and as such hicolor is where applications should
install their icons). So: don't install some of our icons in the gnome area,
install them all in hicolor.
While we're at it, go ahead and install all the icon sizes we have.
If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.
Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .
svn path=/trunk/; revision=48204
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").
(Maybe this approach should also be used for the other options in the .spec
file.)
Only clean up if building the RPM was successful.
svn path=/trunk/; revision=47957
directory (which is based on our installation prefix): there's no guarantee
that the desktop also uses the same prefix.
Add a note about how we might be able to find the desktop's data directory
should anyone actually run GNOME with a prefix other than /usr .
Also use 'desktop-file-install' to install the desktop file (if configure
found that command).
svn path=/trunk/; revision=47914
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().
Change some data types to avoid those implicit conversion warnings.
When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.
Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers. Cast
away those warnings in some cases where an API we don't control forces
us to do so.
Enable a bunch of additional warnings by default. Note why at least
some of the other warnings aren't enabled.
randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.
If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.
svn path=/trunk/; revision=46748
use with a freekdesktop (at least I think so). This stuff was taken from
Fedora's Wireshark RPM.
The intent is to a) use Wireshark's own files and b) remove most of the manual
installation steps from RPMs.
svn path=/trunk/; revision=46623
Enable PIE (if the compiler supports it) when compiling dumpcap. Do this
regardless of whether we're configured to install dumpcap setuid-root because
some users will end up running dumpcap as root regardless of how we were
configured.
svn path=/trunk/; revision=46608
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.
svn path=/trunk/; revision=46413
name". If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.
If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.
Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.
svn path=/trunk/; revision=46131
checking whether the relevant frameworks are available. (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)
We don't need Core Services any more, as we're no longer using
Gestalt(). We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.
svn path=/trunk/; revision=46129
Friendly Names for interfaces on Windows
Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
+ Win32: "dumpcap -D" shows friendly_name in place of descript if known
+ All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
+ When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name).
+ console_display_name is used as the basis of the autogenerated temp
filenames
+ console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
+ Can now specify the interface using its name and friendly_name
+ Interface name matching is case insenstive
+ Name matching first attempts exact matching, then falls back to prefix
matching
(e.g. dumpcap -i local)
+ Validates interface names, instead of blindly sending them off to
winpcap/libpcap
+ Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
+ Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
+ Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name. Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
+ void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
+ Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format
+ Basis temp filename format on console_display_name
+ Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing)
GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
+ "Friendly Name" renamed to "NDIS Friendly Name"
+ Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
+ The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces.
+ Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"
svn path=/trunk/; revision=46083
Jeff Morriss