From nobody Sat Nov 23 14:58:53 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