From patchwork Tue Apr 5 17:18:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 606585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qfbDn0VJ1z9t3Z for ; Wed, 6 Apr 2016 03:19:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=1DW5579a; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5AEB48B16D; Tue, 5 Apr 2016 17:19:04 +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 LjRl05U7mcYr; Tue, 5 Apr 2016 17:19:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 461A086E97; Tue, 5 Apr 2016 17:19:01 +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 7979C1C11B8 for ; Tue, 5 Apr 2016 17:18:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 74A1687A9D for ; Tue, 5 Apr 2016 17:18:58 +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 uIHI8QNrcENd for ; Tue, 5 Apr 2016 17:18:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4752A81ED6 for ; Tue, 5 Apr 2016 17:18:56 +0000 (UTC) Received: by mail-wm0-f50.google.com with SMTP id 191so31731342wmq.0 for ; Tue, 05 Apr 2016 10:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kJRPQJbTxsoyGkTIcnC0iH+fpTV5v0ztZy5jfHFdznU=; b=1DW5579aZfj6WzhErqiKNo4/nJkI9Jay0hnaPCP05iqWoJLFPHf7mFXRyLWkBFIlrL BfKE3GKtU7/N9xDxS2SjW8fvldlGwczWvAzZLH+/ixX+/nVWMhirwSJ+d4Y7g3ubJvmT D6UlpUvpA/8mfo7F+GSFdNwgjIIkvrWdgQwyoxy7HtoBcCqDN5x7dO+yeDqBzo3/7ANb 7McTFpFP7B2RWaj7X4/qpcnqbhKlRlUoq7uFuivRfaau6wmtW0kQNbNQRS42J5DgQJX0 ZsAvzuqyA9ykzruRO50OYffXHN1C+4VCNfzXF/Mvi3ky4tC2Ps/Id3WkdyXgjSUMpsXX LWDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kJRPQJbTxsoyGkTIcnC0iH+fpTV5v0ztZy5jfHFdznU=; b=Jc5+iS6f97LXpXukzFyvuPjZ9Xd5NKDigKtZ/onFD5zlP7PrxlOwMKTtN/bo2fXxqQ cbMzdbVgGj4YJi5OinY78KUWSctX6ueJgdxDMZMXSJgZHzFHbx1GgeeQs0W5iyI5GH20 5C66k7fiMcJBDRGfMLNAdELhRlMaZznUHxgZ62H4baZNvlEnYIDyMn8XBjyjxj33W0om D3NI0p/6bN8wGZcPfkVXWS/9JrDNxdCHREJZP8GoycvmTxBbzF1AHznQj8nzz1nPrnja QAWxEo+7ELyjoYHXoHZl5bMk1c/sHhAbtAEFZpgo/NCWkU4SpP+IgUhuM1CJlyLfV1OE VndA== X-Gm-Message-State: AD7BkJK1g3d3bk9gHVlUxVJJz1umibRkJC1VTYSV/qf/QXgswrwJy8RzcQGEK9nQxQPbiw== X-Received: by 10.194.20.193 with SMTP id p1mr14491044wje.87.1459876734954; Tue, 05 Apr 2016 10:18:54 -0700 (PDT) Received: from localhost.localdomain (45.117.82.79.rev.sfr.net. [79.82.117.45]) by smtp.gmail.com with ESMTPSA id i201sm11565118wmf.23.2016.04.05.10.18.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Apr 2016 10:18:54 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 5 Apr 2016 19:18:42 +0200 Message-Id: <1459876722-9066-3-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459876722-9066-1-git-send-email-francois.perrad@gadz.org> References: <1459876722-9066-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [V3 3/3] dropbear: use libtomath & libtomcrypt 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" Signed-off-by: Francois Perrad --- package/dropbear/0001-fix-linking.patch | 36 +++++++++++++++++++++++++++++++++ package/dropbear/dropbear.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 package/dropbear/0001-fix-linking.patch diff --git a/package/dropbear/0001-fix-linking.patch b/package/dropbear/0001-fix-linking.patch new file mode 100644 index 0000000..93925eb --- /dev/null +++ b/package/dropbear/0001-fix-linking.patch @@ -0,0 +1,36 @@ +fix linking + +see https://github.com/mkj/dropbear/pull/28 + +Signed-off-by: Francois Perrad + +diff --git a/Makefile.in b/Makefile.in +index d9bfdfa..0356b0f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -16,12 +16,12 @@ endif + STATIC_LTC=libtomcrypt/libtomcrypt.a + STATIC_LTM=libtommath/libtommath.a + +-LIBTOM_LIBS=@LIBTOM_LIBS@ ++LIBTOM_LIBS=-ltomcrypt -ltommath + + ifeq (@BUNDLED_LIBTOM@, 1) + LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM) + CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ +-LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) ++LDFLAGS+=-L ./libtomcrypt -L ./libtommath + endif + + COMMONOBJS=dbutil.o buffer.o dbhelpers.o \ +@@ -84,7 +84,7 @@ INSTALL=@INSTALL@ + CPPFLAGS=@CPPFLAGS@ + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ + LIBS+=@LIBS@ +-LDFLAGS=@LDFLAGS@ ++LDFLAGS+=@LDFLAGS@ + + EXEEXT=@EXEEXT@ + +-- + diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 32e2167..fa3642c 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -9,6 +9,8 @@ DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c 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)