From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1S9ujZ-0004y3-Pg
	for ptxdist@pengutronix.de; Tue, 20 Mar 2012 09:48:01 +0100
Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1S9ujZ-0003hP-OP
	for ptxdist@pengutronix.de; Tue, 20 Mar 2012 09:48:01 +0100
Date: Tue, 20 Mar 2012 09:48:01 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20120320084801.GK20481@pengutronix.de>
References: <1332228703-29918-1-git-send-email-bernhard@bwalle.de>
	<1332228703-29918-2-git-send-email-bernhard@bwalle.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1332228703-29918-2-git-send-email-bernhard@bwalle.de>
Subject: Re: [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
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

On Tue, Mar 20, 2012 at 08:31:43AM +0100, Bernhard Walle wrote:
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>

Thanks. Both patches applied.

Michael

> ---
>  .../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 <bernhard@bwalle.de>
> +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 <bernhard@bwalle.de>
> +---
> + 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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de