Add patch from upstream for crypt linking #357249 by J.Taimr.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 55 insertions, 8 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/Manifest b/net-misc/dropbear/Manifest
index cc04a9e45f44..1ac48393ec82 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dropbear-0.46-dbscp.patch 500 RMD160 72d7aeee568eae941e3fc45935be1b2bb81f6319 SHA1 f6e78796135988216e1008ba8c5b75de85fe1a49 SHA256 b133670f2417a112e06ae0e4ec7fe50eeb76015e44a5c19d4f55a8df3636ed2d
+AUX dropbear-0.53.1-link.patch 1580 RMD160 a666777daa51f3afd21b9e3db0f60cb16448d89c SHA1 65676bd3e50e23ea3b032f82055de1588ff56bb0 SHA256 91878164e0ff1998f4d2043e7b9a918536690579b67ef30a59543cc4d5f9a18f
 AUX dropbear.conf.d 190 RMD160 c877b7ead880060ddafe8deaf4cf478dbb33c1b0 SHA1 ade70c7c07a2f16075fd14feeba9c6e11f42a09b SHA256 e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334
 AUX dropbear.init.d 913 RMD160 be9cd23f061b0773966812b7f48552253c312d35 SHA1 86cca7f1b8a9e591c61c23aa8ed176d6dbbae4ae SHA256 b115e922fa679adca29e24464dd7ffb1a21a0962333d7822a11e0bcea29ea5ed
 DIST dropbear-0.52.tar.bz2 1601843 RMD160 396d06d612bbd2e49f9f2ad6fe17aa51e8ab452a SHA1 8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 SHA256 8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
 DIST dropbear-0.53.1.tar.bz2 1577227 RMD160 9a57eef1da8ad1aaf8838d08e33d08952cb17b03 SHA1 01d9c6673b2b20659b8557cfe6de8386a94f4801 SHA256 e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393
 EBUILD dropbear-0.52-r1.ebuild 2662 RMD160 cb63b1040355844d04b28b26f08d1a86b1bc94c0 SHA1 43aea650d64b17854731992510d0583d0fec2bcd SHA256 a7348d330ffc5d81bc59d3596c25122ae77ec5cc0c5a5186fbc502518316b1b5
 EBUILD dropbear-0.52.ebuild 2648 RMD160 b77e2243b21848977c1d547cec897bbf7dd8554b SHA1 2603737d7f8fe8a0977bcbd51ad8c3e477a53de2 SHA256 aa7f91459c82c8b180eba8e740afad782083dbe291e23c4a253756f3a086792f
-EBUILD dropbear-0.53.1.ebuild 2661 RMD160 7b212fc769178eb2c4fc767aa45d2a9411cff7df SHA1 3e7cdd6d16abf0ab1b162666fbfea0ff3551ba41 SHA256 a27778bc276fd5de17bf7dd73856ab0695e5be04b3daadd99150683eafc071cd
-MISC ChangeLog 10337 RMD160 b9c1b528c80edf2aa62a5a1df8f29a658b3f06d0 SHA1 c5ac24d598094d499196e0fca5cc622c659b5e26 SHA256 7d5f75a37f296792f6bb843b50331d424ecf3a915423883d6c62d1684d1191bc
+EBUILD dropbear-0.53.1.ebuild 2710 RMD160 49f854c71cb288a926baeee25f4190dcef1cb926 SHA1 b3da8d875b8ad0b076266cff8ef54a6bdf4ae54c SHA256 7fc64502b71abca7fb0009f46fa2bb5cef141ab81a588b6f3d75b07b2b37341e
+MISC ChangeLog 10516 RMD160 fa2aa4f80d1d00515978f1fe654d7dc42b7f82e9 SHA1 de32cdcdf7be50bb1767ec6fb69322bc4e1990e6 SHA256 1d3f2f1aae06ab380ecb4a1c7f2d9495255401a8dc4a9afffbe2ea67ec8d517b
 MISC metadata.xml 1535 RMD160 b952e11afa75b9db8d37003b87fc34e98aa1c817 SHA1 3292a14d570d524cca3b4823b864b32fabae07a5 SHA256 5394fdf87301c239a38e2f616f03ba1eaf25cdb43cdfb4c0db28555c7284fcda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2p7gYACgkQOeoy/oIi7uzLvACeM+ShQwE8dT8sML3XrlDX2Vpl
-hyQAnjVrK2V9cGFlzvb4pb2F5ERcwsga
-=1LUI
+iF4EAREIAAYFAk4NKQAACgkQaC/OocHi7JazggD9E1eHjnMk8aJiIMfFN2BFKY+F
+aPpslgzlJDGCxry2UVYBAJh+nHf93JWxmG9ntnJJtT6X+0X5XlRKNyNoBRJwYqsx
+=Qcp3
 -----END PGP SIGNATURE-----
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
+