From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay06.ispgateway.de ([80.67.31.104]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1S9tXn-00010f-Oe for ptxdist@pengutronix.de; Tue, 20 Mar 2012 08:31:57 +0100 Received: from [93.104.149.103] (helo=localhost) by smtprelay06.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1S9tXn-0005hl-7u for ptxdist@pengutronix.de; Tue, 20 Mar 2012 08:31:47 +0100 From: Bernhard Walle Date: Tue, 20 Mar 2012 08:31:43 +0100 Message-Id: <1332228703-29918-2-git-send-email-bernhard@bwalle.de> In-Reply-To: <1332228703-29918-1-git-send-email-bernhard@bwalle.de> References: <1332228703-29918-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Signed-off-by: Bernhard Walle --- .../0001-Fix-build-on-Darwin.patch | 44 ++++++++++++++++++++ patches/dropbear-2012.55/series | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch create mode 100644 patches/dropbear-2012.55/series diff --git a/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch new file mode 100644 index 0000000..bc0d210 --- /dev/null +++ b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch @@ -0,0 +1,44 @@ +From e96df81ee2364f45724ef91389a5633337216214 Mon Sep 17 00:00:00 2001 +From: Bernhard Walle +Date: Tue, 20 Mar 2012 08:28:57 +0100 +Subject: [PATCH] Fix build on Darwin + +From +https://dev.openwrt.org/browser/trunk/package/dropbear/patches/200-lcrypt_bsdfix.patch?rev=25891. + +Signed-off-by: Bernhard Walle +--- + Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index cec35f1..0c288e4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \ + loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ + listener.h fake-rfc2553.h + +-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ ++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) + dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) + dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) +@@ -77,7 +77,7 @@ STRIP=@STRIP@ + INSTALL=@INSTALL@ + CPPFLAGS=@CPPFLAGS@ + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++LIBS+=@LIBS@ @CRYPTLIB@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@ +@@ -169,7 +169,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile + # multi-binary compilation. + MULTIOBJS= + ifeq ($(MULTI),1) +- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ ++ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) + CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI + endif + diff --git a/patches/dropbear-2012.55/series b/patches/dropbear-2012.55/series new file mode 100644 index 0000000..d9df7e0 --- /dev/null +++ b/patches/dropbear-2012.55/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-build-on-Darwin.patch +# e4c948951d2fafee17a83f484c126a7e - git-ptx-patches magic -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de