From patchwork Sat Jun 6 07:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1304471 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AAhxO/L0; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49f9mX5C50z9sSn for ; Sat, 6 Jun 2020 17:16:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A964C20435; Sat, 6 Jun 2020 07:16:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ypQ38J-T6zY; Sat, 6 Jun 2020 07:16:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0289920419; Sat, 6 Jun 2020 07:16:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A1EA01BF287 for ; Sat, 6 Jun 2020 07:16:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8572720419 for ; Sat, 6 Jun 2020 07:16:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZU61q3N64qLk for ; Sat, 6 Jun 2020 07:16:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by silver.osuosl.org (Postfix) with ESMTPS id 4D95620418 for ; Sat, 6 Jun 2020 07:16:22 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id c71so10343845wmd.5 for ; Sat, 06 Jun 2020 00:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Exk2AEvvhOI5n+CWTwC1uDDKqhOp79vUNmTpOYFmgvI=; b=AAhxO/L0PLsaf3/ovnp8j8isXdMoQdBqGmBvcucnmSivSImcm1bR3s7vcQCuFlUIFn yI6C4m0mt0E30z6qeU6VAA9RMFEYvnakuTQSeMCUYW1Pa/Uw6Mqu00kddEvye0w9+eBY SuESZeuXmlr/alZ+U8bEFcfgARdZnrGGA1c9pNuxVSgPP/Pj/T5mOTjuevUYpmiAxD1d C1P58PNxsoxa8wfZTz0dYX8KAoTyahIMvkmG4Ekys0sKI8Dv7WJ9+kBJmnS3DO9Bns77 4g5rB7EZ1ojTgoRiOeJosgeNNHi21t//GttM7Estgnn0JvWdb/QFETyJok0mCwo9aR8V UB8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Exk2AEvvhOI5n+CWTwC1uDDKqhOp79vUNmTpOYFmgvI=; b=qVVrx0KwxF+CQK4CQDRDv7ZqHkzbmqn4/+piOC6RVBuoU4JdrIGU52kNLMCD58wK71 EOnO/piWInU12lQvrtoYtvGqVxDDvKqP/3Q1ASwq7QMCSM4uQjssJG4iqroqDTV5dPyb W/llzF0+R9aaxF2tPe5oIx0IZvPjsziGQBf9rdigqJ3iePrzyJHBKEAHfU87mUnV25vF iC48XK0TLAGL44Q0o1M2qKgRqBQs47tpwbLI3LZ1eTn6Q9Cw6PMOB0scqoxWQbGVTMHf 3sRnVj9pIMfcbC5QGybQ5wBE4O13a+KRQi6uYl0QrruL8Q1dx2PXrwKAF6SWbQFPwH2s QI+g== X-Gm-Message-State: AOAM530edFp52R81otXVD5zlzAxzQCfAZXFcVuXWtZ/7djnFOuxcf00P lIC+POVhrvOFteXbPeE96g8pPsi3 X-Google-Smtp-Source: ABdhPJyWjpRZcgCM/UVUgNxZd/kyPcMad1UJIppvITfjvlIJf6oRVsCt3pBrZCAo8sAqOmvSC55OXw== X-Received: by 2002:a1c:f312:: with SMTP id q18mr6228013wmq.106.1591427780381; Sat, 06 Jun 2020 00:16:20 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id a126sm14346429wme.28.2020.06.06.00.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 00:16:19 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Sat, 6 Jun 2020 09:16:02 +0200 Message-Id: <20200606071601.6410-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v1 1/1] package/libnetconf2: add patch to fix incompatiblity with libssh X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery , =?utf-8?q?Jan_Kundr=C3=A1t?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The libnetconf2 upstream project rejects building with ssh support for libssh 0.9.3 and 0.9.4 due to an existing regression. This libssh regression bug is already fixed upstream. The libssh buildroot package has the patch (39099153d9404cd6f107f0fd92ce8686bbd1beb2). Thus we can remove the libnetconf2 cmake check. Fixes: http://autobuild.buildroot.net/results/f72fcccafe70ecb6b2ba21e8d19c5827a09ffec7/ Signed-off-by: Heiko Thiery --- ...move-version-check-for-faulty-libssh.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/libnetconf2/0001-CMakeList.txt-remove-version-check-for-faulty-libssh.patch diff --git a/package/libnetconf2/0001-CMakeList.txt-remove-version-check-for-faulty-libssh.patch b/package/libnetconf2/0001-CMakeList.txt-remove-version-check-for-faulty-libssh.patch new file mode 100644 index 0000000000..d1df807626 --- /dev/null +++ b/package/libnetconf2/0001-CMakeList.txt-remove-version-check-for-faulty-libssh.patch @@ -0,0 +1,32 @@ +From ad89283f9ed36f0f1234c7f005edfc34e8b9fd58 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Thu, 4 Jun 2020 15:31:56 +0200 +Subject: [PATCH] CMakeList.txt: remove version check for faulty libssh version + +libssh is fixed by a patch in buildroot so we can drop the libssh +version check for 0.9.3 and 0.9.4. + +See: 39099153d9404cd6f107f0fd92ce8686bbd1beb2 + +Signed-off-by: Heiko Thiery +--- + CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f21fec9..29ef202 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,9 +148,6 @@ endif() + # dependencies - libssh + if(ENABLE_SSH) + find_package(LibSSH 0.7.0 REQUIRED) +- if(LIBSSH_VERSION VERSION_EQUAL 0.9.3 OR LIBSSH_VERSION VERSION_EQUAL 0.9.4) +- message(FATAL_ERROR "LibSSH ${LIBSSH_VERSION} includes regression bugs and libnetconf2 will NOT work properly, try to use another version") +- endif() + + target_link_libraries(netconf2 ${LIBSSH_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LIBRARIES}) +-- +2.20.1 +