aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-02-24Check for clang before trying to add -Q flagJoão Valverde1-1/+2
Change-Id: I91a9d8fd4ae6623b3719a3927da1d1b714f08b04 Reviewed-on: https://code.wireshark.org/review/14106 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-21autotools: Improve libnl configuration and dependencyJoão Valverde1-2/+4
Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13 Reviewed-on: https://code.wireshark.org/review/14052 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-68/+68
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Fix multiple repetitions of -L build flagsJoão Valverde1-0/+1
Before: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib' After: WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib' Bumps autoconf required version to 2.64. Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a Reviewed-on: https://code.wireshark.org/review/14041 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Use Qt flags only for building Qt GUIJoão Valverde1-0/+1
Change-Id: I041e2fab6de948c803cc059e78358077000efee8 Reviewed-on: https://code.wireshark.org/review/14006 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-3/+2
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15Build the extcap programs in the extcap directory.Guy Harris1-47/+14
That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-07autotools: Move SBC dependency to libwscodecsJoão Valverde1-2/+1
Change-Id: I931961033798613b78f846c9176dffdb8385bf43 Reviewed-on: https://code.wireshark.org/review/13782 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-30Update filter bookmark icons.Gerald Combs1-9/+18
Separate the capture and display filter bookmark icons. Make the capture icon green to match(-ish) the active capture icon. Tested on nice+new and janky+old displays. Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a Reviewed-on: https://code.wireshark.org/review/13612 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-41/+8
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21Revert "Diameter: Add Redknee AVPs."Jeff Morriss1-2/+1
As requested by the supplier of the data. This reverts commit ab754d6ba4c0bc6d8d00aec137d8b1e97331d1f4. Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9 Reviewed-on: https://code.wireshark.org/review/13468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-23Diameter: Add Redknee AVPs.Jeff Morriss1-1/+2
Also add a couple Verizon Wireless and Wimax AVPs. All taken from the attachments to bug 11907. Change-Id: Ie45935f421c4797783f616a75ef35486447ff950 Reviewed-on: https://code.wireshark.org/review/12833 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo1-1/+16
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-16Add files missing from make dists's tarballBalint Reczey1-7/+11
Bug: 11893 Change-Id: I11e6a40856f224e65401b01fafb3e561950ec086 Reviewed-on: https://code.wireshark.org/review/12663 Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-04CMake+PortableApps: Include the VC runtime (second try).Gerald Combs1-0/+1
Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin1-1/+2
This allows to properly register codecs plugins. See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details. Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b Reviewed-on: https://code.wireshark.org/review/12385 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-19extcap: add sshdump.Dario Lombardo1-1/+20
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 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>
2015-11-12Fix installation of desktop files.Guy Harris1-1/+1
Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15 Reviewed-on: https://code.wireshark.org/review/11772 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-0/+1
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> 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>
2015-11-11debian: Make make dist know about moving wireshark.1 to wireshark-qt and ↵Balint Reczey1-2/+1
removal of wireshark.menu Change-Id: I81b95e43beae7ca85bff9b2d5b4a6f498252f2b3 Reviewed-on: https://code.wireshark.org/review/11720 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11GTK: Add separate working desktop file for GTK+ Wireshark GUIBalint Reczey1-2/+4
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6 Reviewed-on: https://code.wireshark.org/review/11696 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-10-16Keep CMake from finding Cygwin's Python.Gerald Combs1-0/+1
Try to find Python and set PYTHON_EXECUTABLE on Windows via the registry prior to calling FindPythonInterp. This works around a bug in CMake that prefers Cygwin's Python, which is a symlink, which by default is a text file that contains a Cygwin-specific cookie, which is therefore useless outside of Cygwin. This is avoids the need to pass -DPYTHON_EXECUTABLE=... to CMake. Change-Id: Ife37221b61d920682c20357b6d139a93067a5ad1 Reviewed-on: https://code.wireshark.org/review/11071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Fix dist.Gerald Combs1-1/+1
Fixup the name of the SVG file that contains all of the expert indicators. Change-Id: Ia45038fcf965973cc7585cc7c68dc24807e59168 Reviewed-on: https://code.wireshark.org/review/11099 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Use buttons to display the main status bar icons.Gerald Combs1-13/+14
Use QToolButtons to display the expert indicator and comment icons in the main status bar. Use the same style sheet hack we use in ProgressFrame to un-style the buttons. Make sure we specify the @2x comment icon in our .qrc file so that it's loaded and used on retina displays. Move the comment and expert .pngs to the stock icon directory and use StockIcon to load them. Remove status.qrc since it's no longer used. Change-Id: I84485b22656f8f9af29ad3c02446ffefb6657ed5 Reviewed-on: https://code.wireshark.org/review/11048 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-15Add missing CMake files to the tarball.Gerald Combs1-1/+4
Make sure we can build from the tarball using CMake. Tested on Windows. Change-Id: Iffc1ac964279e573aa2a8280b9bb4e799f10a974 Reviewed-on: https://code.wireshark.org/review/11066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Make the capture comment icon more Wireshark-y.Gerald Combs1-0/+2
Change-Id: Ic693c7afc1658c3b89ae5cddf9c7ab32c435cf2e Reviewed-on: https://code.wireshark.org/review/10788 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-23Use the Qt-provided media icons.Gerald Combs1-3/+0
Use Qt's standard pixmaps to build our media playback, stop, and pause icons. Note that we probably don't want to do this for all of the available standard pixmaps. Change-Id: I78541a46a65583d7365cd601c578ebe8f197c060 Reviewed-on: https://code.wireshark.org/review/10609 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-06Add image files not already here.Guy Harris1-1/+49
Change-Id: I429ae4c418f8fb574407ed6038b411c54b672f0a Reviewed-on: https://code.wireshark.org/review/10398 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-06Reflect the removal of some display filter-related images.Guy Harris1-14/+0
Change-Id: Iac635122a125a0a5cbadfaaf3d39b4c16b2a17f1 Reviewed-on: https://code.wireshark.org/review/10396 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-06Display filter edit updates.Gerald Combs1-1/+0
Have the bookmark button operate on saved display filters, similar to the "Filter:" button in the GTK+ UI. Expose the saved display filter list via a popup menu. Update the display filter icons. Make the "Apply" button wider. Remove the old icon assets. Add a StockIconToolButton class along with note explaining why it's necessary. Rename the "Filter Bookmarks" preference to "Filter Shortcuts". Suggestion for a better name are welcome. Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209 Reviewed-on: https://code.wireshark.org/review/10390 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-09-02dcerpc: fixed distcheck.Dario Lombardo1-0/+1
Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830 Reviewed-on: https://code.wireshark.org/review/10355 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-13On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.Guy Harris1-1/+1
Qt 5.5 and later have @rpath-based install names for the frameworks, which means that, if they're not installed in some frameworks directory searched by default (such as /Library/Frameworks) - which is the default case with the Qt installer - they won't be found by default. Add the directory in which the frameworks exist as an rpath in the Wireshark binary, so that they'll be found, and then remove it from the Wireshark binary in the app bundle, as the directory in which the frameworks exist on the machine on which Wireshark was built is irrelevant to the machines on which it's being deployed - the frameworks are included in the bundle, and we already add an rpath to find them there. Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78 Reviewed-on: https://code.wireshark.org/review/9625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-24Qt: Add x-capture-file-reload@2x.svg to Makefile.amAlexis La Goutte1-0/+2
Change-Id: I497290eff821167a31468a10af23ab762eff32fe Reviewed-on: https://code.wireshark.org/review/9095 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-29Reorganize some of the Diameter XML files, taking advantage of the fact thatJeff Morriss1-4/+1
AVPs can be grouped by Vendor now (not just by Application). Move a bunch of vendor-specific Application IDs to the vendor's XML file. Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml files. Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx. Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f Reviewed-on: https://code.wireshark.org/review/8235 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>
2015-04-20Add Tekelec (now Oracle) AVPs.Jeff Morriss1-0/+1
Untested; taken from the document 910-6828-001 Revision A (found on the web). Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2 Reviewed-on: https://code.wireshark.org/review/8110 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+1
commit dec7ff66f34d773d25dee412fe218b4e108d7680 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:49:22 2015 -0400 added VALUEs commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:34:19 2015 -0400 Added from RFC which has numbers assigned commit 005437d9f260c233f165e5f1a8a0e00ab48d6456 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Mar 26 09:09:13 2015 -0400 Hyphens commit 88332d8e5dc6bae25270500902cdcb511e0e08a6 Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Date: Thu Mar 26 12:13:39 2015 +0200 Update dictionary.mikrotik Update dictionary.mikrotik to have new attributes and values mentioned in Mikrotik wiki: http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary commit 849336c73dda97ac2a1185f19e21fd2d4d086180 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Mar 25 15:40:02 2015 -0500 Motorola error message Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c Reviewed-on: https://code.wireshark.org/review/7974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-1/+17
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-13Add a test-programs target everywhere.Gerald Combs1-0/+3
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Add the @2x expert indicators.Gerald Combs1-0/+5
We currently load the expert indicator resources using an <img> tag. According to QTBUG-36383 the @2x versions won't load unless you've built with Qt 5.4.0 or later. Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80 Reviewed-on: https://code.wireshark.org/review/7601 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Update the expert indicators.Gerald Combs1-1/+0
Add @2x versions. Remove expert_ok. It appears to be unused. Change-Id: If36f839f622e235334a4237a9c5424c15a9945bc Reviewed-on: https://code.wireshark.org/review/7594 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07Add GenerateTestSh.cmake to the distribution.Gerald Combs1-0/+1
Change-Id: I4cd6b91db7fa0202d6c1918feec9f34b819f09d1 Reviewed-on: https://code.wireshark.org/review/7571 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-02Qt: Add @2x images to the layout preferences.Gerald Combs1-0/+6
Run compress-pngs on the normal and @2x images. Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d Reviewed-on: https://code.wireshark.org/review/7499 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18RADIUS: Add new dicto from FreeRADIUSAlexis La Goutte1-1/+2
commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Feb 10 13:22:39 2015 -0500 New dictionary Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c Reviewed-on: https://code.wireshark.org/review/7237 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Uninstall wireshark.appdata.xml.Gerald Combs1-1/+2
Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5 Reviewed-on: https://code.wireshark.org/review/7228 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18Add an appdata entry for Wireshark.Jeff Morriss1-0/+3
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>
2015-02-04RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte1-0/+2
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>
2015-02-04Simplify how we find Lua and expand the places we look.Jeff Morriss1-1/+1
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>
2015-01-26Add Cmakefiles missing from the distribution.Anders1-0/+3
Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3 Reviewed-on: https://code.wireshark.org/review/6797 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21Link only the GUIs with SBC (if we have SBC). The other programs don'tJeff Morriss1-1/+2
(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>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-0/+2
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 11:14:46 +0000