* [ptxdist] [PATCH 1/2] dropbear: Delete old patches @ 2012-03-20 7:31 Bernhard Walle 2012-03-20 7:31 ` [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin Bernhard Walle 2012-03-20 8:55 ` [ptxdist] [PATCH 1/2] dropbear: Delete old patches Alexander Dahl 0 siblings, 2 replies; 4+ messages in thread From: Bernhard Walle @ 2012-03-20 7:31 UTC (permalink / raw) To: ptxdist Seems to have been forgotten in the update (d12c29b0e40e1d3affc0490d18599abaa48fca30). Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- .../0001-libs-must-come-after-object-files.patch | 26 -------------------- patches/dropbear-0.53.1/series | 3 --- 2 files changed, 29 deletions(-) delete mode 100644 patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch delete mode 100644 patches/dropbear-0.53.1/series diff --git a/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch b/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch deleted file mode 100644 index eb58d0f..0000000 --- a/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 20 Jun 2011 19:10:16 +0200 -Subject: [PATCH] libs must come after object files - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - Makefile.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8d81647..d72828b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -28,10 +28,10 @@ COMMONOBJS=dbutil.o buffer.o \ - queue.o \ - atomicio.o compat.o fake-rfc2553.o - --SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \ -+SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \ - svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \ - svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\ -- svr-tcpfwd.o svr-authpam.o -+ svr-tcpfwd.o svr-authpam.o @CRYPTLIB@ - - CLIOBJS=cli-algo.o cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \ - cli-session.o cli-service.o cli-runopts.o cli-chansession.o \ diff --git a/patches/dropbear-0.53.1/series b/patches/dropbear-0.53.1/series deleted file mode 100644 index 5c722bc..0000000 --- a/patches/dropbear-0.53.1/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-libs-must-come-after-object-files.patch -# cd06373c86be81f949a6cdf0f13f2b64 - git-ptx-patches magic -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin 2012-03-20 7:31 [ptxdist] [PATCH 1/2] dropbear: Delete old patches Bernhard Walle @ 2012-03-20 7:31 ` Bernhard Walle 2012-03-20 8:48 ` Michael Olbrich 2012-03-20 8:55 ` [ptxdist] [PATCH 1/2] dropbear: Delete old patches Alexander Dahl 1 sibling, 1 reply; 4+ messages in thread From: Bernhard Walle @ 2012-03-20 7:31 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- .../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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin 2012-03-20 7:31 ` [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin Bernhard Walle @ 2012-03-20 8:48 ` Michael Olbrich 0 siblings, 0 replies; 4+ messages in thread From: Michael Olbrich @ 2012-03-20 8:48 UTC (permalink / raw) To: ptxdist 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH 1/2] dropbear: Delete old patches 2012-03-20 7:31 [ptxdist] [PATCH 1/2] dropbear: Delete old patches Bernhard Walle 2012-03-20 7:31 ` [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin Bernhard Walle @ 2012-03-20 8:55 ` Alexander Dahl 1 sibling, 0 replies; 4+ messages in thread From: Alexander Dahl @ 2012-03-20 8:55 UTC (permalink / raw) To: ptxdist Am 2012-03-20 08:31, schrieb Bernhard Walle: > Seems to have been forgotten in the update > (d12c29b0e40e1d3affc0490d18599abaa48fca30). Sorry, I should have checked if there were patches for dropbear, before updating. :-/ Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-20 8:56 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-03-20 7:31 [ptxdist] [PATCH 1/2] dropbear: Delete old patches Bernhard Walle 2012-03-20 7:31 ` [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin Bernhard Walle 2012-03-20 8:48 ` Michael Olbrich 2012-03-20 8:55 ` [ptxdist] [PATCH 1/2] dropbear: Delete old patches Alexander Dahl
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox