From patchwork Sun Mar 18 08:36:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 887350 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.b="cUXLMK7f"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 403syH4BRrz9sTC for ; Sun, 18 Mar 2018 19:37:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A85778A372; Sun, 18 Mar 2018 08:37:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mh97WVXgfS4h; Sun, 18 Mar 2018 08:37:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2EFDA8A2FB; Sun, 18 Mar 2018 08:37:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2CD301C035E for ; Sun, 18 Mar 2018 08:37:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 29A41894A9 for ; Sun, 18 Mar 2018 08:37:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hTKd7a72NtIG for ; Sun, 18 Mar 2018 08:37:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id DAFD3894A7 for ; Sun, 18 Mar 2018 08:37:13 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id z12so15593807wrg.4 for ; Sun, 18 Mar 2018 01:37:13 -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; bh=FE+Gi/TN7O5yT41WEge5p0dA9XXqOxl2wEHJSqDtTqg=; b=cUXLMK7fNPvuY8dRQNNhIZY+4nCtFyAJsN5q9a9qwyxsY/PekAH4wxzxzkEnfqwRWw As12w1h9qYzEJ0h2As02AzEJjWy3lyFXH4ERfD9W8u1mQsXD+EF5uXUpmJ7KJ8at4Pgy /yyNb1UI8JzE8KYtyMreavYzu5yYl5jzmb9L/nARYziJ8aG5Z0YpJJtYIn0DibTqb9GX VEhGy8L2KZ3Nx642x17iEjL3Qf+4Qk/jYRjXIgvJ6xRtCYwIrvYq4SOJmEbyDbIJps+7 6Hzec5SKmoItamprEPQAaTVkfzEwc8GdnCtE0xe9JLhVBCpzjFJsyIP/JzG7r3gbr+kD 9FtA== 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; bh=FE+Gi/TN7O5yT41WEge5p0dA9XXqOxl2wEHJSqDtTqg=; b=CbMnhHJu4SlY/1P2AmMM4Uyf85/r6Nt4Vvvo/X8cqGajHv/8v9ehPtQ7RELGOIkGQX 12wWXBMOKty26i35dJ2rXFoj13G2/RT5BcTx8O/j9cagDFrIPjNElJB/FeXgLwXUkbjZ BIhlVLN3pK45mjtZyDazr/woTM0i/7t7aPX0KTwgk68n1z5y0h3D01UcbU3kQL2RbTki ll7uPr0SoOWthyEHCuSgTgopIu40AJ3BEtDitDCKARhc3amWdOe7Yzo3TJo7kiAy4sYA yt54uZuQlwmPHgOTuF2JLw4OSC5rN2ZI0XH6fh1NnA2uVZjuDA560BDwejmQftz+e2WX T4HA== X-Gm-Message-State: AElRT7HfGspxgtZrBa132RGt14gsB6V1/KhFW3HygWBpklNLNAB/fNYA VS1uhQl4xpOkQaUALQmZlnMiIg== X-Google-Smtp-Source: AG47ELudmp6OkBpYZXDH+hBBnjYiTepqniKE5Xb5tyRw/XfH4/yAYdHD0+pCmsI9152+0R0jwH88ig== X-Received: by 10.223.129.13 with SMTP id 13mr1785093wrm.20.1521362231967; Sun, 18 Mar 2018 01:37:11 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id r71sm12412857wmd.48.2018.03.18.01.37.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 01:37:11 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 18 Mar 2018 09:36:58 +0100 Message-Id: <20180318083659.3512-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH 1/2] dropbear: bump to version 2018.76 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 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" with this new version: - "configure --enable-static" should now be used instead of "make STATIC=1" - any customised options should be put in localoptions.h Signed-off-by: Francois Perrad --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 98776e717..ef2011d90 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,2 +1,2 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2 +sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2 diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 01a1a07b7..05b6bb4d4 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2017.75 +DROPBEAR_VERSION = 2018.76 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause @@ -23,32 +23,25 @@ DROPBEAR_MAKE = \ PROGRAMS="$(DROPBEAR_PROGRAMS)" ifeq ($(BR2_STATIC_LIBS),y) -DROPBEAR_MAKE += STATIC=1 +DROPBEAR_CONF_OPTS += --enable-static endif -define DROPBEAR_FIX_XAUTH - $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h -endef - -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH - define DROPBEAR_ENABLE_REVERSE_DNS - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h + echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h endef define DROPBEAR_BUILD_SMALL - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h + echo '#define DROPBEAR_SMALL_CODE 1' >> $(@D)/localoptions.h endef define DROPBEAR_BUILD_FEATURED - $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h + echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h endef define DROPBEAR_DISABLE_STANDALONE - $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h + echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h endef define DROPBEAR_INSTALL_INIT_SYSTEMD From patchwork Sun Mar 18 08:36:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 887351 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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=) 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.b="BahFNvUT"; dkim-atps=neutral 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 403syD4fsYz9sT2 for ; Sun, 18 Mar 2018 19:37:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 31F4922D68; Sun, 18 Mar 2018 08:37:20 +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 JjeSl3jMkt8U; Sun, 18 Mar 2018 08:37:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9316822D6F; Sun, 18 Mar 2018 08:37:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B4C5A1C035E for ; Sun, 18 Mar 2018 08:37:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B13FA894AB for ; Sun, 18 Mar 2018 08:37:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fgicrmRN07xG for ; Sun, 18 Mar 2018 08:37:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id CE4E5894A9 for ; Sun, 18 Mar 2018 08:37:14 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id z73so11300447wrb.0 for ; Sun, 18 Mar 2018 01:37:14 -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:in-reply-to:references; bh=jCu+/ea5BFNvLrHhu7EgMo0n0OVC5jkIH0BE65z5qUs=; b=BahFNvUTcVWx9dEObIsLTL1cQlPiIji8NTEFVSdE2T4mHMvDpS5tmJzhBUTV1HRvsG irIPt9nB3TPS9Z8wE7c/lomJ6/v3xVWKpXPAKjT7Uo3JfDQF375c1zwgwoGj9ZgOcd18 YD/hxlI9yxZ6k2TvbSh+cMwTXJ1oFxCZzYYQuX5mueC9/5/pJIT7y4VAaQEoT+/b515w GMJx78JidK6zC+WGfohotslP/uyk5MgjZ6SI4vwETrLbp5gEY+lm4x4dh5TWd+dUJ2Ka 3XAaKx+iZu0Le8EVbmDgV2gK7oWm0GfQBiGhtpIxVO/q6KaRmbTXyE49n2IQ3P/02dfh coBQ== 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:in-reply-to :references; bh=jCu+/ea5BFNvLrHhu7EgMo0n0OVC5jkIH0BE65z5qUs=; b=rnaY+mUKW2MAJLk4gp2Dpi6M3TjXg25/7C8/RVgfRY7VfG+fVTwjJP2taw6e+V1xqL dqSDJz15BpN9M/9fsH3cbpT2zl4Q6X4bSycCbuIjCPT9RqSjS12NZ6R9wYIpkoyAdTnb vqyuszzsnK06DNnO7z8jr+WTULlTpbP7VQtlqdRzlWxksUec2tc/ywHmM4cf+qNOoqtH 3ttjGk6tkDQlaVpYO+DaSJt3T1Dp6X+S/d/PVbF8DbqJXEcOVLvPi/mSexpCroaE+VvB xMqDs41HWk7B3ODzg4+9m4/phFrgVi0O/eLz4X7NXl3ISCcoZuKxCiyhNW98UqQTNwEu ZQOQ== X-Gm-Message-State: AElRT7FpE98Wzoi1XioLfSSDktT4kbPtS7RNS7wgzW+BU9ULBsbaqmhZ LnbbPea7PXzMNX3K2Aqhcj+rig== X-Google-Smtp-Source: AG47ELs7aOzhLG/V0acFo2/zwb4z1vAH+QT+IVeeNBmY291wq8r86JYxwfDt2ohOT5EYmOFoaojmYQ== X-Received: by 10.223.184.219 with SMTP id c27mr6744310wrg.30.1521362233059; Sun, 18 Mar 2018 01:37:13 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id r71sm12412857wmd.48.2018.03.18.01.37.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 01:37:12 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 18 Mar 2018 09:36:59 +0100 Message-Id: <20180318083659.3512-2-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180318083659.3512-1-francois.perrad@gadz.org> References: <20180318083659.3512-1-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 2/2] dropbear: unbundle libtomath & libtomcrypt X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 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" Signed-off-by: Francois Perrad --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 670077816..3fa8473e4 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DROPBEAR bool "dropbear" select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL + select BR2_PACKAGE_LIBTOMCRYPT help A small SSH 2 server designed for small memory environments. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 05b6bb4d4..ce658bc16 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -9,6 +9,8 @@ DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause DROPBEAR_LICENSE_FILES = LICENSE +DROPBEAR_DEPENDENCIES = libtomcrypt +DROPBEAR_CONF_OPTS = --disable-bundled-libtom DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)