From nobody Mon Apr 29 23:59:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1642437634; cv=none; d=zohomail.com; s=zohoarc; b=ECzMReBO1mlDt04SjHUfGO0yKy6abGK7oOpkpicoRmiWf/So/45m8pBgl3RG70BYTlrNtnLwCmyVwiyhNi+aLc7OiGlsQojrkliAHG5MZ99qaL5izP8OHRkQwM/XtXfu5B9hCqxMXqIsg9hzcPlhbSozW4y8GWy1iWWPpPfSGNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642437634; 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=WCqS9tBljrHN9HnfEEU7WkrjedLJsNJcHF4WbvEkzgE=; b=haLr5yK97zMcV7CFBnnH91qvNsV+PBPVLUsPRLcRpwr22uCFUKZ7iT0nUo+V8DQdHzEd1g/jtIjH/MhwgpeFXwfI/ZKWiNGvE36KidSSGYyDSa0qvQSihxUF5i93g2feSDD8Bvw+E0FcOa+eZWYkZ/U9VnyEW/fc6t7rCtOy9zg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642437634184276.5216448950928; Mon, 17 Jan 2022 08:40:34 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-xDCV8HHyOy6p7fmtTOKwOg-1; Mon, 17 Jan 2022 11:40:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74006100F943; Mon, 17 Jan 2022 16:40:24 +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 517534DC12; Mon, 17 Jan 2022 16:40:24 +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 B5A421809CB8; Mon, 17 Jan 2022 16:40:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20HGeM56006594 for ; Mon, 17 Jan 2022 11:40:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B73A7A417; Mon, 17 Jan 2022 16:40:22 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.195.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C08837A413 for ; Mon, 17 Jan 2022 16:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642437633; 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=WCqS9tBljrHN9HnfEEU7WkrjedLJsNJcHF4WbvEkzgE=; b=MxhtiG+QSeSgj6VXojc181grJpTHtOksbQJd0uHlXtK9LqBrfebGK7FGZ9ZVt4zD1ZtLNC tb1lkN+XililjGapmYG71r8cwS6xExPEQZaPnTUw7kuRVcu07L/PKQ6nkJahH8Pgwi5yk9 aoERrrrsq6mf4AE5yPUhkvm+zw1T7Xk= X-MC-Unique: xDCV8HHyOy6p7fmtTOKwOg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] spec: Drop BuildRequires on dnsmasq Date: Mon, 17 Jan 2022 17:40:01 +0100 Message-Id: <20220117164002.213594-2-abologna@redhat.com> In-Reply-To: <20220117164002.213594-1-abologna@redhat.com> References: <20220117164002.213594-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642437635435100003 Content-Type: text/plain; charset="utf-8" It's been an optional build time dependency for a long time, so if Meson couldn't find it the only consequence was that libvirt would look for it at runtime instead, which is what we are doing for most of our non-library dependencies anyway. Now we've stopped even looking for it at build time, so there's no point in having it installed in the build environment. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index db9d622699..9c1c054f50 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -281,7 +281,6 @@ BuildRequires: sanlock-devel >=3D 2.4 BuildRequires: libpcap-devel >=3D 1.5.0 BuildRequires: libnl3-devel BuildRequires: libselinux-devel -BuildRequires: dnsmasq >=3D 2.41 BuildRequires: iptables BuildRequires: ebtables BuildRequires: module-init-tools --=20 2.34.1 From nobody Mon Apr 29 23:59:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1642437722; cv=none; d=zohomail.com; s=zohoarc; b=OTys3qtSmVbt1tc5W4U7vPYLsDd/1bLANG6unooCLQ7cPH8qgLWfaJFBqI4KH5f/j5CY6+ljyeHPZ3pYJoVPEyU2Z7HOD09b1fdjpCUOZxyn8vYECRl6T7dLpfSE9unLagTC+6jFVHENwSkBTeplWQJPRC4/nSnPil1Dx89I20g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642437722; 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=Jd2dxwcyFQYtQFDYflUyF1Xh/+zmgr0/R43qcVdXcJ0=; b=WwlYwjpPK6xhfKizcosbm5iHGna+cZGHNGwMIeSzVjVRrVyKe/RSxwHo4f1iGuqFvN6SI9uq9TiYZ/EfOvBbDOGOUbx2eFspil6Qk2bbNbTs4+G7B8/SZXt4V2IeO6FZLbILvVmtQv8LwLs8rME15TN8xibJJjGmr2lc2va6Gq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642437722890443.4209064541121; Mon, 17 Jan 2022 08:42:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-478-mcDGofIpNLCcWBnOq5rgWA-1; Mon, 17 Jan 2022 11:40:38 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F076D190A7A5; Mon, 17 Jan 2022 16:40:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBC6D2DE92; Mon, 17 Jan 2022 16:40:32 +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 91F304A7C9; Mon, 17 Jan 2022 16:40:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20HGeN5i006605 for ; Mon, 17 Jan 2022 11:40:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 55C717A417; Mon, 17 Jan 2022 16:40:23 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.195.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA1517A413 for ; Mon, 17 Jan 2022 16:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642437721; 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=Jd2dxwcyFQYtQFDYflUyF1Xh/+zmgr0/R43qcVdXcJ0=; b=Ha33xUo8eoDD3XZjUmpr8TKeka7HjG+pr5Q7vnUasW42w2LOzP5FsEFJF62GR0IgIt3X+9 mjkU9BflO42XPTD18Qft8aJPJTRen4Aw3WnToz87f47KM0H3g0bpGT43vBNO9pBfvWqQR+ 3/mq8KcUmFfkrCe5SKVx0mpsGuJVlnA= X-MC-Unique: mcDGofIpNLCcWBnOq5rgWA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] util: Stop storing dnsmasq version Date: Mon, 17 Jan 2022 17:40:02 +0100 Message-Id: <20220117164002.213594-3-abologna@redhat.com> In-Reply-To: <20220117164002.213594-1-abologna@redhat.com> References: <20220117164002.213594-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642437725337100001 Content-Type: text/plain; charset="utf-8" We don't do anything with it after checking that it satisfies our requirements and don't provide a way for users of the module to access it, so carrying it around is pointless. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/util/virdnsmasq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 57b24c9f6a..b5f903cfac 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -577,7 +577,6 @@ dnsmasqReload(pid_t pid G_GNUC_UNUSED) struct _dnsmasqCaps { virObject parent; char *binaryPath; - unsigned long version; }; =20 static virClass *dnsmasqCapsClass; @@ -608,6 +607,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char = *buf) { int len; const char *p; + unsigned long version; =20 p =3D STRSKIP(buf, DNSMASQ_VERSION_STR); if (!p) @@ -615,21 +615,21 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const cha= r *buf) =20 virSkipToDigit(&p); =20 - if (virParseVersionString(p, &caps->version, true) < 0) + if (virParseVersionString(p, &version, true) < 0) goto error; =20 - if (caps->version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * = 1000) { + if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("dnsmasq version >=3D %u.%u required but %lu.%lu = found"), DNSMASQ_MIN_MAJOR, DNSMASQ_MIN_MINOR, - caps->version / 1000000, - caps->version % 1000000 / 1000); + version / 1000000, + version % 1000000 / 1000); goto error; } =20 VIR_INFO("dnsmasq version is %d.%d", - (int)caps->version / 1000000, - (int)(caps->version % 1000000) / 1000); + (int)version / 1000000, + (int)(version % 1000000) / 1000); return 0; =20 error: --=20 2.34.1