From nobody Fri Apr 19 00:46:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565785245; cv=none; d=zoho.com; s=zohoarc; b=kNXNji3b5p3Wy3cT3AK/EPcdykRSJSpDM/6KkhVDNLA07sAes6C0qo7F6Lgw9vjleVWgLGQoy7a26W2Of9+U75DdCV5Z08B+1XOrQd16RRGMxHqVR893hfTpefU7f0WJ+r9Z5Kj2hBj/qRmDKSxT94qVhOW+EPxzrfE1aYT+e7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565785245; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=yVAaekXN6bu12IC6uA69WbHHndwex2sP2Vfkhkeg6eo=; b=i78/UyYV3fiWwVUSEnlH8ppD9mtfHHDHZm5mMggsQ2OCDQ3insg95rAqvJRpziIYZJGHohlGTAiokmqC/ZDG8NHRBmvC9Hq8KMaujHjXrZG4k+kmYmugtwDvzmieLZ4bFuObjt7nPpAr7poHDoBGt47PtdRXKT/xEaq9iGS801c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565785245561145.46891815510423; Wed, 14 Aug 2019 05:20:45 -0700 (PDT) Received: from localhost ([::1]:60076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsGg-0004GS-KJ for importer@patchew.org; Wed, 14 Aug 2019 08:20:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42695) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC4-0000FF-Q9 for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC3-0001gt-Ae for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsBr-0001cK-1T; Wed, 14 Aug 2019 08:15:45 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 3FD2D300BEA8; Wed, 14 Aug 2019 12:15:41 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-203.brq.redhat.com [10.40.204.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9EFB83093; Wed, 14 Aug 2019 12:15:37 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Richard W . M . Jones" , qemu-devel@nongnu.org, Pino Toscano Date: Wed, 14 Aug 2019 14:15:24 +0200 Message-Id: <20190814121527.17876-2-philmd@redhat.com> In-Reply-To: <20190814121527.17876-1-philmd@redhat.com> References: <20190814121527.17876-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 14 Aug 2019 12:15:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 1/4] configure: Improve libssh check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Max Reitz , =?UTF-8?q?=E5=91=A8=E6=96=87=E9=9D=92?= <1151451036@qq.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The libssh pkg-config is not complete, the libraries required to link with libssh are not returned. For example on Ubuntu 18.04: $ dpkg -l|fgrep libssh ii libssh-4:arm64 0.8.0~20170825.94fa1e38-1ubuntu0.2 arm64 tiny C SSH lib= rary (OpenSSL flavor) ii libssh-dev 0.8.0~20170825.94fa1e38-1ubuntu0.2 arm64 tiny C SSH library= . Development files (OpenSSL flavor) $ pkg-config libssh --libs -lssh Since the ./configure script tries to link an object to figure if libssh is available, it fails: $ cat config.log [...] cc -pthread -I/usr/include/glib-2.0 [...] -o config-temp/qemu-conf.exe co= nfig-temp/qemu-conf.c -m64 -static -g -lssh /usr/lib/gcc/x86_64-linux-gnu/7/../../../x86_64-linux-gnu/libssh.a(dh.c.o= ): In function `ssh_crypto_init': (.text+0x1a9): undefined reference to `BN_new' (.text+0x1c2): undefined reference to `BN_set_word' (.text+0x1c7): undefined reference to `BN_new' (.text+0x1e7): undefined reference to `BN_bin2bn' (.text+0x1ec): undefined reference to `BN_new' (.text+0x20c): undefined reference to `BN_bin2bn' (.text+0x218): undefined reference to `OPENSSL_init_crypto' [...] collect2: error: ld returned 1 exit status To bypass this check, simply compile an object using libssh headers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Should we check for libcrypto? $ pkg-config --libs libssh openssl -lssh -lssl -lcrypto --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 714e7fb6a1..1d5c07de1f 100755 --- a/configure +++ b/configure @@ -3951,7 +3951,7 @@ if test "$libssh" =3D "yes"; then #include int main(void) { return ssh_get_server_publickey(NULL, NULL); } EOF - if compile_prog "$libssh_cflags" "$libssh_libs"; then + if compile_object "$libssh_cflags"; then libssh_cflags=3D"-DHAVE_LIBSSH_0_8 $libssh_cflags" fi fi --=20 2.20.1 From nobody Fri Apr 19 00:46:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565785149; cv=none; d=zoho.com; s=zohoarc; b=Rg0GOWCRdDxd5BRtimUzHnsqBaLfpEFiIYbGAoCjlxRNkDcU4sj+gDr8I2R2EiOB0G9F2HcCAo1HBoIufi27DoOJl6RDTPrTXlED9VTCMu5BF2JSbc0d/N/AxJRhRGqwvXORkHoLfoWP2ZswsZ7C49PuTiRnB1WZZZF60/tND2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565785149; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=6X6jMmSuZvofHElY14wR48R8ZFAUG0BHJ5lPyqMCPFk=; b=mVrPm0DW9j+1vMZA+KXHnzaOCsM3VThR/hq8FCbev3hiEQqYSmtZUjenaI9bPcSctadDuhZ2QmH51nyLKjgBbRO8e1rPoAJorpSGTYaakQGIP9CXnX0nUB1OWKf0BKD74nJc+OC58j6/zowVjuS+17DMJ/qTYNpu6gvvfi4pwmM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565785149610142.34704806427123; Wed, 14 Aug 2019 05:19:09 -0700 (PDT) Received: from localhost ([::1]:60062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsF3-000208-PO for importer@patchew.org; Wed, 14 Aug 2019 08:19:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42702) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC5-0000Fd-3E for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC4-0001hH-1j for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsBz-0001dV-Oy; Wed, 14 Aug 2019 08:15:53 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 10B0E31752A2; Wed, 14 Aug 2019 12:15:45 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-203.brq.redhat.com [10.40.204.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA5848309C; Wed, 14 Aug 2019 12:15:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Richard W . M . Jones" , qemu-devel@nongnu.org, Pino Toscano Date: Wed, 14 Aug 2019 14:15:25 +0200 Message-Id: <20190814121527.17876-3-philmd@redhat.com> In-Reply-To: <20190814121527.17876-1-philmd@redhat.com> References: <20190814121527.17876-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 14 Aug 2019 12:15:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] configure: Avoid using libssh deprecated API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Andrea Bolognani , Max Reitz , =?UTF-8?q?=E5=91=A8=E6=96=87=E9=9D=92?= <1151451036@qq.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The libssh packaged by a distribution can predate version 0.8, but still provides the newer API introduced after version 0.7. Using the deprecated API leads to build failure, as on Ubuntu 18.04: CC block/ssh.o block/ssh.c: In function 'check_host_key_hash': block/ssh.c:444:5: error: 'ssh_get_publickey' is deprecated [-Werror=3Dde= precated-declarations] r =3D ssh_get_publickey(s->session, &pubkey); ^ In file included from block/ssh.c:27:0: /usr/include/libssh/libssh.h:489:31: note: declared here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh= _key *key); ^~~~~~~~~~~~~~~~~ rules.mak:69: recipe for target 'block/ssh.o' failed make: *** [block/ssh.o] Error 1 Fix by using the newer API if available. Suggested-by: Andrea Bolognani Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/ssh.c | 2 +- configure | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/block/ssh.c b/block/ssh.c index 501933b855..f5fea921c6 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -438,7 +438,7 @@ check_host_key_hash(BDRVSSHState *s, const char *hash, unsigned char *server_hash; size_t server_hash_len; =20 -#ifdef HAVE_LIBSSH_0_8 +#ifdef HAVE_SSH_GET_SERVER_PUBLICKEY r =3D ssh_get_server_publickey(s->session, &pubkey); #else r =3D ssh_get_publickey(s->session, &pubkey); diff --git a/configure b/configure index 1d5c07de1f..fe3fef9309 100755 --- a/configure +++ b/configure @@ -3949,11 +3949,18 @@ fi if test "$libssh" =3D "yes"; then cat > $TMPC < +#ifdef HAVE_SSH_GET_SERVER_PUBLICKEY int main(void) { return ssh_get_server_publickey(NULL, NULL); } +#else +int main(void) { return ssh_get_publickey(NULL, NULL); } +#endif EOF if compile_object "$libssh_cflags"; then libssh_cflags=3D"-DHAVE_LIBSSH_0_8 $libssh_cflags" fi + if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then + libssh_cflags=3D"-DHAVE_SSH_GET_SERVER_PUBLICKEY $libssh_cflags" + fi fi =20 ########################################## --=20 2.20.1 From nobody Fri Apr 19 00:46:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565785147; cv=none; d=zoho.com; s=zohoarc; b=KXsmH+ko8QsSm/blGgQOqOOBs3EZZaeqrr0Iy5C9AHTN5RdaTC2j+7hyc9RtX/UdA8PxexNPI6xAizce6lNi7FR1qXBRv7db0jydHlcB7uSGIhyRQTGBWMawAlhAjT4GP/qtNju3QDSrCpB5D0f+wx5fpeYzxxLxvAijJ9BSdEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565785147; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=DARXn7D14G6hf1/uxqN4gnYjibC2PNJLpcfsqs2UVlA=; b=mnUapeEGcQoC6VFkd/0ozEuywM/52HozH6O3GaCibn1IciX4QudLwzxBvtI6rWY0Ymu0zSB58ZlcdCsSQfoomMF5sfGOrz9HeGoXkTlmaHggYxxQhrE8gv84bCkvNPhq38FfDsF3eMrBxpSFkCXHx94WDea8NOMW0K5OPQG7Xr0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565785147103889.8308329002352; Wed, 14 Aug 2019 05:19:07 -0700 (PDT) Received: from localhost ([::1]:60064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsF4-00024D-Eh for importer@patchew.org; Wed, 14 Aug 2019 08:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42720) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC5-0000Gt-Vn for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC4-0001he-Kq for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36656) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsBz-0001eE-Pv; Wed, 14 Aug 2019 08:15:53 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 7E5708EB34; Wed, 14 Aug 2019 12:15:48 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-203.brq.redhat.com [10.40.204.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AEAE01B2F5; Wed, 14 Aug 2019 12:15:45 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Richard W . M . Jones" , qemu-devel@nongnu.org, Pino Toscano Date: Wed, 14 Aug 2019 14:15:26 +0200 Message-Id: <20190814121527.17876-4-philmd@redhat.com> In-Reply-To: <20190814121527.17876-1-philmd@redhat.com> References: <20190814121527.17876-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 14 Aug 2019 12:15:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] configure: Improve checking libssh version is 0.8 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Max Reitz , =?UTF-8?q?=E5=91=A8=E6=96=87=E9=9D=92?= <1151451036@qq.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" To figure out which libssh version is installed, checking for ssh_get_server_publickey() is not sufficient. ssh_get_server_publickey() has been introduced in libssh commit bbd052202 (predating 0.8) but distributions also backported other pre-0.8 patches, such libssh commit 963c46e4f which introduce the ssh_known_hosts_e enum. Check the enum is available to assume the version is 0.8. This fixes build failure on Ubuntu 18.04: CC block/ssh.o block/ssh.c: In function 'check_host_key_knownhosts': block/ssh.c:281:28: error: storage size of 'state' isn't known enum ssh_known_hosts_e state; ^~~~~ rules.mak:69: recipe for target 'block/ssh.o' failed make: *** [block/ssh.o] Error 1 Reported-by: =E5=91=A8=E6=96=87=E9=9D=92 <1151451036@qq.com> Fixes: https://bugs.launchpad.net/qemu/+bug/1838763 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index fe3fef9309..040aa8eb6c 100755 --- a/configure +++ b/configure @@ -3949,18 +3949,24 @@ fi if test "$libssh" =3D "yes"; then cat > $TMPC < +#ifdef HAVE_LIBSSH_0_8 +static const enum ssh_known_hosts_e val =3D SSH_KNOWN_HOSTS_OK; +#endif #ifdef HAVE_SSH_GET_SERVER_PUBLICKEY int main(void) { return ssh_get_server_publickey(NULL, NULL); } #else int main(void) { return ssh_get_publickey(NULL, NULL); } #endif EOF - if compile_object "$libssh_cflags"; then + if compile_object "$libssh_cflags -DHAVE_LIBSSH_0_8"; then libssh_cflags=3D"-DHAVE_LIBSSH_0_8 $libssh_cflags" fi if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then libssh_cflags=3D"-DHAVE_SSH_GET_SERVER_PUBLICKEY $libssh_cflags" fi + if ! compile_object "$libssh_cflags"; then + error_exit "cannot use with libssh (is it broken?)" + fi fi =20 ########################################## --=20 2.20.1 From nobody Fri Apr 19 00:46:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565785244; cv=none; d=zoho.com; s=zohoarc; b=ep6q/i+xLzh0b8ShjmTKo07G4E8Zwnb/SvZ5Nkksk1n0Hjj+FmVkJKkExBQQfWHYPH+dQ9oTMSKPHZ5o2yh8t6mNciW82Fhz0l3guxUnI40X1hLpblMIU0QxKOX4x5+4OTMXuQerKb3EMKf3ciZvu9OlURHR7mAxlPDYGfeBw48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565785244; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=aNVEKKqKjZspeGfqH14e7wDtakIWYxRkMiD38euTQY0=; b=g+JINhhxhOOwQ6Ib/cjCNIMNL7bea4wbYe+YbzeSetaklKxm9Oe765EeeU5LQy4GQeaBmUTFdo0KgxpNkCE7chECjMNV4SFX3CmBPt7EvyzFk2YrJkP6bwhZlthvR3eBlW2gMmfBg7Lv9nIeDDc62GL+kBR0jyd9CiqPnHWQtr0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565785244583496.1499683562994; Wed, 14 Aug 2019 05:20:44 -0700 (PDT) Received: from localhost ([::1]:60078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsGh-0004IA-AM for importer@patchew.org; Wed, 14 Aug 2019 08:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42706) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxsC5-0000Fx-9t for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxsC4-0001hQ-BK for qemu-devel@nongnu.org; Wed, 14 Aug 2019 08:15:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15479) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxsC1-0001fJ-Rq; Wed, 14 Aug 2019 08:15:53 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 094BF2A09AC; Wed, 14 Aug 2019 12:15:52 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-203.brq.redhat.com [10.40.204.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7AD21B2F5; Wed, 14 Aug 2019 12:15:48 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Richard W . M . Jones" , qemu-devel@nongnu.org, Pino Toscano Date: Wed, 14 Aug 2019 14:15:27 +0200 Message-Id: <20190814121527.17876-5-philmd@redhat.com> In-Reply-To: <20190814121527.17876-1-philmd@redhat.com> References: <20190814121527.17876-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 14 Aug 2019 12:15:52 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] configure: Log the libssh version detected X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Max Reitz , =?UTF-8?q?=E5=91=A8=E6=96=87=E9=9D=92?= <1151451036@qq.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Log wether the version is 0.7 or 0.8 to better understand user reports. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Richard W.M. Jones --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 040aa8eb6c..d06cee0ba0 100755 --- a/configure +++ b/configure @@ -3930,6 +3930,7 @@ if test "$libssh" !=3D "no" ; then if $pkg_config --exists libssh; then libssh_cflags=3D$($pkg_config libssh --cflags) libssh_libs=3D$($pkg_config libssh --libs) + libssh_version=3D$($pkg_config libssh --modversion) libssh=3Dyes else if test "$libssh" =3D "yes" ; then @@ -3960,6 +3961,9 @@ int main(void) { return ssh_get_publickey(NULL, NULL)= ; } EOF if compile_object "$libssh_cflags -DHAVE_LIBSSH_0_8"; then libssh_cflags=3D"-DHAVE_LIBSSH_0_8 $libssh_cflags" + else + # If this is not libssh 0.8, this is likely 0.7 + libssh_version=3D"0.7" fi if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then libssh_cflags=3D"-DHAVE_SSH_GET_SERVER_PUBLICKEY $libssh_cflags" @@ -6466,7 +6470,7 @@ echo "GlusterFS support $glusterfs" echo "gcov $gcov_tool" echo "gcov enabled $gcov" echo "TPM support $tpm" -echo "libssh support $libssh" +echo "libssh support $libssh $(echo_version $libssh $libssh_version)" echo "QOM debugging $qom_cast_debug" echo "Live block migration $live_block_migration" echo "lzo support $lzo" --=20 2.20.1