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)