From patchwork Tue Mar 20 19:56:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 888406 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="e9uLWpGj"; 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 405Nxk18R7z9s16 for ; Wed, 21 Mar 2018 06:57:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2B346882EF; Tue, 20 Mar 2018 19:57:08 +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 zC3O76YvPWe3; Tue, 20 Mar 2018 19:57:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9627D882BF; Tue, 20 Mar 2018 19:57:05 +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 F3C5C1C14DB for ; Tue, 20 Mar 2018 19:57:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EFBD0891FA for ; Tue, 20 Mar 2018 19:57:03 +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 EYV86N07+h1G for ; Tue, 20 Mar 2018 19:57:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1602F891E0 for ; Tue, 20 Mar 2018 19:57:02 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f125so5806253wme.4 for ; Tue, 20 Mar 2018 12:57:02 -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=gYXrr2hs8GOrl9WqexnuhiSZ+2OquXOoEaWYqnponj0=; b=e9uLWpGj9NJKBcBgEEPUaI3LrMZ+ZWK9EYsHDivvW/aPOa0SZV8cv8eSJfqBhJcrDy nqx7GoP6H61/rgEvKNBzbA4vdTB29zpPQTRxibEd+6YjlIoajD2LG43LFM4vFVCngOPR 7zRgjc9cedJAltetBg/AkmwkV/b1M8SEkc4zNaZJtXgjKLlFXzK/ke297DDrAqorJjeQ aBVJQA2GY27Pef25UBT4zoHMyRnJSoCsj/luuz6q5FOOwRdJ8pNBSmhJ3TozddAhjATn hf7xzhrM3LYQcFEFBFhWhrDw6dgiFAh5k6gW8Bef5mlU0mg6p3+pf1KeNitbE7igdWYv SQcA== 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=gYXrr2hs8GOrl9WqexnuhiSZ+2OquXOoEaWYqnponj0=; b=GKvutwaEwZGx2+zeVqjOHfYL5saeTReESW4nZ95ybsYSmtPNIvB9bCUaAUrJcnQoTg Nu/ZjyHRuGBcMX9eNp3dsLTltDbGDvFuih5l6EYpPubsKUjbQm06MCcfqZL14jYyvskj f4E9SL6Xv/WAZO0m9v1oTrVyuaKUUfHtpvPafyGdSR8IM+wb0gFfh/lOc1S0CnZNWnIF /e5hOM+5wjDy6hzH4/Vc9l+KePRXijtDccf1NIGYRBe2H2NFbLSSodLwv+QnZXWM1Veh PeOAyRQflbqcC0yFZGf/xZGPoQU4/9wB3VIwisNjE3Ejy18g2cNsNN/bTU7uvcIBaOmW IeYQ== X-Gm-Message-State: AElRT7EmV4uFfaOaZteewvT+DvLS766Y5kQpAVAOrqQCjp4UfoEhIeMx ZKDmq7RpAMdG0itK+hv5/cEWrw== X-Google-Smtp-Source: AG47ELu3NZB57Re9yB9KCCEFfARWYLgtFoeOlhh/COFJFEmW/LYEhEsUBfOMp0iNCOUXJyrwNvTB0Q== X-Received: by 10.28.230.68 with SMTP id d65mr750815wmh.13.1521575820353; Tue, 20 Mar 2018 12:57:00 -0700 (PDT) Received: from localhost.localdomain (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id b81sm2161640wmb.36.2018.03.20.12.56.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 12:56:59 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 20 Mar 2018 20:56:48 +0100 Message-Id: <20180320195649.5309-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [V2 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 Reviewed-by: Baruch Siach --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 24 +++++++++--------------- 2 files changed, 10 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..c6716f90d 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,26 @@ 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_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