From patchwork Wed Mar 28 08:38:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 892017 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.137; helo=fraxinus.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="Mg2goaLN"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40B1WF64Fxz9s0R for ; Wed, 28 Mar 2018 19:38:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8E545869C8; Wed, 28 Mar 2018 08:38:47 +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 DyRvzViTVg48; Wed, 28 Mar 2018 08:38:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 29526866E9; Wed, 28 Mar 2018 08:38:45 +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 1B4221CEB50 for ; Wed, 28 Mar 2018 08:38:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 185C687F36 for ; Wed, 28 Mar 2018 08:38:44 +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 GggCHJWWI-3v for ; Wed, 28 Mar 2018 08:38:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id F4161826EF for ; Wed, 28 Mar 2018 08:38:41 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id p9so3304298wmc.3 for ; Wed, 28 Mar 2018 01:38:41 -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=E+wCwYcatbmwjSDbJ+egq4B2wvNLL2HRpOZAMzn7vE4=; b=Mg2goaLNs8M25b29wB/9aGmcOAVbY9p5Mw0zvR80R1YKMlWKVlZ0qCjC+PzGbXjOCa /N2wYbeSzRXcr7f9H63sTp6sRYj5n/tCUcIt7C+WYql5KswvlMe+pcpNGgZGSxfqy7QI qEFFGtcwanaK6kxJYMm1n2KDoJPVIJwOB0peQl9Y6FmII0t4Y7NDXJ2rmwFZpZzxXOXA K0Cv2O9rdOpeiBgZMhMI1gbdVENc3Gzr0EP4fK79p+giqkmK+8TBy+stqaxvgB/e6DY0 TgA8Zk7ZpFyXGPGQ+2ZnCtH5/wpzfnXFMxSiV3CkbHmebMThzQ4zsa7ntE6zjyMefqVo gsqA== 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=E+wCwYcatbmwjSDbJ+egq4B2wvNLL2HRpOZAMzn7vE4=; b=hT95jUvDU48JqD/eD+cCq/GkWjEUmMDTo3w6UxZb8qStMX/JkMy5lwxY55rkZAxpLn E36cLjMbVSSBjxaG3lTOhVqnsZz/fCf/qfFiRhDOAD5s5jez0w1KA8lzhXVC52U3ZIeX 5oQqnVaboAYbwXMqFxpOUvZADAkUHbXTLLlbQmKLWd44QBFuZaym38czYaFQERBO/GJk yN79z6ddxxmRSYRi6dWL2z80Zro8iGYyydWdaRNAF/L7BuhPbr1QTkffcao/xqWgbqE6 NEbvtZJ0Vhni5cTyAaPE06AlIcvfSdF+fCAWf4WghheyLXAWiTRBuEQ673YMLQuwer3d m3mg== X-Gm-Message-State: AElRT7Gve752vGr8p7aPz70OUKm3uPe5pWcPv/lyHcIJ2d865qkl0UJV gRhovz4t2HKbGkXynaHOdlhHCw== X-Google-Smtp-Source: AIpwx49Nl5q4eHPwvPqXFTtB+DJgRD+UTzazQ394OjW8qX4VDNT21SlCLF9EKcFFQpygivdgNwWUpw== X-Received: by 10.28.14.70 with SMTP id 67mr2004311wmo.17.1522226320251; Wed, 28 Mar 2018 01:38:40 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id i3sm587998wmf.0.2018.03.28.01.38.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 01:38:39 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 28 Mar 2018 10:38:26 +0200 Message-Id: <20180328083827.31540-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [V4 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 | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 18 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..25859a382 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 @@ -12,6 +12,8 @@ DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH + ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) # Build dbclient, and create a convenience symlink named ssh DROPBEAR_PROGRAMS += dbclient @@ -23,32 +25,28 @@ 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 +define DROPBEAR_SVR_PASSWORD_AUTH + echo '#if !HAVE_CRYPT' >> $(@D)/localoptions.h + echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> $(@D)/localoptions.h + echo '#endif' >> $(@D)/localoptions.h endef -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH - define DROPBEAR_ENABLE_REVERSE_DNS - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h -endef - -define DROPBEAR_BUILD_SMALL - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h + echo '#define DO_HOST_LOOKUP 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_SMALL_CODE 0' >> $(@D)/localoptions.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 @@ -73,7 +71,6 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL DROPBEAR_CONF_OPTS += --disable-zlib else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED From patchwork Wed Mar 28 08:38:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 892018 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="lDsI441p"; 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 40B1WM5nJLz9s0b for ; Wed, 28 Mar 2018 19:38:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id ED9B189746; Wed, 28 Mar 2018 08:38:50 +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 2a+W1NBIPIJ2; Wed, 28 Mar 2018 08:38:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CEEBF8968B; Wed, 28 Mar 2018 08:38:48 +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 747701CEB50 for ; Wed, 28 Mar 2018 08:38:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 714AF826EF for ; Wed, 28 Mar 2018 08:38:44 +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 k01V2+aX8wuZ for ; Wed, 28 Mar 2018 08:38:43 +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 1B4E987F34 for ; Wed, 28 Mar 2018 08:38:43 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id o8so1426375wra.1 for ; Wed, 28 Mar 2018 01:38:43 -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=sP8oRk2s4BQLTVG5PEJtn4nX6skX3i/ncMDSRUOBaDw=; b=lDsI441pklpvUDETkLTbcg1nh1r1lovZxbXE5TKURQCw5hH+KofH1MHG21QqEE+lHk V7A+NbNb9RIgMLVL/EZJZlW7wVIxxDonL3BBx/HhUa4vkcIRK5hOGEBbnF9clIACg1bE Yxi+Z2Y/QnThnnDOVya0vXkZF5z051pgVU906ZeSqL1nPXb9h9NePUl3Ue9IQ8dPLf57 dKez1aZeMnEYYJfaOItAQ3KyChtGR2k7+G0qP0zVWW4idncJ8j5Kq9yOYtzy+GsnlGXo KfaSazI7R4raOQKwdfMeHnF8qrSHEnUwnOxj4or01wOz/GRhm6IQTXMh1AqGWNmoKH1b m+0Q== 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=sP8oRk2s4BQLTVG5PEJtn4nX6skX3i/ncMDSRUOBaDw=; b=Mlm/a8Im/Dyf2r2V1pI8V+VBm6cdukLjnwmcCG5bm5fgpcIoYiRhq8b3wmv6xW+2TQ U5wYLle+hHsVwtiZJKGtcNb4+e9tpqA1Yo1hXzXRYK3H4vTC0gKQopySo/GFqyZlscql MnzB8LAk3nawDDtC0Kqurz3Gl9RO3Y99ETv7X1boW5w88T7v38K+My2kiyteuu1pXVZ1 3VTHMDeme58WzD4oWSAIVPN1117RcAhDlSK3gPHmHB4/Hl0Y3j41zpUtO4/C98+eLAqh NE0Lc92a4VjKDsSGUoBd+tsgv12GISfWixPcdlNcda3UVD7gasotJu4lBCHHF7kA20ni rKgQ== X-Gm-Message-State: AElRT7FbwJfafChzozUJW2sPLO0YEQj+6a3Xik5sSgEB+jmVj9LLjxQd 6ky1+Kw4qNlgQUAFZzvmetwSng== X-Google-Smtp-Source: AIpwx4/Wp9oeWK7p+5XfbCbuK7OvDYuO08JLtnT/mz0TD4nuTLsR102n0fgHxzCNkZDsbQ+3X87dxg== X-Received: by 10.223.160.4 with SMTP id k4mr2234077wrk.259.1522226321496; Wed, 28 Mar 2018 01:38:41 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id i3sm587998wmf.0.2018.03.28.01.38.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 01:38:40 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 28 Mar 2018 10:38:27 +0200 Message-Id: <20180328083827.31540-2-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180328083827.31540-1-francois.perrad@gadz.org> References: <20180328083827.31540-1-francois.perrad@gadz.org> Subject: [Buildroot] [V4 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" DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt Signed-off-by: Francois Perrad --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 670077816..5d6b83b6d 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 if !BR2_PACKAGE_DROPBEAR_SMALL help A small SSH 2 server designed for small memory environments. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 25859a382..fa6ee8bd0 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -71,10 +71,11 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) -DROPBEAR_CONF_OPTS += --disable-zlib +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED -DROPBEAR_DEPENDENCIES += zlib +DROPBEAR_DEPENDENCIES += zlib libtomcrypt +DROPBEAR_CONF_OPTS += --disable-bundled-libtom endif ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)