From patchwork Thu Oct 26 21:43:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Voss X-Patchwork-Id: 830951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yNL9n5NbVz9t1t for ; Fri, 27 Oct 2017 08:43:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C7A0627161; Thu, 26 Oct 2017 21:43:54 +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 1cWx43Mw4jaE; Thu, 26 Oct 2017 21:43:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 324591FDF5; Thu, 26 Oct 2017 21:43:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 524BB1BF238 for ; Thu, 26 Oct 2017 21:43:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4868A87473 for ; Thu, 26 Oct 2017 21:43:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xCMuw6GFv79m for ; Thu, 26 Oct 2017 21:43:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (smtpimr.rockwellcollins.com [205.175.225.240]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8EB95873EB for ; Thu, 26 Oct 2017 21:43:48 +0000 (UTC) Received: from ofwgwc03.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.225.12]) by secvs01.rockwellcollins.com with ESMTP; 26 Oct 2017 16:43:46 -0500 X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 039A860285; Thu, 26 Oct 2017 16:43:47 -0500 (CDT) From: Sam Voss To: buildroot@buildroot.org Date: Thu, 26 Oct 2017 16:43:45 -0500 Message-Id: <1509054225-19795-2-git-send-email-sam.voss@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1509054225-19795-1-git-send-email-sam.voss@rockwellcollins.com> References: <1509054225-19795-1-git-send-email-sam.voss@rockwellcollins.com> Cc: Sam Voss Subject: [Buildroot] [PATCH v2 2/2] package/libssh2: Update to newest version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update libssh2 to use the newest version from git. This caused a transition from released version number to hash as it has not been version rev'd in over a year (see issue https://github.com/libssh2/libssh2/issues/220 for bump request). This brings in changes to the autoconf to correctly pick the crypto library. Update libssh2.mk to have a preconf hook to call buildconf. This generates the configuration file used by autotools, and is required when pulling source from git instead of a released version. Signed-off-by: Sam Voss ---- [v1->v2] - Use LIBSSH2_AUTORECONF instead of calling explicitly Signed-off-by: Sam Voss --- package/libssh2/libssh2.hash | 3 +-- package/libssh2/libssh2.mk | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index 6b1cced..f0df7a2 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,2 @@ # Locally calculated after checking pgp signature -# https://www.libssh2.org/download/libssh2-1.8.0.tar.gz.asc -sha256 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4 libssh2-1.8.0.tar.gz +sha256 e73d55cd512863aa6423c6e137039e3e1bcbf5ba87f130e7441132c2c78a5425 libssh2-616fd4d1b3e4a55de67c48819fefca83132126b5.tar.gz diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 3978698..c803e0e 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,12 +4,18 @@ # ################################################################################ -LIBSSH2_VERSION = 1.8.0 -LIBSSH2_SITE = http://www.libssh2.org/download +LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5 +LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION)) LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build +LIBSSH2_AUTORECONF = YES + +define LIBSSH2_AUTORECONF_CMDS + cp $(@D)/src/libssh2_config.h.in $(@D)/example/libssh2_config.h.in +endef +LIBSSH2_PRE_CONFIGURE_HOOKS += LIBSSH2_AUTORECONF_CMDS # Dependency is one of mbedtls, libgcrypt or openssl, guaranteed in # Config.in.