[libvirt] [PATCH 5/5] tools: Drop support for pre-2.4.0 wireshark

[Ján Tomko]

On Fri, Feb 08, 2019 at 12:23:28PM +0100, Michal Privoznik wrote:
>The wireshark-2.4.0 is almost 2 years old now. Assuming anybody

While 2 years is not that much given our support page:
https://libvirt.org/platforms.html
the wireshark plugin was always an exception to those

>interested in running latest libvirt doesn't run old wireshark,
>it is safe to do this. It also simplifies the code.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> libvirt.spec.in                      |  8 ++----
> m4/virt-wireshark.m4                 |  4 +--
> tools/wireshark/src/packet-libvirt.c | 39 ----------------------------
> tools/wireshark/src/plugin.c         | 14 +++-------
> 4 files changed, 7 insertions(+), 58 deletions(-)
>
>diff --git a/libvirt.spec.in b/libvirt.spec.in
>index 13f41bb4a5..9beffba203 100644
>--- a/libvirt.spec.in
>+++ b/libvirt.spec.in
>@@ -166,11 +166,7 @@
> # Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer
> %if 0%{?fedora}
>     %define with_wireshark 0%{!?_without_wireshark:1}
>-%endif
>-%if 0%{?fedora} || 0%{?rhel} > 7

This gets rid of the rhel > 7 condition.
If it works on latest Fedora, shouldn't it work on RHEL 8 too?

>     %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
>-%else
>-    %define wireshark_plugindir %{_libdir}/wireshark/plugins/epan
> %endif
>
> # Enable libssh transport for new enough distros
>@@ -389,7 +385,7 @@ BuildRequires: numad
> %endif
>
> %if %{with_wireshark}
>-BuildRequires: wireshark-devel >= 2.1.0
>+BuildRequires: wireshark-devel >= 2.4.0


> %endif
>
> %if %{with_libssh}
>@@ -935,7 +931,7 @@ Bash completion script stub.
> %if %{with_wireshark}
> %package wireshark
> Summary: Wireshark dissector plugin for libvirt RPC transactions
>-Requires: wireshark >= 1.12.6-4
>+Requires: wireshark >= 2.4.0
> Requires: %{name}-libs = %{version}-%{release}
>
> %description wireshark
>diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4
>index a8f8083f5e..2fbf691590 100644
>--- a/m4/virt-wireshark.m4
>+++ b/m4/virt-wireshark.m4
>@@ -18,14 +18,14 @@ dnl <http://www.gnu.org/licenses/>.
> dnl
>
> AC_DEFUN([LIBVIRT_ARG_WIRESHARK],[
>-  LIBVIRT_ARG_WITH_FEATURE([WIRESHARK_DISSECTOR], [wireshark], [check], [1.11.3])
>+  LIBVIRT_ARG_WITH_FEATURE([WIRESHARK_DISSECTOR], [wireshark], [check], [2.4.0])

Even 1.11.3 seems too new for CentOS 7:
https://repology.org/metapackage/wireshark/versions
so we're not really breaking it here by bumping the version

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190211/14dc4556/attachment-0001.sig>