aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
Commit message (Collapse)AuthorAgeFilesLines
* rpm: RHEL 8 update macrosJohn Thacker2022-01-171-14/+12
| | | | | | | | RHEL 8 and derivatives have supported the various CMake macros since 8.4 (June 2021, see https://access.redhat.com/errata/RHEA-2021:1747) Use them there as well, so that we have a unified spec file for all recent distributions (with the older RHEL/CentOS 7 and SLES 12 being the only exceptions.)
* rpm: expand commentJohn Thacker2022-01-171-1/+3
| | | | | Be a bit more precise about what's wrong with bindir on SUSE (when prefix is /usr/local or anything else.)
* rpm: Fix up pathsJohn Thacker2022-01-171-6/+10
| | | | | | | | | | | | | | Fedora and SUSE 15 use out of source builds by default, but store the build directory in differently named macros. Define one macro for the build directory that has the appropriate value (which will be "." for any distribution that doesn't have either macro, and thus presumably does in-source builds.) This fixes building and installing the guides with any of the supported distributions. Also, since RHEL/CentOS 7 doesn't have a special CMake macro, it needs to set the install prefix when calling cmake. Also, fix a comment warning by escaping the percent sign.
* rpm packaging: Add build requirements for the guidesJohn Thacker2022-01-161-0/+10
| | | | | The HTML guides require xsltproc and the docbook xsl stylesheets in order to be generated.
* packaging: Add RPM build dependencies for ninja, asciidoctorJohn Thacker2022-01-081-5/+17
| | | | | | | | If we're building with ninja, we need to require it. While CentOS/RHEL/Rocky 8 doesn't have a asciidoctor package (so we install it separately), we can add a BuildRequires on the file that RubyGems creates for other rpm based distributions.
* packaging: Let SUSE build with /usr prefixJohn Thacker2022-01-071-2/+4
| | | | | | | There's a couple places where /usr/local is hardcoded in the spec file that need to be replaced with %{_prefix} in order for RPMs to build correctly on OpenSUSE with prefixes other than /usr/local
* packaging: Fix RPM -qt subpackage requiresJohn Thacker2022-01-061-3/+4
| | | | | | | The BuildRequires and Requires for the -qt subpackage need to go into its %package section, not its %description section. The dependencies were not being enforced, but instead being added to the description of the GUI package.
* packaging: Bump RPM glib2 version to 2.38John Thacker2022-01-051-1/+1
| | | | | We require glib2 version 2.38 now, increase the version requirement in the RPM spec file to match.
* packaging: Remove unnecessary RequiresJohn Thacker2022-01-051-58/+8
| | | | | | | | | | | Automatic dependency generation has been around since RPM 4.0 (September 2000). The BuildRequires are sufficient for all of these; the automatic dependences for the .so files works and are superior as they are versioned. Red Hat and SUSE both recommend using automatic dependencies and avoiding unnecessary Requires in spec files: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_explicit_requires https://en.opensuse.org/openSUSE:Package_dependencies
* packaging: ENABLE_RPATH_ORIGIN on Fedora RPM buildJohn Thacker2022-01-041-0/+6
| | | | | | | | | | | | | | Fedora Linux recently turned on some hardcore RPATH hardening that causes RPM build to fail with a wide variety of prefixes unless $ORIGIN is enabled. It builds fine with /usr as the prefix because in that case we disable the RPATH. In the long run perhaps we should have the rpm-package target use the standard prefix of /usr instead of the CMAKE_INSTALL_PREFIX, but even so we want the spec file to work if /usr/local is set as the prefix. Fix #17830
* CMake: Use more consistent naming for optionsJoão Valverde2022-01-031-1/+1
| | | | | | | Having some options use DISABLE_ and others ENABLE_ is inconsistent and difficult to remember. Use ENABLE_ instead consistently. Frame-larger-than remains an exception.
* Try to fix RPM packaging.Gerald Combs2021-10-011-1/+7
| | | | | | Asciidoctor is now required for packaging. Try to make sure it's installed on CentOS 8 and openSUSE 15.2. Note that CentOS 8 doesn't have an Asciidoctor package, which complicates our SPEC.
* Docs+Packaging: Convert our man pages to Asciidoctor.Gerald Combs2021-10-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert doc/*.pod to Asciidoctor. This: * Means we use the same markup for our man pages, the guides, and release notes. * Lets us add versions to our man pages. * Gives us more formatting options, e.g. AsciiDoc supports `commands`, nested lists and makes it easy to include version information. The manpage backend doesn't seem to support tables very well, unfortunately. Convert our CMake configuration to produce *roff and html man pages using Asciidoctor. Add a "manarg" block macro which makes our synopses wrap correctly. Similar to the release notes, guides, and FAQ, if Asciidoctor isn't found the man pages won't be generated or installed. Move Asciidoctor to the list of package build dependencies in various places. This commit includes the conversion script (pod2adoc.py), which will be removed later. Line count sanity check: Man page .pod .adoc androiddump 260 280 asn2deb 93 105 capinfos 401 471 captype 54 55 ciscodump 241 269 dftest 42 42 dpauxmon 153 169 dumpcap 464 534 editcap 528 583 etwdump 136 156 extcap 157 181 idl2deb 91 103 idl2wrs 120 100 mergecap 206 207 mmdbresolve 75 75 randpkt 107 111 randpktdump 158 184 rawshark 558 610 reordercap 76 78 sdjournal 145 157 sshdump 272 302 text2pcap 274 312 tshark 2135 2360 udpdump 133 151 wireshark-filter 486 479 wireshark 2967 3420
* Rename version.h to be more descriptiveJoão Valverde2021-07-091-1/+0
| | | | | Version.h is too generic. This is specific to VCSVERSION and that should be made more obvious and discoverable.
* RPM: Don't install HTML manuals twiceJoão Valverde2021-03-301-4/+9
| | | | Fixes e4d4814168405c1eaea94ebf75883e7b166b9eba.
* RPM: Update the HTML documentation location.Gerald Combs2021-03-291-2/+5
|
* RPM: Fix build using the Unix Makefiles generatorJoão Valverde2021-03-061-3/+3
|
* rpm: disable double dash check on fedora.Dario Lombardo2021-01-071-0/+6
| | | | | | Standard naming convention in Wireshark generates a version that make the rpm build fail on Fedora. Since we've not evidence that this happens on other platforms, just disable on that one.
* RPM: Try to fix openSUSE packaging.Gerald Combs2020-12-121-1/+1
| | | | | | | Try to fix + /usr/lib/rpm/suse_update_desktop_file.sh wireshark ERROR: suse_update_desktop_file: unable to find wireshark
* rpm: rename metadataPeter Eszlari2020-12-121-2/+2
|
* Linux: rename metadata according to specPeter Eszlari2020-12-101-6/+6
| | | | | | https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
* wiretap: Convert ascend.y to Lemon.Gerald Combs2020-11-301-1/+3
| | | | | | | | | | | | | | | | Convert wiretap/ascend.y.in from Bison/YACC to Lemon and rename it to wiretap/ascend_parser.lemon. Tighten up some of our scanning and parsing. Make the indentation in it and related files consistent. Aside from the recent IPv4 fragment offset changes, this produces identical output to the 3.4 branch for the Ascend trace files I have here. Remove the comment about supporting other commands. Another timeline might have an Ascend that successfully pivoted to DSL or 15625B+1D gigabit ISDN, but this one has neither. This was our last/only Bison/YACC file, so remove Bison/YACC as a development and packaging dependency and remove references to it from the documentation.
* RPM+CI: Update and fix for Fedora 33, CentOS 8, OpenSUSE Leap 15.2John Thacker2020-11-051-18/+37
| | | | | | | | | | Re-enable Fedora build and add CentOS 8 and OpenSUSE 15.2 builds. Fedora 33 does out of build tree cmake builds and needs spec file changes. CentOS 8 has some changes with cmake and other packages that are similar to older Fedora, and needs extra repositories enabled to get -devel packages (still missing -devel for some optional libraries). OpenSUSE Leap 15.2 also has some changes needed to build. Note that OpenSUSE Leap 15.1 is EOL at the end of November 2020. Fixes #16971
* CI+RPM: Disable the Fedora build for now.Gerald Combs2020-10-281-0/+6
| | | | | Fedora 33's RPM environent added changes that break CMake. Disable it for now.
* RTP: opus playbackLin Sun2020-10-031-0/+9
| | | | | | | | | It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
* Debian+RPM: Require QtSVG.Gerald Combs2020-02-111-0/+2
| | | | | | | | | | | | | | | | | | | | Although we don't depend on any of Qt's SVG classes directly, we do use SVG icons in Preferences → Appearance → Language and QIcon loads its SVG engine dynamically. If it's not present Wireshark will still run, but the user won't see any flag icons. Require QtSVG in the Debian and RPM packaging. It's not that large (~ 400k here on Ubuntu 18.04) and ensures that we have a uniform user experience across platforms. In this particular case, if the user experience happens to be "Wireshark's UI is in a language I don't understand" the little flags can come in handy. Change-Id: If3c2e8a6040967353dbc462ee475ef12514b25f9 Reviewed-on: https://code.wireshark.org/review/36037 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
* RPM: fix missing qt5-linguist dependency, simplify installed packagesPeter Wu2020-02-091-0/+2
| | | | | | | | | | Remove unnecessary Qt5SVG build dependency. Do not install Qt4 qt-devel. qt5-qtbase-devel is big, try to avoid pulling unnecessary deps. Change-Id: Id289bea10ea89de6b7a3ea77996d861ff7354560 Reviewed-on: https://code.wireshark.org/review/36058 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* RPM: fixed log sequenceJirka Novak2020-01-201-1/+1
| | | | | | | Change-Id: I0d244ff6950961219ea29f7b2c290c483e92bfd3 Reviewed-on: https://code.wireshark.org/review/35877 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Reviewed-by: Pascal Quantin <pascal@wireshark.org>
* RTP: decode iLBC payloadJirka Novak2020-01-201-0/+9
| | | | | | | | | | | | It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Add c-ares to the required library list.Gerald Combs2019-11-231-8/+3
| | | | | | | | | | | | | | Although c-ares support was techically optional, it was either on by default or required in all of our packaging. Go ahead and require it globally. C-ares is widely available and synchronous name resolution can easily result in a horrific user experience. Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464 Reviewed-on: https://code.wireshark.org/review/35188 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>
* rpm: use python3 to fix CentOS 7 buildsPeter Wu2019-09-231-3/+2
| | | | | | | | | | CentOS 7 (1908) started including python3 (Python 3.6), see https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1908 Change-Id: I6418e7839f1119cf1152f445759e92acd4f39cc4 Reviewed-on: https://code.wireshark.org/review/34593 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Kafka: include zstd compression in Kafka message batchesPiotr Smolinski2019-08-201-1/+13
| | | | | | | | Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
* HTTPS In More Places, update some URLs.Guy Harris2019-07-271-1/+1
| | | | | | Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Add brotli decompression support for HTTP and HTTP2 dissectors.Dániel Bakai2019-04-221-0/+24
| | | | | | | | Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* rpm: update rpm package dependencies and spec to work on current os versionsDániel Bakai2019-04-221-0/+30
| | | | | | Change-Id: Iaa0bd9513869e65b96b6014d66ca3cfd917dbe64 Reviewed-on: https://code.wireshark.org/review/32938 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* RPM: fix build since GLIB2_MIN_VERSION was removedPeter Wu2019-04-201-2/+2
| | | | | | | | | | Instead of reintroducing the variable, inline the version. This matches with other version checks in the same file and debian/control. Change-Id: I4dc178575b8f24e7f8e07e8d761e245f14c65ffa Fixes: v3.1.0rc0-566-g8c26217548 ("CMake: bail out if minimum GLib version is not satisfied") Reviewed-on: https://code.wireshark.org/review/32917 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* RPM: respect options for disabling Qt, SpanDSP and BCG729Peter Wu2019-02-101-2/+2
| | | | | | | | | | | | "%bcond_without" enables a feature by default. Be sure to explicitly disable features to match the requested configuration. Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc Ping-Bug: 14606 Reviewed-on: https://code.wireshark.org/review/31933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* rpm: unconditionally add doc files.Dario Lombardo2019-02-051-8/+0
| | | | | | | | | | | | | | | | | | | | | The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since then, rpm builds complain: RPM build errors: File listed twice: /usr/local/bin/dumpcap Installed (but unpackaged) file(s) found: /usr/local/share/doc/wireshark/androiddump.html /usr/local/share/doc/wireshark/capinfos.html /usr/local/share/doc/wireshark/captype.html [cut] The "with ninja" condition has been removed as well since it leads to a dead end. Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a Reviewed-on: https://code.wireshark.org/review/31873 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
* RPM: remove dependency on the which utilityPeter Wu2019-01-141-2/+2
| | | | | | | | | It is not necessary to know the full path to a program. Instead use the 'type' shell builtin (part of POSIX) to detect availability. Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80 Reviewed-on: https://code.wireshark.org/review/31540 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* tarball+RPM: Fetch our version from CMake.Gerald Combs2019-01-141-2/+1
| | | | | | | | | | | | | | | | | Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 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>
* rpm: update all rpm files for using python3.Dario Lombardo2018-11-081-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>
* Require Python 3, drop Python 2 supportPeter Wu2018-11-071-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>
* Add a systemd Journal Export extcap.Gerald Combs2018-10-011-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>
* RPM: obsolete the gnome and gtk packages; allow user to set prefix.Jeff Morriss2018-09-281-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>
* RPM: move the installed development files to a new -devel packageJeff Morriss2018-09-271-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>
* RPM: optionally use ccache to speed up (re)builds.Jeff Morriss2018-09-241-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>
* RPM: Make the (optional) maxminddb dependencies actually work.Jeff Morriss2018-09-241-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>
* rpm: fix compilation on centos (uses cmake3).Dario Lombardo2018-06-091-1/+9
| | | | | | Change-Id: Ia0319658a0e8c9d8e13595d6773dcd6438228bda Reviewed-on: https://code.wireshark.org/review/28112 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* CMake: require at least CMake 3.5Peter Wu2018-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* rpm-package: Use version.h to generate version string in RPMAndersBroman2018-05-021-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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 19:46:35 +0000