aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-04-20Windows: blind attempt to fix WiX installer generationPascal Quantin1-1/+2
Change-Id: I32cc4ac54dee7cd8ef9cfa4af367206eec8259cc Reviewed-on: https://code.wireshark.org/review/27052 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-20Windows: add JSON-GLib libraryPascal Quantin2-2/+2
Change-Id: I9b266bffc74779f9d28eabb5642644a2b0afa7cf Reviewed-on: https://code.wireshark.org/review/27049 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo8-139/+2
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17More GTK+ removal.Gerald Combs2-115/+5
Remove GTK+ entries from .gitignore and start removing it from packaging. Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16 Reviewed-on: https://code.wireshark.org/review/26988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-16RPM: restore the bindir in openSUSE before packing.Dario Lombardo1-0/+6
Change-Id: I6e60d1a299528c0f1603b56704a8c47f18c66d08 Reviewed-on: https://code.wireshark.org/review/26926 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: install wireshark.desktop in /usr/share/applications.Dario Lombardo1-0/+4
The presence of this file in /usr/share/applications in required by suse_update_desktop_file, as described here: https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file Change-Id: I88573afca2d4523a1b305bf4dc672c421c2fa1d1 Reviewed-on: https://code.wireshark.org/review/26925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: cd into build dir in openSUSE.Dario Lombardo1-0/+6
This step is needed because of the differences in the %cmake macro between Fedora/Centos and openSUSE. Change-Id: I7ac94e560b4c298934f78e96036a814f3eadc4a5 Reviewed-on: https://code.wireshark.org/review/26924 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: don't give the cmake macro the directory (it has it already).Dario Lombardo1-1/+0
Change-Id: I1c3febf527f16825793a30eb2ab5d43baaa83a57 Reviewed-on: https://code.wireshark.org/review/26880 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set the cmake bindir in openSUSE.Dario Lombardo1-0/+5
Change-Id: I41edf52f8021938877bc53dd5eea4ff29cf4827e Reviewed-on: https://code.wireshark.org/review/26878 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: set ninja executable in %install target.Dario Lombardo1-0/+1
It is not inherited by previous target. Change-Id: I11be59211a900375e02fce8c05cc4164b8dc42e4 Reviewed-on: https://code.wireshark.org/review/26877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: fix typo.Dario Lombardo1-1/+1
Change-Id: I2e82fb0696e2e7cb636ec1fdfb72a566e0eca94f Reviewed-on: https://code.wireshark.org/review/26879 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-11RPM: don't install doc under guides with make.Dario Lombardo1-2/+2
Change-Id: Iaa8f3d941dcb329bbfff28f6d9417b92d44371e1 Reviewed-on: https://code.wireshark.org/review/26876 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: Make documentation installation optional.Gerald Combs1-3/+17
Add a "guides" bcond so that we can make Asciidoctor and the HTML guide installation optional. Change-Id: I5f9e6cc59689dba7d600cc721547aed020652f00 Reviewed-on: https://code.wireshark.org/review/26867 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: support multiple ninja executables.Dario Lombardo1-3/+7
Support ninja and ninja-build (Centos7) so far. Change-Id: I846a0645f24f6cfdc83bd725827d1681a5a1f174 Reviewed-on: https://code.wireshark.org/review/26856 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11RPM: install guides when using make.Dario Lombardo1-0/+1
Change-Id: I89ca826f39dea3f53b94a87ccc2fbe3f9bb4a2b1 Reviewed-on: https://code.wireshark.org/review/26861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-09Autotools: More Qt4 removal.Gerald Combs1-1/+1
Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf Reviewed-on: https://code.wireshark.org/review/26812 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-06Remove some references to Qt4.Gerald Combs2-31/+1
Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc Reviewed-on: https://code.wireshark.org/review/26771 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-04-05GTK Cmake: Remove the option to build the GTK UI.AndersBroman2-148/+0
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04CMake RPM build: Try to get rid of %globals in favor of %bcond.Anders1-18/+16
Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26Added Diameter AVP decode details for Override Control AVPs in the Cisco ↵Mike Lugo1-0/+1
Systems XML file. Added a new file for Verizon specific AVPs via Verizon.xml. Added calls to Verizon XML in hte dictional XML file. Change-Id: I30e9d80e6304b1b5c79367a752e239091c6ec171 Reviewed-on: https://code.wireshark.org/review/26594 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26CMake: Add an rpm-package target.Gerald Combs2-0/+551
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-17NSIS: Link to Npcap.Gerald Combs4-17/+26
Mention Npcap on the WinPcap installer page and add a link to it. Update some other text and tell developers to use NSIS 3.0 while we're here. Change-Id: I64728f014f518439ba4a38eda7a283274d40fcdc Reviewed-on: https://code.wireshark.org/review/26515 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09Add MaxMindDB 1.3.2 library to WindowsPascal Quantin3-2/+4
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo3-39/+3
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 20:43:56 +0000