From nobody Sun May 19 03:38:28 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=1663162290; cv=none; d=zohomail.com; s=zohoarc; b=Jo1799AA7aI8Kqo0l0ZOk0vZ8kKtjYOtpWuPzhoT+c0znfo5gVbKEJTQnxhbt90eUFNNdolnk1XfPY+If6dKFZVBvN4kEZmiRttLklF0Z2dUA2GkVvYUZ5FNIY9QRrr2u+iz+81OiFuA49pASQ46nJwLO9jBUKZ/ZXDjM7z28js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663162290; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=C75c5s5oDUHQJqD1OxkkluT2qEQjajDcxUkbtBfHfQw=; b=Oul3obm++VcsD2rfAgqAzYEaxCYN6VtBOhObtRDAMpj13iS6PE5VLKG0k9f1/KQ+q10gfcOP7aM1kfn3AxGgcOBJsaLwVpbk/BXB74U2PvsECKEKxOch4Cu7hXajiAuPjvJheynqy4M4LRX9qgGusMlA6SIqkpXAqzuK4CFWJew= 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 1663162290188910.6337583877375; Wed, 14 Sep 2022 06:31:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-1-CV0e1Cy4OhGcxhnRzoFTDA-1; Wed, 14 Sep 2022 09:31:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B751A3C11986; Wed, 14 Sep 2022 13:31:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09F372166B26; Wed, 14 Sep 2022 13:31:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 799FE1946A4E; Wed, 14 Sep 2022 13:31:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1B1071946A4A for ; Wed, 14 Sep 2022 13:31:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E479F49BB61; Wed, 14 Sep 2022 13:31:14 +0000 (UTC) Received: from maggie.theccd.local (unknown [10.40.196.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66FC149BB60 for ; Wed, 14 Sep 2022 13:31:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663162288; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C75c5s5oDUHQJqD1OxkkluT2qEQjajDcxUkbtBfHfQw=; b=F2pIZLTRbAjGb+/a4JwbnaqPsLq55z2e+tQA2zXEdE2hjgxQ1kZjgHX2rlaNx51xgVVcbh P6sak1+EMceoKdn+iIsRR8XE8eUFCLlc9W3gdXX7cGnC7XgkBqwrnWQH7k8sDuaDjUCFwA lMGiR/JqsUkiicBhK1M8Hv83U0dcmXE= X-MC-Unique: CV0e1Cy4OhGcxhnRzoFTDA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] meson: Require libssh-0.8.0 or newer Date: Wed, 14 Sep 2022 15:31:08 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1663162291560100001 Content-Type: text/plain; charset="utf-8"; x-default="true" According to repology.org: RHEL-8: 0.9.4 RHEL-9: 0.9.6 Debian 11: 0.9.5 openSUSE Leap 15.3: 0.8.7 Ubuntu 20.04: 0.9.3 And the rest of distros has something newer anyways. Requiring 0.8.0 or newer allows us to drop the terrible hack where we rename functions at meson level using #define. Note, 0.8.0 is the version of libssh where the rename happened. Signed-off-by: Michal Privoznik --- libvirt.spec.in | 2 +- meson.build | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b199c624b8..a46389c78f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -378,7 +378,7 @@ BuildRequires: wireshark-devel %endif =20 %if %{with_libssh} -BuildRequires: libssh-devel >=3D 0.7.0 +BuildRequires: libssh-devel >=3D 0.8.0 %endif =20 BuildRequires: rpcgen diff --git a/meson.build b/meson.build index ed9f4b3f70..11490b8980 100644 --- a/meson.build +++ b/meson.build @@ -1025,24 +1025,11 @@ else libpcap_dep =3D dependency('', required: false) endif =20 -libssh_version =3D '0.7' +libssh_version =3D '0.8.0' if conf.has('WITH_REMOTE') libssh_dep =3D dependency('libssh', version: '>=3D' + libssh_version, re= quired: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) - - # Check if new functions exists, if not redefine them with old depreca= ted ones. - # List of [ new_function, deprecated_function ]. - functions =3D [ - [ 'ssh_get_server_publickey', 'ssh_get_publickey' ], - [ 'ssh_session_is_known_server', 'ssh_is_server_known' ], - [ 'ssh_session_update_known_hosts', 'ssh_write_knownhost' ], - ] - foreach name : functions - if not cc.has_function(name[0], dependencies: libssh_dep) - conf.set(name[0], name[1]) - endif - endforeach endif else libssh_dep =3D dependency('', required: false) --=20 2.35.1