Commit Graph

1221 Commits

Author SHA1 Message Date
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
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>
2014-02-07 23:03:03 +00:00
Ville Skyttä 4982d95f2b Install SVG icon.
Closes-Bug: #9590

Change-Id: I20b29ccc4237434c4a3d11615fc2cad832c3c685
Reviewed-on: https://code.wireshark.org/review/80
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02 19:26:48 +00:00
Jörg Mayer 1bd240749d One more place where setcap does not need inheritance
svn path=/trunk/; revision=54708
2014-01-12 22:21:55 +00:00
Michael Mann 31e24e47db Link wiretap library with tfshark. This is hopefully a "temporary" fix as the plan is to not have tfshark depend on wiretap.
From Michal Labedzki

svn path=/trunk/; revision=54697
2014-01-11 19:47:24 +00:00
Guy Harris 658e0b30e6 At least some of the files in PLATFORM_CAPTURE_SRC are needed by
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
2014-01-08 20:50:52 +00:00
Guy Harris 324a7c9043 Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.
svn path=/trunk/; revision=54669
2014-01-08 20:22:13 +00:00
Michael Mann bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
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
2014-01-08 04:35:28 +00:00
Anders Broman 643b572665 Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
svn path=/trunk/; revision=54559
2014-01-02 17:47:34 +00:00
Guy Harris e21fd7c0ce Add a "captype" file that just reports the type of a capture file, based
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
2013-12-13 02:59:16 +00:00
Guy Harris 0cc1545d05 Move most of the plugin code from epan to wsutil and remove all
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
2013-12-02 08:30:29 +00:00
Jeff Morriss 69017ac3bd Overhaul rpm-building options a bit: as suggested by Anders, have the RPM follow
./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
2013-11-26 23:43:18 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Pascal Quantin 628dda9d2c From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :
Add support for Alcatel-Lucent 8950 AAA

svn path=/trunk/; revision=53258
2013-11-11 21:13:55 +00:00
Jeff Morriss 58d01512b1 Make it so out-of-tree builds (autofoo and cmake) have access to the various
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
2013-10-29 02:28:16 +00:00
Balint Reczey bd0a70c437 Revert "Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :"
This reverts commit r52441.

svn path=/trunk/; revision=52772
2013-10-22 22:32:55 +00:00
Jeff Morriss df1b8d3d96 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :
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
2013-10-07 19:06:39 +00:00
Gerald Combs 99f457bd03 Use separate "Read me first" files for Qt and GTK+.
svn path=/trunk/; revision=52321
2013-10-01 21:04:13 +00:00
Gerald Combs 5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

svn path=/trunk/; revision=52302
2013-09-30 17:19:48 +00:00
Alexis La Goutte 098819b3bc Fix compile when use gzip from make dist-gzip (Missing some images)
svn path=/trunk/; revision=52284
2013-09-30 08:38:00 +00:00
Jeff Morriss d179a1b788 Move debian-setup.sh into tools/
svn path=/trunk/; revision=52023
2013-09-13 21:06:08 +00:00
Anders Broman 61d2e64163 Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.
svn path=/trunk/; revision=51457
2013-08-21 19:53:57 +00:00
Guy Harris d9ebff02be Arrange that "make distcheck" use the GUI configure flags used to
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
2013-08-21 18:39:39 +00:00
Gerald Combs 2dab57f425 Switch to make-services.py. Fix some variable names and version tests.
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Jeff Morriss 35e220513c Make it easier to add custom (proprietary) Diameter XML files.
svn path=/trunk/; revision=50889
2013-07-25 15:40:39 +00:00
Jeff Morriss 285a439021 Reinstate r47243 (i.e., revert r50869): with the old way "make distcheck"
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
2013-07-25 01:01:58 +00:00
Guy Harris f317c7821d The files in aclocal-fallback are copies of .m4 files from various
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
2013-07-24 22:34:44 +00:00
Jeff Morriss 0e60bd6e40 Use the dist_ prefix for the _DATA variables. That way we don't have to
explicitly add them to the distribution (via EXTRA_DIST).

svn path=/trunk/; revision=50878
2013-07-24 20:54:15 +00:00
Anders Broman b5167576d3 Revert http://anonsvn.wireshark.org/viewvc/trunk/Makefile.am?r1=47243&r2=47242&pathrev=47243
Config.nmake is needed when doing "make install" on a build from a tarball.

svn path=/trunk/; revision=50869
2013-07-24 17:34:09 +00:00
Pascal Quantin 6dd1cb7f8e Fix copy/paste error
svn path=/trunk/; revision=50727
2013-07-18 09:32:36 +00:00
Pascal Quantin d64dbd371b From Anders: add Verizon Wireless dictionary
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
Jeff Morriss 891854ca7a As suggest by Balint:
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
2013-07-15 14:31:35 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Guy Harris 0f80d54426 Note the issue with setting program_LINK.
svn path=/trunk/; revision=50545
2013-07-12 22:28:37 +00:00
Guy Harris 31f37c2bce Setting wireshark_LINK means that wireshark_LDFLAGS isn't used; there's
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
2013-07-12 22:06:54 +00:00
Guy Harris 278567c4ee Revert a change that shouldn't have been checked in.
svn path=/trunk/; revision=50530
2013-07-12 07:29:05 +00:00
Guy Harris 5be96e7552 print.ps moved to epan.
svn path=/trunk/; revision=50529
2013-07-12 07:27:55 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Guy Harris ff15b893d8 Use older versions of some libraries, and build 32-bit, when building
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
2013-07-09 04:41:34 +00:00
Guy Harris 519c5affa2 Add a --enable-osx-deploy-target option to set the deployment target
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
2013-07-06 16:42:30 +00:00
Guy Harris f3f156073b Don't assume the system include files are under /usr/include; trick the
compiler into saying where they are, and use that.

Patch a bug in PortAudio pa_stable_v19_20111121 that clang found.

svn path=/trunk/; revision=50186
2013-06-27 10:30:33 +00:00
Jeff Morriss 681efb2de3 Don't link wireshark against the Qt libraries and don't like wireshark-qt
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
2013-06-26 15:12:50 +00:00
Luis Ontanon 0a060270b3 Last changes to autofoo, rename the files as they live now in their own dir...
svn path=/trunk/; revision=50152
2013-06-25 21:09:29 +00:00
Jeff Morriss fd95d841b8 Allow the Gtk+ and Qt versions to be built simultaneously (with autotools).
./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
2013-06-25 19:51:53 +00:00
Luis Ontanon e200f6cbf9 This should get cmake to ignore echld...
svn path=/trunk/; revision=50141
2013-06-25 17:43:52 +00:00
Luis Ontanon a75e89c787 Revert --with-echld until I find out how to get it to work with Cmake...
:

svn path=/trunk/; revision=50138
2013-06-25 04:50:36 +00:00
Luis Ontanon 1c8b686eb0 --with-echld
svn path=/trunk/; revision=50137
2013-06-25 04:20:08 +00:00
Guy Harris c1d34d4be6 On OS X, get the interface type from the System Configuration framework.
svn path=/trunk/; revision=49486
2013-05-22 01:19:18 +00:00
Gerald Combs 6cbb955d00 Install the new global profiles and add them to the distribution.
svn path=/trunk/; revision=49122
2013-05-01 21:53:57 +00:00
Jeff Morriss d64f28d617 Remove cmake/modules/FindPYTHON.cmake from the source distribution.
svn path=/trunk/; revision=49109
2013-05-01 13:22:25 +00:00
Gerald Combs 9120bf883e Move the contents of wsar_html/core to wsar_html. Create tag files for
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
2013-04-30 00:27:02 +00:00