From nobody Sun Feb 8 04:38:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893724; cv=none; d=zohomail.com; s=zohoarc; b=RJY3O71J6+RmXJzek+EqwfLpFKqSm+yX67LKkJNV+GlGDgpAK4vmKzsIKOgHnHKBgD81hcXTiPDYEZFqLkBDjWUn7TshU860jxZBhXohtoC61IRfSqaH2ta7FipV5BUQMJYFyINsmCFhrsV7arxNpN45Udt24bV8x4C5D59xp40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893724; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AxPEnL9Q+mkLe3QX6vq5R40h8esTNhhMDbiudme1SWo=; b=nuKelbGU1oCnZ6R1htufJ2wfJUkRAUHiHkKVUnYPZBFvkhWIe/iJ1E3DUdQUS8fH4mkDJxyNnZHRiWJ2PPqmxMHF2yg9l2x5PbmjzyVDRGYAgO7RKfIlTHNgne9fJkS+yq96GMJfROol6OUsSP2m4ym6orFwHKuzRcUWPQuV3LQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893724259225.15537311335083; Thu, 16 Jul 2020 03:02:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-UG8WeJ5oMbCKO4c1Jy7K4g-1; Thu, 16 Jul 2020 06:01:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F29E8005B0; Thu, 16 Jul 2020 10:01:20 +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 5F309617A2; Thu, 16 Jul 2020 10:01:20 +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 26F3D1804771; Thu, 16 Jul 2020 10:01:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA1FSA015819 for ; Thu, 16 Jul 2020 06:01:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id C2F422E046; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 398172E035 for ; Thu, 16 Jul 2020 10:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893723; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AxPEnL9Q+mkLe3QX6vq5R40h8esTNhhMDbiudme1SWo=; b=OQGCK6FI3WBrzFdsVFjdSyfUFUJbMr04AKom3DZbKkJDHPTQpYLDb3+XXDaL5uF8bl16nF 1zXn9zvHjRH9W/z6NH2sSk14g7EVfWygctPaUZE3964RwOLb+IhTYWkhd+o64OCuGX1Y/x VJglgB20UbeQ0+d7ugjsWzd5PIzujQI= X-MC-Unique: UG8WeJ5oMbCKO4c1Jy7K4g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 045/351] meson: add firewalld build option Date: Thu, 16 Jul 2020 11:54:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 7 ------- m4/virt-firewalld.m4 | 43 ------------------------------------------- meson.build | 9 +++++++++ meson_options.txt | 1 + 4 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-firewalld.m4 diff --git a/configure.ac b/configure.ac index 0dc9dc3bcfb..825d14c6384 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,6 @@ if test $with_linux =3D no; then with_storage_scsi=3Dno fi =20 -if test $with_freebsd =3D yes; then - with_firewalld=3Dno -fi - =20 AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) @@ -114,7 +110,6 @@ fi =20 # Check for compiler and library settings. =20 -LIBVIRT_ARG_FIREWALLD LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER @@ -141,7 +136,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL =20 -LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB @@ -459,7 +453,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4 deleted file mode 100644 index 89efa47589b..00000000000 --- a/m4/virt-firewalld.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl The firewalld support -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_FIREWALLD], [ - LIBVIRT_ARG_WITH_FEATURE([FIREWALLD], [firewalld], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [ - AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - - if test "x$with_firewalld" =3D "xcheck" ; then - with_firewalld=3D$with_dbus - fi - - if test "x$with_firewalld" =3D "xyes" ; then - if test "x$with_dbus" !=3D "xyes" ; then - AC_MSG_ERROR([You must have dbus enabled for firewalld support]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD], [1], [whether firewalld support i= s enabled]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD], [test "x$with_firewalld" !=3D "xno"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD], [ - LIBVIRT_RESULT_LIB([FIREWALLD]) -]) diff --git a/meson.build b/meson.build index 31f4e730ce7..385a959e88b 100644 --- a/meson.build +++ b/meson.build @@ -1122,6 +1122,14 @@ if bash_completion_dep.found() endif endif =20 +if host_machine.system() !=3D 'freebsd' + if not get_option('firewalld').disabled() and dbus_dep.found() + conf.set('WITH_FIREWALLD', 1) + elif get_option('firewalld').enabled() + error('You must have dbus enabled for firewalld support') + endif +endif + =20 # define top include directory =20 @@ -1152,6 +1160,7 @@ libs_summary =3D { 'curl': curl_dep.found(), 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), + 'firewalld': conf.has('WITH_FIREWALLD'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index 957c88a1622..d9e614131cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,4 +18,5 @@ option('blkid', type: 'feature', value: 'auto', descripti= on: 'blkid support') option('capng', type: 'feature', value: 'auto', description: 'cap-ng suppo= rt') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 suppor= t') +option('firewalld', type: 'feature', value: 'auto', description: 'firewall= d support') option('readline', type: 'feature', value: 'auto', description: 'readline = support') --=20 2.26.2