Commit Graph

36 Commits

Author SHA1 Message Date
Jirka Novak 12a13a6926 RTP: decode iLBC payload
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>
2020-01-20 07:50:08 +00:00
Gerald Combs 451a241e50 Add c-ares to the required library list.
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>
2019-11-23 22:45:59 +00:00
Peter Wu ceb2ee2e44 rpm: use python3 to fix CentOS 7 builds
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>
2019-09-23 08:50:10 +00:00
Piotr Smolinski ad94c4d459 Kafka: include zstd compression in Kafka message batches
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>
2019-08-20 13:50:45 +00:00
Guy Harris 5cf3fd03f1 HTTPS In More Places, update some URLs.
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:55:36 +00:00
Dániel Bakai 9ce60b173b Add brotli decompression support for HTTP and HTTP2 dissectors.
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>
2019-04-22 15:24:46 +00:00
Dániel Bakai c77ee0008d rpm: update rpm package dependencies and spec to work on current os versions
Change-Id: Iaa0bd9513869e65b96b6014d66ca3cfd917dbe64
Reviewed-on: https://code.wireshark.org/review/32938
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 13:21:37 +00:00
Peter Wu 3af6db7dde RPM: fix build since GLIB2_MIN_VERSION was removed
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>
2019-04-20 22:34:54 +00:00
Peter Wu 07910e841e RPM: respect options for disabling Qt, SpanDSP and BCG729
"%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>
2019-02-10 14:50:49 +00:00
Dario Lombardo ac77bcc61e rpm: unconditionally add doc files.
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>
2019-02-05 08:51:50 +00:00
Peter Wu 60e32b6eb3 RPM: remove dependency on the which utility
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>
2019-01-14 19:01:27 +00:00
Gerald Combs 290214adc9 tarball+RPM: Fetch our version from CMake.
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>
2019-01-14 17:41:43 +00:00
Dario Lombardo 50a0a78bd0 rpm: update all rpm files for using python3.
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-08 15:55:20 +00:00
Peter Wu e9f7bb5127 Require Python 3, drop Python 2 support
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-11-07 20:46:59 +00:00
Gerald Combs f69108b84e Add a systemd Journal Export extcap.
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-10-01 08:58:13 +00:00
Jeff Morriss 4761939731 RPM: obsolete the gnome and gtk packages; allow user to set prefix.
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-28 04:28:30 +00:00
Jeff Morriss 05f50d7cc5 RPM: move the installed development files to a new -devel package
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-27 04:34:29 +00:00
Jeff Morriss 074f8c492c RPM: optionally use ccache to speed up (re)builds.
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-24 20:41:56 +00:00
Jeff Morriss 2b9bc5ebef RPM: Make the (optional) maxminddb dependencies actually work.
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-24 18:31:13 +00:00
Dario Lombardo b296168874 rpm: fix compilation on centos (uses cmake3).
Change-Id: Ia0319658a0e8c9d8e13595d6773dcd6438228bda
Reviewed-on: https://code.wireshark.org/review/28112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 05:08:09 +00:00
Peter Wu 4c1690ac47 CMake: require at least CMake 3.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-15 10:28:09 +00:00
AndersBroman 65c1283d77 rpm-package: Use version.h to generate version string in RPM
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-02 10:44:44 +00:00
Dario Lombardo 4a156da068 Remove autotools build system.
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-18 03:46:17 +00:00
Dario Lombardo 9f851c284f RPM: restore the bindir in openSUSE before packing.
Change-Id: I6e60d1a299528c0f1603b56704a8c47f18c66d08
Reviewed-on: https://code.wireshark.org/review/26926
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 08:53:22 +00:00
Dario Lombardo 5594a9ba67 RPM: install wireshark.desktop in /usr/share/applications.
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-16 08:53:13 +00:00
Dario Lombardo 63ee1a962e RPM: cd into build dir in openSUSE.
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-16 08:53:04 +00:00
Dario Lombardo 643f2eb346 RPM: don't give the cmake macro the directory (it has it already).
Change-Id: I1c3febf527f16825793a30eb2ab5d43baaa83a57
Reviewed-on: https://code.wireshark.org/review/26880
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11 21:39:30 +00:00
Dario Lombardo d944dda7af RPM: set the cmake bindir in openSUSE.
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-11 21:38:29 +00:00
Dario Lombardo 5f20746a29 RPM: set ninja executable in %install target.
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-11 21:38:15 +00:00
Dario Lombardo 26cd969c09 RPM: fix typo.
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-11 14:46:06 +00:00
Dario Lombardo dcc88906a9 RPM: don't install doc under guides with make.
Change-Id: Iaa8f3d941dcb329bbfff28f6d9417b92d44371e1
Reviewed-on: https://code.wireshark.org/review/26876
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-11 08:45:47 +00:00
Gerald Combs b886193309 RPM: Make documentation installation optional.
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-11 03:09:30 +00:00
Dario Lombardo 0b7c6f03b0 RPM: support multiple ninja executables.
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-11 00:11:22 +00:00
Dario Lombardo 64f75a4ede RPM: install guides when using make.
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-11 00:10:32 +00:00
Anders 9e02a0b65b CMake RPM build: Try to get rid of %globals in favor of %bcond.
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-04-04 17:02:02 +00:00
Gerald Combs 1cd92c4961 CMake: Add an rpm-package target.
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-26 14:00:35 +00:00