diff options
| -rw-r--r-- | net-misc/dropbear/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dropbear/dropbear-0.53.1.ebuild | 3 | ||||
| -rw-r--r-- | net-misc/dropbear/files/dropbear-0.53.1-link.patch | 41 |
3 files changed, 48 insertions, 2 deletions
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog index 4737fd0097e4..0cb6da709112 100644 --- a/net-misc/dropbear/ChangeLog +++ b/net-misc/dropbear/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/dropbear # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.81 2011/04/16 19:27:44 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.82 2011/07/01 01:52:50 vapier Exp $ + + 01 Jul 2011; Mike Frysinger <vapier@gentoo.org> dropbear-0.53.1.ebuild, + +files/dropbear-0.53.1-link.patch: + Add patch from upstream for crypt linking #357249 by J.Taimr. 16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> dropbear-0.52.ebuild, dropbear-0.52-r1.ebuild, dropbear-0.53.1.ebuild: diff --git a/net-misc/dropbear/dropbear-0.53.1.ebuild b/net-misc/dropbear/dropbear-0.53.1.ebuild index 8dbd4495fa61..ffdcba12a330 100644 --- a/net-misc/dropbear/dropbear-0.53.1.ebuild +++ b/net-misc/dropbear/dropbear-0.53.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.53.1.ebuild,v 1.2 2011/04/16 19:27:44 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.53.1.ebuild,v 1.3 2011/07/01 01:52:50 vapier Exp $ inherit eutils savedconfig pam @@ -40,6 +40,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch + epatch "${FILESDIR}"/${P}-link.patch #357249 sed -i \ -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ -e '/XAUTH_COMMAND/s:/X11R6/:/:' \ diff --git a/net-misc/dropbear/files/dropbear-0.53.1-link.patch b/net-misc/dropbear/files/dropbear-0.53.1-link.patch new file mode 100644 index 000000000000..99a015ab385b --- /dev/null +++ b/net-misc/dropbear/files/dropbear-0.53.1-link.patch @@ -0,0 +1,41 @@ +http://bugs.gentoo.org/357249 + +fix from upstream + +# +# old_revision [c7f6c45c46a2f8e2394756c68ae825d6e4dc7489] +# +# patch "Makefile.in" +# from [ea21753734b01f01ea1062923f4cb5eac65eadec] +# to [3dcc9b69742a8a4f59ea9f22b6d80bad2c761117] +# +============================================================ +--- Makefile.in ea21753734b01f01ea1062923f4cb5eac65eadec ++++ Makefile.in 3dcc9b69742a8a4f59ea9f22b6d80bad2c761117 +@@ -28,7 +28,7 @@ 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 +@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac + loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ + listener.h fake-rfc2553.h + +-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) ++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ + dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) + dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) +@@ -167,7 +167,7 @@ ifeq ($(MULTI),1) + # multi-binary compilation. + MULTIOBJS= + ifeq ($(MULTI),1) +- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) ++ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ + CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI + endif + |