aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2018-12-21macOS: Make sure we package our own libraries.Gerald Combs1-2/+9
As of 25e1e2c848 we no longer set LIBRARY_OUTPUT_DIRECTORY to Wireshark.app/Contents/Frameworks. As a result we need to copy them into place during our packaging process. Change-Id: Idbdea289dce60e9acf9ab317f4151bfe2c993ddd Reviewed-on: https://code.wireshark.org/review/31160 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-21macOS: Minimize our dsyms.Gerald Combs1-8/+13
Pass --minimize to dsymutil, which reduces the size of our dsyms. Print the name of each file as we dsymify it. Change-Id: Ic8b14daa2ceaa07c2c9ca3162020e5861d165f6d Ping-bug: 15361 Reviewed-on: https://code.wireshark.org/review/31150 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19WiX: Build packages verbosely.Gerald Combs2-3/+3
Pass the `-v` flag to candle, light, and heat. Remove a couple of apparently unused and definitely misleading variables. Change-Id: If3c50f3f1596f244e8354b77bbd443779f5aa981 Reviewed-on: https://code.wireshark.org/review/31132 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-19NSIS: Expand our vcredist exit code check.Gerald Combs1-4/+18
Along with checking for exit code 3010 (reboot required), check for other errors and show a warning as needed. Add a note about the Universal CRT to the User's Guide. Bug: 15358 Change-Id: Ia49dbdc66edc8ea68f957ec353f1115536002d13 Reviewed-on: https://code.wireshark.org/review/31100 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18Windows: upgrade Npcap to 0.99-r8Pascal Quantin2-3/+3
While we are at it, let's propose by default to upgrade to Npcap when WinPcap is intalled. Change-Id: Id9aeb3a507127b5956185fba2b74c60cf1dfdf96 Reviewed-on: https://code.wireshark.org/review/31079 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-16macOS: Fix a .dmg build path.Gerald Combs1-1/+1
Fix the "Read me first" path. Change-Id: I6d1a13a26db2023a30b7ae72caca86500d00f5b7 Reviewed-on: https://code.wireshark.org/review/31064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-15CMake: Make sure we use the same minimum macOS version everywhere.Gerald Combs3-42/+43
Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-12NSIS: Increase our verbosity.Gerald Combs1-6/+7
Pass /V4 to makensis so that we can see what files are in our package. Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549 Reviewed-on: https://code.wireshark.org/review/31023 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12Packaging: Add initial support for AppImage.Gerald Combs1-0/+24
Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-11-30win32: adjust some names in the Npcap installation pagePascal Quantin1-2/+2
Change-Id: I29c573628c01771fd82c88c58053bb7066ac8239 Reviewed-on: https://code.wireshark.org/review/30844 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-30NSIS: Install NPcap instead of WinPcap.Gerald Combs7-207/+80
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-27Add a "No Reassembly" profile.Gerald Combs2-0/+8
Add a script that disables all of our desegmentation and reassembly preferences and use it to create a "No Reassembly" profile. Change-Id: Icd0b72e9e271a511e637acde9018f3aae018e589 Reviewed-on: https://code.wireshark.org/review/30799 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Drop JSON-GLib completelyPeter Wu2-3/+3
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h). Remove the remaining traces and additionally remove GObject from FindGLIB2.cmake since it was only added for JSON-GLib. Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0 Reviewed-on: https://code.wireshark.org/review/30733 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-08rpm: update all rpm files for using python3.Dario Lombardo1-1/+2
This includes: - tools/rpm-setup.sh - packaging/rpm/wireshark.spec.in Fixes: v2.9.0rc0-2460-ge9f7bb5127 ("Require Python 3, drop Python 2 support") Change-Id: I9fb92be936dec5fdb819a54e132e64521fa95bbb Reviewed-on: https://code.wireshark.org/review/30543 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-11-07Require Python 3, drop Python 2 supportPeter Wu1-1/+1
Python 3 is widely available. All major Linux distributions support it. RHEL is covered via EPEL (which is already required for cmake3). Drop support for Python 2 in order to reduce maintenance costs. The main motivation is being able to simplify the tests. CMake is updated to search for Python >= 3.4 and will fail if unavailable (generating dissectors.c requires Python, so it is quite an important piece to have). The documentation is updated to reflect the Python 3.7 paths used by Chocolatey. Tested the git-review installation instructions in Windows 7 x64 without a previous Chocolatey installation. macOS brew now installs Python 3 (its dependencies are already installed by python@2 for libxml2). The macOS (non-brew variant) is updated to use the official 64-bit installer to install Python 3. Change-Id: I80b1e36957f338e0dad1bfcc173b6418682cddba Reviewed-on: https://code.wireshark.org/review/30192 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-30macos: Prevent darkmode from appearingRoland Knall1-0/+2
Prevent dark mode from being used on newer versions of mac os x, as long as Qt does not allow proper dark mode handling Change-Id: Ifee14ec690331689b0a8a7486829dd129a2687b4 Reviewed-on: https://code.wireshark.org/review/30425 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-10-22No need for the debugging output.Guy Harris1-1/+1
The chmods seem to be working. Change-Id: I0f85a1428de511497597a3fd304c700ea1a1f846 Reviewed-on: https://code.wireshark.org/review/30331 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Fix quoting.Guy Harris1-4/+4
Change-Id: I3a0a8c661b1fec2ea4475eb9fe1d5c8a8ed7bbb5 Reviewed-on: https://code.wireshark.org/review/30328 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Make the chmod verbose.Guy Harris1-1/+1
For some reason it's *not* taking away write permission; make it verbose to try to debug that. Change-Id: I180309953d36798d2da3a74959cdd934adc5a4a3 Reviewed-on: https://code.wireshark.org/review/30325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-22Don't unload the XQuartzFixer job if it doesn't exist.Guy Harris1-5/+13
But *do* get rid of the pre-launchd XQuartzFixer startup item; it's probably not there, but we might as well leave things as clean as we can. Change-Id: Icfdbe6c0d022cde8cf30bd3c79fbf77896e6fe98 Reviewed-on: https://code.wireshark.org/review/30322 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21More permission fixes.Guy Harris1-1/+3
Take away group write permission for stuff under /Library/Application Support/Wireshark. For some reason, it's getting set; it's not necessary. Change-Id: I4280a635e0c171cf5ad17cb91fe20d746c2daf79 Reviewed-on: https://code.wireshark.org/review/30317 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Get rid of a launchd daemon we no longer need.Guy Harris1-0/+9
Change-Id: Ic287d6d8a84876da10ca600ef3899b40c8f5663e Reviewed-on: https://code.wireshark.org/review/30310 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Fix ownership and permissions on /Library/Application Support/Wireshark.Guy Harris1-0/+12
Bug: 14335 Change-Id: I657b024554e1eff01544b7726a7eec74c8da8be1 Reviewed-on: https://code.wireshark.org/review/30307 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-21Don't give launchd daemon plists execute permission.Guy Harris1-5/+5
They don't need it; read permission suffices. While we're at it, rename a variable to indicate that it's the path to the plist for ChmodBPF, not the path to the executable for ChmodBPF. Change-Id: Ib7537e26ae3f4477c4110759049a8cd7d2f09cf6 Reviewed-on: https://code.wireshark.org/review/30303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-01Add a systemd Journal Export extcap.Gerald Combs1-0/+18
Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-28RPM: obsolete the gnome and gtk packages; allow user to set prefix.Jeff Morriss1-17/+15
Obsoleting the gtk packages allows a clean upgrade to the Qt version (without requiring the user to manually remove those packages). Set the install prefix based on what the user set when running cmake (like we did with autotools). Change-Id: Ica283f40bc002951af4ff1f9d719295c0a598c3b Reviewed-on: https://code.wireshark.org/review/29892 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-27RPM: move the installed development files to a new -devel packageJeff Morriss1-31/+43
Development-related files (header files, cmake files, the pkg-config file) don't belong in the base RPM. This moves those ~600 files (~4 MiB) to a separate RPM for those who may want them. Also clean up a few other things in the SPEC file while here to make things more readable and consistent. Change-Id: I89f93a8696c54b9117595f1da9f856c080853dce Reviewed-on: https://code.wireshark.org/review/29814 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-24RPM: optionally use ccache to speed up (re)builds.Jeff Morriss1-1/+8
Installing and enabling ccache makes testing RPM builds (which always do a complete build) much less painful. Change-Id: Ie9ab1794614701cdbe261089f81398c2b7d1f027 Reviewed-on: https://code.wireshark.org/review/29812 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-24RPM: Make the (optional) maxminddb dependencies actually work.Jeff Morriss1-10/+11
Move the maxminddb dependencies out of if(qt) and above the RPM's description; this makes them actually work and takes the RPM code for those dependencies out of the Qt RPM's Description (where they clearly weren't doing any good). Change-Id: I01705f8f5f6435571cf521b68f8450730ddaa383 Reviewed-on: https://code.wireshark.org/review/29808 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2018-09-24radius(verizon): sync with FreeRADIUSAlexis La Goutte1-0/+1
commit d3ea6dd565a1836314814d258efc19054d3e6a45 Author: Alan T. DeKok <aland@freeradius.org> Date: Mon Sep 10 13:43:24 2018 -0400 added verizon dictionary Change-Id: I162aa1d08845fc39b068ef2a49c582ce0e29fee3 Reviewed-on: https://code.wireshark.org/review/29627 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-20NSIS: try harder to find VS2015/VS2017 vcredistPeter Wu1-13/+30
The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-16Windows: upgrade USBPcap to 1.2.0.4Pascal Quantin3-3/+3
Change-Id: I1ab4bbc410f2f896aea323c3d4884207150f9beb Ping-Bug: 14657 Bug: 14982 Reviewed-on: https://code.wireshark.org/review/29154 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-09NSIS: fix uninstaller for Qt 5.10Peter Wu1-0/+2
Since Qt 5.10, platform styles are no longer part of QtWidgets. Be sure to delete the separate plugin (styles\qwindowsvistastyle.dll). See https://bugreports.qt.io/browse/QTBUG-65177 Change-Id: I20376f787339c9a2072ef8127b3ea5cc55be8b06 Reviewed-on: https://code.wireshark.org/review/29003 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-24CMake: Fixup some documentation dependencies.Gerald Combs2-5/+1
Change the dependencies of various wsug targets to update_tools_help instead of the files it generates. Have the nsis_package_prep and wix_package_prep targets depend on user_guide_chm instead of update_tools_help. This should make parallel builds of all_guides, wix_package_prep and possibly other targets more reliable. Change-Id: I473f0e608aade1ac0053c03bef0942c69c650f65 Reviewed-on: https://code.wireshark.org/review/28838 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-28Windows: run update_tools_help target when building installerPascal Quantin2-0/+2
It ensures to have up to date help output for our command line tools Change-Id: I5b900be692c05d6231678cf3ca82e86ef843d01c Reviewed-on: https://code.wireshark.org/review/28476 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-21CMake+macOS: Make sure we're using the right Qt tools.Gerald Combs1-2/+2
Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09rpm: fix compilation on centos (uses cmake3).Dario Lombardo1-1/+9
Change-Id: Ia0319658a0e8c9d8e13595d6773dcd6438228bda Reviewed-on: https://code.wireshark.org/review/28112 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08Fixup a couple of shellcheck "fixes".Gerald Combs1-4/+5
Change-Id: If3e6acf28c22cbc98a26c7e12c449e27fdc1321e Reviewed-on: https://code.wireshark.org/review/28164 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07Fix a comparison.Gerald Combs1-3/+3
Change-Id: Ibecdf6be6c6957afc176e6eb97f60f19b090b40c Reviewed-on: https://code.wireshark.org/review/28091 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07More shellcheck checks and fixes.Gerald Combs2-57/+60
Remove a libtool check while we're here. Change-Id: I813add2031480f34ce89f268b541f8939016c2c7 Reviewed-on: https://code.wireshark.org/review/28066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-21Windows: update custom_plugins.txt templatePascal Quantin1-1/+1
Change-Id: I98fe409069df66c7082b254dbba24519bc02d7bf Reviewed-on: https://code.wireshark.org/review/27692 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-15CMake: require at least CMake 3.5Peter Wu3-5/+5
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11NSIS: Fixup some uninstall variables.Gerald Combs1-3/+2
Add back the PROGRAM_NAME_GTK definition, since its links might be left over from a previous install. Remove the PROGRAM_NAME_QT references, since it's been the same as PROGRAM_NAME for quite a while. Change-Id: I79724a6a1c9861ffae9aed6a59d48205a40941cd Reviewed-on: https://code.wireshark.org/review/27459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11NSIS: Modernize the installer and remove GTK+ entries.Gerald Combs6-321/+243
Migrate the Additional Tasks page to nsDialog. Create it using NSIS Dialog Designer. Migrate the Modern UI code (WinPcapPage.ini and USBPcapPage.ini) to Modern UI2. Use LogicLib flow control instead of Gotos+labels in more places. Change-Id: I1a3733f0202ca372456074f43e5ae23b1da4e1b9 Reviewed-on: https://code.wireshark.org/review/27449 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11WiX: Remove remaining GTK+ content.Gerald Combs4-69/+1
Change-Id: I3dc06b62f8a6afa2de82b2a2a5f7dc8a63400ac3 Reviewed-on: https://code.wireshark.org/review/27451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-03WiX: Options dialog updates.Gerald Combs4-346/+88
Remove GTK+. Add links to Npcap, WinPcap, and USBPcap. Move the capture options to the top of the options dialog. Replace group boxes with simple titles. Add an EditorConfig entry for our WiX files. Change-Id: Ibd581fa09f333fa84228f0a6f723ab62df85ee8e Reviewed-on: https://code.wireshark.org/review/27292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-02NSIS: add descriptions for new plugins typesJaap Keuter1-1/+2
The installer is not presenting applicable text in the description box when highlighting the new file type and codec plugin options. Change-Id: I25fbc7800a594796ac8f4f15b39431a89b404d0e Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/27248 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-02rpm-package: Use version.h to generate version string in RPMAndersBroman1-1/+1
Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-02Fix the utility-launcher to look at the name it's run as.Guy Harris1-1/+5
If it's run as "tshark", it should run TShark, not Wireshark. Bug: 14643 Change-Id: I0d4e6fa64e42b7a2e2d4b89b53db62748b4f288d Reviewed-on: https://code.wireshark.org/review/27245 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-24RPM: remove packaging/rpm/SPECS/wireshark.spec.in.Dario Lombardo1-631/+0
Not used anymore. Change-Id: I22dd0ad073059064630f7a7683b82724e2bfa452 Reviewed-on: https://code.wireshark.org/review/27117 Reviewed-by: Gerald Combs <gerald@wireshark.org>