Commit Graph

1255 Commits

Author SHA1 Message Date
Jeff Morriss 2c7976183c Revert "Add a cmake build to distcheck to ensure that we distribute all the files necessary to do a cmake build."
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>
2014-08-06 17:24:28 +00:00
Jeff Morriss 2c59a6d206 Revert "When doing the distcheck cmake check only verify that cmake runs, don't verify that it can build Wireshark."
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>
2014-08-06 17:24:09 +00:00
Jeff Morriss 956f4423df When doing the distcheck cmake check only verify that cmake runs, don't verify
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>
2014-08-05 19:47:47 +00:00
Jeff Morriss 70a6d204a7 Add a cmake build to distcheck to ensure that we distribute all the files
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>
2014-08-04 19:49:39 +00:00
Evan Huus 37b5b095b9 Rip out the filetap code
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>
2014-08-04 14:31:37 +00:00
Jeff Morriss 3c9556aef8 Add doxygen_global.cfg to the source distribution.
Change-Id: Ifc552ac74b84bce2a695189794440c905bf140a5
Reviewed-on: https://code.wireshark.org/review/3323
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-01 15:13:48 +00:00
Jeff Morriss 7f9fdbb8c1 Add wireshark.pc.in to the source distribution (needed for cmake).
Bug: 10331
Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2
Reviewed-on: https://code.wireshark.org/review/3316
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-01 14:11:20 +00:00
Guy Harris 3ac49be96c Add more files to the release tarball.
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47
Reviewed-on: https://code.wireshark.org/review/3286
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 08:55:52 +00:00
Guy Harris 067beb0210 Add a bunch of missing files to the distribution.
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>
2014-07-31 07:43:41 +00:00
Guy Harris 5dd83af26d Add some missing CMake files to the distribution.
Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994
Reviewed-on: https://code.wireshark.org/review/3281
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 04:45:49 +00:00
Guy Harris 8aa0507753 Add some scripts to fix up Qt's OS X binary packages.
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>
2014-07-27 19:55:03 +00:00
Fabian Raetz 4b720691c4 Fix install_desktop_files non-portability and add out-of-tree support.
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>
2014-07-18 20:50:44 +00:00
Guy Harris 61ac815681 No more README.irix.
Change-Id: I3c906451549d28040f1068356bf7e62bff9cd92a
Reviewed-on: https://code.wireshark.org/review/3065
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-15 23:28:38 +00:00
Guy Harris 9e6487f247 Move utility routines for capturing into a libcaputils static library.
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>
2014-07-04 07:25:26 +00:00
Guy Harris 2c9d2bea32 Fail if any of the install-exec-hook commands fails.
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>
2014-07-02 20:27:28 +00:00
Basil c63cd9f869 New HP DTD dictionary file
Bug: 10206
Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5
Reviewed-on: https://code.wireshark.org/review/2617
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 02:59:50 +00:00
Guy Harris dbd409d041 Fix OS X CMake build.
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>
2014-06-24 07:10:12 +00:00
Guy Harris 213189ef9e Move the routines to talk to dumpcap into a static libcapchild.
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>
2014-06-23 23:58:29 +00:00
Joerg Mayer 43d9a4b151 Simplify obtaining the absolute path of the build dir
Change-Id: If0fabce21d7d12435f4f78768f7193564eeb2bb8
Reviewed-on: https://code.wireshark.org/review/2339
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 19:44:39 +00:00
Guy Harris d58ac9ad38 Get rid of the last bits of Python, as they break the build.
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>
2014-06-16 22:54:42 +00:00
Jeff Morriss aeb1888a50 Remove the (old, broken) Python bindings option to ./configure (and a few other references).
Change-Id: I470502bfae6617a798d0c2538f0f04ff7d36fee5
Reviewed-on: https://code.wireshark.org/review/2277
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 21:19:28 +00:00
Guy Harris 5a49913c49 Make sure image/expert_ok.png ends up in a source tarball.
Change-Id: I7ad2b53d706d953d443ef935f1edb84c46d7fa16
Reviewed-on: https://code.wireshark.org/review/2156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-12 09:15:58 +00:00
AndersBroman fcb019acb8 Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS)
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>
2014-06-10 14:51:26 +00:00
Balint Reczey a08cbe7071 Use only dpkg-buildpackage for building .debs
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>
2014-06-09 22:02:06 +00:00
Balint Reczey e04f321c67 Fix make debian-package
Change-Id: I3474889d18036c239b22c7a21d8e949072250fbb
Reviewed-on: https://code.wireshark.org/review/2042
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-09 01:48:00 +00:00
Balint Reczey 671d6c9095 Fix make dist
Change-Id: I96e25a3be6db53fcfacb631fdc48c03a63f195f2
Reviewed-on: https://code.wireshark.org/review/2040
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-08 17:51:31 +00:00
Alexis La Goutte 76cabf3682 Try to fix Ubuntu buildbot (make dist failed)
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>
2014-05-28 15:18:29 +00:00
Stig Bjørlykke bd38b3152d Support out-of-source checkapi
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>
2014-04-25 04:23:46 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(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>
2014-03-31 18:48:06 +00:00
AndersBroman 3258588c1d Don't include voip_bg.xpm, it's not used any more.
Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3
Reviewed-on: https://code.wireshark.org/review/812
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24 13:33:14 +00:00
Michael Mann d8265cd8c6 Remove Visual Studio solution and project files (and their existence from Makefiles)
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>
2014-03-16 18:03:41 +00:00
Pascal Quantin f3f77bd16f Add tfshark.rc.in to Makefile.am
Change-Id: I7d987534243a3e1575191f67d8b660c3c4c4731f
Reviewed-on: https://code.wireshark.org/review/641
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-13 20:28:56 +00:00
Guy Harris 0284e87bea Consistently put -lm at the end of library lists.
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>
2014-03-12 21:44:44 +00:00
Josip Medved 988a184603 Added Cisco Starent Diameter dictionary entries.
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1
Reviewed-on: https://code.wireshark.org/review/438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02 18:18:53 +00:00
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