From nobody Wed Dec 17 06:02:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 154962547330828.892436282350673; Fri, 8 Feb 2019 03:31:13 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 512E3432A4; Fri, 8 Feb 2019 11:31:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 152B41796F; Fri, 8 Feb 2019 11:31:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9B7BA18033A3; Fri, 8 Feb 2019 11:31:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x18BTouS027945 for ; Fri, 8 Feb 2019 06:29:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4DB526090D; Fri, 8 Feb 2019 11:29:50 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8C9B648B6 for ; Fri, 8 Feb 2019 11:29:49 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 8 Feb 2019 12:23:27 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/5] m4: Put wireshark plugin into epan/ directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 08 Feb 2019 11:31:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Since wirshark-2.5.0 toplevel plugins are no longer loaded. Only plugins from epan/, wiretap/ or codecs/ subdirs are. Update the plugin dir we generate. This is safe to do even for older wiresharks, since they load plugins from there too. Signed-off-by: Michal Privoznik --- libvirt.spec.in | 4 ++-- m4/virt-wireshark.m4 | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c0e538d92d..13f41bb4a5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -168,9 +168,9 @@ %define with_wireshark 0%{!?_without_wireshark:1} %endif %if 0%{?fedora} || 0%{?rhel} > 7 - %define wireshark_plugindir %(pkg-config --variable plugindir wireshar= k) + %define wireshark_plugindir %(pkg-config --variable plugindir wireshar= k)/epan %else - %define wireshark_plugindir %{_libdir}/wireshark/plugins + %define wireshark_plugindir %{_libdir}/wireshark/plugins/epan %endif =20 # Enable libssh transport for new enough distros diff --git a/m4/virt-wireshark.m4 b/m4/virt-wireshark.m4 index 1283a0f403..a8f8083f5e 100644 --- a/m4/virt-wireshark.m4 +++ b/m4/virt-wireshark.m4 @@ -50,6 +50,12 @@ AC_DEFUN([LIBVIRT_CHECK_WIRESHARK],[ dnl time ws_plugindir=3D'${exec_prefix}'"${ws_plugindir#$ws_exec_prefix}" fi + + dnl Since wireshark 2.5.0 plugins can't leave in top level + dnl plugindir but have to be under one of ["epan", + dnl "wiretap", "codecs"] subdir. The first one looks okay. + ws_plugindir=3D"$ws_plugindir/epan" + elif test "x$with_ws_plugindir" =3D "xno" || test "x$with_ws_plugindir= " =3D "xyes"; then AC_MSG_ERROR([ws-plugindir must be used only with valid path]) else --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list