From nobody Sat Nov 23 11:59:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1715847948352123.03804444800426; Thu, 16 May 2024 01:25:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3F65518F5; Thu, 16 May 2024 04:25:47 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 170A41A0C; Thu, 16 May 2024 04:24:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A813B196B; Thu, 16 May 2024 04:24:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3049C1955 for ; Thu, 16 May 2024 04:24:28 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-D7lLggVVNyOIBxJO8L-mPg-1; Thu, 16 May 2024 04:24:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB7F3812296 for ; Thu, 16 May 2024 08:24:25 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 381E740C6EB7 for ; Thu, 16 May 2024 08:24:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715847867; h=from:from: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; bh=2R1+hoIO0kAGBkI8iKoPD8Aizyc2zLmdtJoIcuPtfKU=; b=K8UuVqQHYQkZq2FXnyaa+5g7jKy7WbLBCbYPI1uSOrNFquSrrN1HIqjoLTJHEeeSzKX945 +36JUUlPRIVZ+dbl7WTpwFrFaBjYFizmdQ30WE0wTr+oQX9E0sBkpGpJGMo/p5PCBE/9PC angVEZ9dVIwK99vXI0MibWOHeuRdRA8= X-MC-Unique: D7lLggVVNyOIBxJO8L-mPg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 1/4] rpm: Drop weak dependency on ssh-proxy from client Date: Thu, 16 May 2024 10:24:19 +0200 Message-ID: <20240516082422.332693-2-abologna@redhat.com> In-Reply-To: <20240516082422.332693-1-abologna@redhat.com> References: <20240516082422.332693-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KQ3FHA6TYAGO7EF6HITVYBTSRYWCBEEW X-Message-ID-Hash: KQ3FHA6TYAGO7EF6HITVYBTSRYWCBEEW X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1715847949765100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The ssh-proxy feature works independently of the clients, just like the NSS plugin does. Moreover, ssh-proxy only works for local VMs, while clients are routinely used to manage remote hypervisors. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f7c128d809..5cb19fa433 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1025,9 +1025,6 @@ Summary: Client side utilities of the libvirt library Requires: libvirt-libs =3D %{version}-%{release} # Needed by virt-pki-validate script. Requires: gnutls-utils - %if %{with_ssh_proxy} -Recommends: libvirt-ssh-proxy =3D %{version}-%{release} - %endif =20 # Ensure smooth upgrades Obsoletes: libvirt-bash-completion < 7.3.0 --=20 2.45.0 From nobody Sat Nov 23 11:59:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1715848061485163.1163861058044; Thu, 16 May 2024 01:27:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5D11D18F5; Thu, 16 May 2024 04:27:40 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 80D23192B; Thu, 16 May 2024 04:25:08 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 94E9E1A15; Thu, 16 May 2024 04:25:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D55731A15 for ; Thu, 16 May 2024 04:24:38 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-rVNhZIGtNKu4u2AHZ_I1Rw-1; Thu, 16 May 2024 04:24:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70D4885A58C for ; Thu, 16 May 2024 08:24:26 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F245940C6EB7 for ; Thu, 16 May 2024 08:24:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715847878; h=from:from: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; bh=U7lwG+SRJsYZX2rGHn5fZQqQETp61Pex6+lDIciVl1s=; b=TC6pSFzQo+05Ss2dR8hZhUGp5xAjTSy7R1QQKeDPVl7jVLrQrKjLXPpIw4tO3xfj8Ki3Yi nsS0xelb/puBqxdf/HFQqXnq0no6YSRLj5VnOUWMMq7tmfKQosOQVDvdGqa2b+HP1dURfR OBE06dH7tlH/gClW4qx3RuKxoovR5Ic= X-MC-Unique: rVNhZIGtNKu4u2AHZ_I1Rw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 2/4] rpm: Only Recommend ssh-proxy Date: Thu, 16 May 2024 10:24:20 +0200 Message-ID: <20240516082422.332693-3-abologna@redhat.com> In-Reply-To: <20240516082422.332693-1-abologna@redhat.com> References: <20240516082422.332693-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ODDADJY4ZPKEBHOORSYSJTRD6KONXKPY X-Message-ID-Hash: ODDADJY4ZPKEBHOORSYSJTRD6KONXKPY X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1715848062450100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The way things are implemented, installing the package not only makes the feature available but also enables it. Some admins might not want that to happen, so let's make the dependency a weak one to offer them a way out. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5cb19fa433..329b923e8f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -905,7 +905,7 @@ Requires: libvirt-daemon-driver-nwfilter =3D %{version}= -%{release} Requires: libvirt-daemon-driver-secret =3D %{version}-%{release} Requires: libvirt-daemon-driver-storage =3D %{version}-%{release} %if %{with_ssh_proxy} -Requires: libvirt-ssh-proxy =3D %{version}-%{release} +Recommends: libvirt-ssh-proxy =3D %{version}-%{release} %endif Requires: qemu =20 @@ -936,7 +936,7 @@ Requires: libvirt-daemon-driver-nwfilter =3D %{version}= -%{release} Requires: libvirt-daemon-driver-secret =3D %{version}-%{release} Requires: libvirt-daemon-driver-storage =3D %{version}-%{release} %if %{with_ssh_proxy} -Requires: libvirt-ssh-proxy =3D %{version}-%{release} +Recommends: libvirt-ssh-proxy =3D %{version}-%{release} %endif Requires: qemu-kvm =20 --=20 2.45.0 From nobody Sat Nov 23 11:59:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1715847984496272.7237058256118; Thu, 16 May 2024 01:26:24 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 738941A2B; Thu, 16 May 2024 04:26:23 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6F79F1A27; Thu, 16 May 2024 04:24:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D22D319EC; Thu, 16 May 2024 04:24:29 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 59270196B for ; Thu, 16 May 2024 04:24:29 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-bVzUdLWaOvi2Yb3qd_AQZw-1; Thu, 16 May 2024 04:24:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 366BF101A525 for ; Thu, 16 May 2024 08:24:27 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B84D340C6EB7 for ; Thu, 16 May 2024 08:24:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715847869; h=from:from: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; bh=u+yjUvmi7FG3tAqkyaywdDyGvStZe2bw5dPcwEiyd+M=; b=PamguPSzWAUBpcmuOmZ6C1iiPjyFL4U7Ku+xnsp6p+tiJKiRZkr8pUMl4JnXJ2E6i6uwPp U5RrPsqU1+ANST0hBCFdZB/GX+wL2kvT3Kn5YGdZYJLsOrwG4Wv/vPjlrglaHFrd5uD+yE upYZpeJr+n9JRfeaHw6YvOLPHKmwDb8= X-MC-Unique: bVzUdLWaOvi2Yb3qd_AQZw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 3/4] rpm: Move dependency on ssh-proxy to QEMU driver Date: Thu, 16 May 2024 10:24:21 +0200 Message-ID: <20240516082422.332693-4-abologna@redhat.com> In-Reply-To: <20240516082422.332693-1-abologna@redhat.com> References: <20240516082422.332693-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7CJMCYKLGSCFYVFGQKY2LLNM6G7E7FFG X-Message-ID-Hash: 7CJMCYKLGSCFYVFGQKY2LLNM6G7E7FFG X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1715847985830100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This way we can avoid repeating it twice. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 329b923e8f..0d6f15460d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -810,6 +810,9 @@ Summary: QEMU driver plugin for the libvirtd daemon Requires: libvirt-daemon-common =3D %{version}-%{release} Requires: libvirt-daemon-log =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} + %if %{with_ssh_proxy} +Recommends: libvirt-ssh-proxy =3D %{version}-%{release} + %endif Requires: /usr/bin/qemu-img # For image compression Requires: gzip @@ -904,9 +907,6 @@ Requires: libvirt-daemon-driver-nodedev =3D %{version}-= %{release} Requires: libvirt-daemon-driver-nwfilter =3D %{version}-%{release} Requires: libvirt-daemon-driver-secret =3D %{version}-%{release} Requires: libvirt-daemon-driver-storage =3D %{version}-%{release} - %if %{with_ssh_proxy} -Recommends: libvirt-ssh-proxy =3D %{version}-%{release} - %endif Requires: qemu =20 %description daemon-qemu @@ -935,9 +935,6 @@ Requires: libvirt-daemon-driver-nodedev =3D %{version}-= %{release} Requires: libvirt-daemon-driver-nwfilter =3D %{version}-%{release} Requires: libvirt-daemon-driver-secret =3D %{version}-%{release} Requires: libvirt-daemon-driver-storage =3D %{version}-%{release} - %if %{with_ssh_proxy} -Recommends: libvirt-ssh-proxy =3D %{version}-%{release} - %endif Requires: qemu-kvm =20 %description daemon-kvm --=20 2.45.0 From nobody Sat Nov 23 11:59:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171584802606983.89627924310969; Thu, 16 May 2024 01:27:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 01A151AC0; Thu, 16 May 2024 04:27:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4CA4E1C27; Thu, 16 May 2024 04:24:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4D3CA196B; Thu, 16 May 2024 04:24:30 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id AD72919EB for ; Thu, 16 May 2024 04:24:29 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-78-qLsk4SnEMF-Y_2BpmvKDuA-1; Thu, 16 May 2024 04:24:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0EF8812296 for ; Thu, 16 May 2024 08:24:27 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E11340C6EB7 for ; Thu, 16 May 2024 08:24:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715847869; h=from:from: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; bh=9XlJlXXRrLuU6R9ILpW3329QkRVNssJmD8VM8TuGfAw=; b=OM9YO+//Rz2/EGr2GvmyHfd4lLpFZqkDVqr5ldjiM07eBh1Pp8ByNiM1EofiNdMoMqDEGY urZmfsyIdVGrO4VgCkm5Bt4ElCuZRI7ImPBnq+oREgfkZewtujtRkzHreHajPmQTBmjiRn YwyELSCKpECfAO+P1VSD1If0iR5mPKY= X-MC-Unique: qLsk4SnEMF-Y_2BpmvKDuA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 4/4] rpm: Drop with_ssh_proxy define Date: Thu, 16 May 2024 10:24:22 +0200 Message-ID: <20240516082422.332693-5-abologna@redhat.com> In-Reply-To: <20240516082422.332693-1-abologna@redhat.com> References: <20240516082422.332693-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FBOA4BZB3UNTEXVJEVLUQITZWCYJHGRA X-Message-ID-Hash: FBOA4BZB3UNTEXVJEVLUQITZWCYJHGRA X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1715848028104100001 Content-Type: text/plain; charset="utf-8"; x-default="true" As a general rule, we use defines for features that can only be enabled on a subset of the platforms that we target, and we don't offer fine-grained control over every single possible meson configuration knob at the RPM level. In the case of ssh-proxy, we are enabling it everywhere already, so having a define for it is unnecessary. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0d6f15460d..b6f9bf86f3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -91,7 +91,6 @@ # Other optional features %define with_numactl 0%{!?_without_numactl:1} %define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1} -%define with_ssh_proxy 0%{!?_without_ssh_proxy:1} =20 # A few optional bits off by default, we enable later %define with_fuse 0 @@ -810,9 +809,7 @@ Summary: QEMU driver plugin for the libvirtd daemon Requires: libvirt-daemon-common =3D %{version}-%{release} Requires: libvirt-daemon-log =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} - %if %{with_ssh_proxy} Recommends: libvirt-ssh-proxy =3D %{version}-%{release} - %endif Requires: /usr/bin/qemu-img # For image compression Requires: gzip @@ -1104,14 +1101,12 @@ Requires: libvirt-daemon-driver-network =3D %{versi= on}-%{release} Libvirt plugin for NSS for translating domain names into IP addresses. %endif =20 -%if %{with_ssh_proxy} %package ssh-proxy Summary: Libvirt SSH proxy Requires: libvirt-libs =3D %{version}-%{release} =20 %description ssh-proxy Allows SSH into domains via VSOCK without need for network. -%endif =20 %if %{with_mingw32} %package -n mingw32-libvirt @@ -1304,12 +1299,6 @@ exit 1 %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=3Ddisabled %endif =20 -%if %{with_ssh_proxy} - %define arg_ssh_proxy -Dssh_proxy=3Denabled -%else - %define arg_ssh_proxy -Dssh_proxy=3Ddisabled -%endif - %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1391,7 +1380,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dtls_priority=3D%{tls_priority} \ -Dsysctl_config=3Denabled \ %{?arg_userfaultfd_sysctl} \ - %{?arg_ssh_proxy} \ + -Dssh_proxy=3Denabled \ %{?enable_werror} \ -Dexpensive_tests=3Denabled \ -Dinit_script=3Dsystemd \ @@ -2447,11 +2436,9 @@ exit 0 %{_libdir}/libnss_libvirt.so.2 %{_libdir}/libnss_libvirt_guest.so.2 =20 - %if %{with_ssh_proxy} %files ssh-proxy %config(noreplace) %{_sysconfdir}/ssh/ssh_config.d/30-libvirt-ssh-proxy.co= nf %{_libexecdir}/libvirt-ssh-proxy - %endif =20 %if %{with_lxc} %files login-shell --=20 2.45.0