Add multicall install fixes to stable version too.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 23 insertions, 18 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 839103fdc1cc..d250801b4152 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.114 2013/12/09 01:25:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.115 2013/12/22 14:55:31 vapier Exp $
+
+  22 Dec 2013; Mike Frysinger <vapier@gentoo.org> dropbear-2013.60.ebuild:
+  Add multicall install fixes to stable version too.
 
   09 Dec 2013; Mike Frysinger <vapier@gentoo.org>
   +files/dropbear-2013.62-multi-install-man.patch,
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 19144995e005..6973c6b69d64 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -17,24 +17,24 @@ EBUILD dropbear-2012.55.ebuild 2480 SHA256 f93efb713ca63cd5fd4f52f6357f89b5e434c
 EBUILD dropbear-2013.56.ebuild 2602 SHA256 78289eef2c93f923aabe512b2e73a157f1a444596c0fa887bfac7f829997b836 SHA512 4f6601164d1830be79365a1269d2011bb68992a2467a7db8830e4dc42b08f81c1fcf271e6e8855721af35a43fdb9fb5b2e0946deb5213eb956da53ab32240ddb WHIRLPOOL 57ee552db76da17d6d53967155553f7e5a8c019dd8524e52b8525da2452d58bf0303e34f02d38d7b5710469991086b12ac6bed6eca7449168f9754cbdf62c2dd
 EBUILD dropbear-2013.57.ebuild 2602 SHA256 c884d4de20368d351e359c90c5c0165fb01fdd27f941a290a73dfb5da36723e5 SHA512 598e3f40d5d5bd111887e4e0bc6aabfcebd0f39aa5e7d4258a6b3b4fd6051ca3a7902c429f6502f66c3c7f7cdf364df47a143691872309aada9e54cdc88d0845 WHIRLPOOL 22378a6c4f4792b8b9725f8d9dae2da29ee0063fc2dc3120cb4547415855b43fbf7b986eb9b6e52e74196b4e95b4ffa5b25af56d6006d11e46c7ace452bd61b1
 EBUILD dropbear-2013.58.ebuild 2602 SHA256 2baa5d0bbe273cc88fa8732703bdd751d055d98e596a78b5782473c46708e3c2 SHA512 3b16f23945f3b491def8b23fd06a25dc67f604b634c6d3a86c62a0334f0f220e0c6deaa2cced243aab6e38c43140cc032a93e81e6027ce79881a842ce83ac02d WHIRLPOOL c0d200a0d4167b940af7e3e785459ce41cf6de29fe35da95b48e8e5049a52121c3bb58a43088301e0bd6951e81bc3e5a6d232ac9c445d9ccfa44ada9dfaa2a26
-EBUILD dropbear-2013.60.ebuild 2676 SHA256 28b914420eff65ec3ea291b7f208143099f1f9ebdab6c168073eca46308555a9 SHA512 a3347887feea4b1e4ab6388fa49708ce28c2b6b9a046699b382e5c78410abc85fb9670807f587827add29e0a4cea5a77c12a06364ced2ce54f97eaba616e6e44 WHIRLPOOL 5845e1460ecee3dde4d23a2084cdf26499b24c9d66b39cce8eeba265828fa84c7a525b1696ab14658d010e3f6aca8746266ffd51f0c9d51e387efbfbcada9cee
+EBUILD dropbear-2013.60.ebuild 2790 SHA256 eb6186e0da4ce5927cd756bce78aaa830e6755bba07b29b33522e66e2b01b20e SHA512 88663b7cd274a960d3ad154a4719aa3f375397f9fe5445ea4940364cbb361052c6b073011badbfd80a18c3df48542fc4cb199c6799719df683f7732d74543c05 WHIRLPOOL d767d2568d210979c97f1f4285c8460c1b48380eb20f0ef63851edc3924d4ff1a2b9e31d5dd0af8d568e5dd301b8fefdfb3f9e1e6f19c5ca87e7b6822323b7e2
 EBUILD dropbear-2013.62.ebuild 2801 SHA256 0aba1514fdb1223a568a7e7704aaed287cb141c6c8280297051255b57bdccac4 SHA512 03d1d1dbc8bdc4ae6b9e30fc65793068faecc5fe0a84c8b8f139df2cd72e8e0ba167216fb780d72c4e2425ecdb1a02b3fa50f4a5c173de2b0af7486c739422c5 WHIRLPOOL 0cc42bc64eb0245d4a2d5659601b0ce0acbd1c1b5af989c52424dca14c39bbdfe215a8f83bd5cfacfebd7f8bc320b6d9623c29a8cf9074299d75f158b39e9c58
-MISC ChangeLog 14822 SHA256 4b47d7a95d7fd9cb1ad06e9d6fb4d6e926a770db993e40561c52ae8946a81458 SHA512 338132838ccf052427356cc7cbf818c44996284e0c567b97e1bd682ae2914f80bbd1ca29dda8df4c7780c4b49274aa4aa73c6b32989852b3a34cdb4f9f10af55 WHIRLPOOL 57e382a0998a6131dccaa58913b10c77240e3ad1c06f55a06f5fc9c9366300fb211a4859a1da5edf5eff2b679163586d1a68b56924f2cc540d6a7dbc9165e407
+MISC ChangeLog 14951 SHA256 918481380a0036ea422648be6dab1d8093aff127aff9cd052b74e772e7670f23 SHA512 d8c6bc8e51579cf40298c5e9d1c33290831b5d09c142ab9d34cd19b052469a227ab7077a8800bfd18465cc1e5b76d21df9cc3a53128f686a8f0b6a4c85169555 WHIRLPOOL 7879a6ba63e1aa6c35e0c7cef06114c67ed6e02ef88fa0cf1df86e099ca0c73e3f42af19b2828ba2f0a66cc18782878cfed479a0257929cad16a824a25aa1177
 MISC metadata.xml 1597 SHA256 7004c16f947868bd973e18b32dbae55c891a4714d454ec2ef5e835ddf5e1539b SHA512 9abf8e6dc46448060a76acbca75f90d513c4150b016356eb5bf482814ebcf16bb37a61163f363a61e9fab888d4919c20224f8bb9b2d7764a22515802a17b7260 WHIRLPOOL 9f634eb93008b74dfdf885faff5c05f53c970a1105298acc9f2c5107d321b1a74706a4e42b847d2ba8ea6e84e9b928c598c1380cac613afc0bf806194c7e494f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSpRwQAAoJELEHsLL7fEFWBooP/1VCTr2Jn/SjjPihggBpLA1m
-j0IttOdScqyabtatbu4RzibH3Yx7uORoplPeSXasSpJ0LrhBqt33FEpR6bFwRJG0
-NlRq0tikGGDgDWotdD+xt8bpIU3lp82cPwpLtHo8Kne7snyqIhnZzzgSKGBML30S
-4bWF8YAhmBE54SsDBfx1GZJixS+M+6FSr9PhQdMuHmpK8v8f7LE14/9qoMfBUkeM
-jGfscCJmydBMF92NiwHXOLHQD7axW683qqa4Dz6tKT+AWZk5lwKB/ktdTG/BYkWL
-bMfxaIfdQ6gyStOeWWP5KP6kXG0UZWplt6t91X8ohQuIN7lQ1fltBbfiMIqNwsOp
-e0/DMr7FKUtt8tjPorDXF7ExvWnqRt31x3aG3BCjI9hm0rnpBquIJ6r3bz9PRr3I
-TJnp+7LAiBXCKk1VW69vxf3xl9MhESyGcTTvApAvup3HabtreDclVzftXfYErQwl
-9A8b42dqLlU7sbToDrBetkr+TdfzsJbNOx8h6g8QJ/fsiTVYUaBqltTlHDZYek2A
-teDkLtBGPAwqG7ne0BSxmulbV6Wg36sHdj9VmpT2IV7Khn0kTSqJdkq0J4oUJ+XJ
-00ceyOSWf1dEULhNmdBcZytS7+2IvFZUW4sMKMD92Vg6VGRwITK7jK7Ysfrx3RRU
-qnmvYzk1W85LRN6toGO/
-=NVem
+iQIcBAEBCAAGBQJStv1mAAoJELEHsLL7fEFWlngQAI/yoHgNTSV/07OHneeR/EnJ
+VQp50yB/yjIUiKtPorSeERtjgr0M0TUKPvIIS0HydUqVyONvK/VXSzBNSDybqPG6
+a+b4JvXjQRHw8XGEhp5zsUIayoUittrXjZ+N0JRzRLnBMZSFu6zZJiYQz2D087qB
+DH+icXSDd8OPg5OXDYE2cs4gmttgPLp9DyeMPG4wDL4iHxWOvkoULwafPS9nI09B
+020hA+OD5yBswAm/w2+OY8AAKqq24uLom6F64SAqjGIhyB6odglmWJP2rgrvQ2Aa
+A4pdeBjVXdg0b5ElF+Iq+/QqF03AY2w37H3KEkt+sCyqvajVUReFW0sL+u/RRbXX
+nhIVN0wXvKROugoIhfdtQ5VX8BjB2eWaYZ4di3dL6b7lgTIuCsPgLO1rhQpGzOuw
+FoFx0IATN16NtxM+P4djru0yqpFjg8zLAa8ds+WOuqPkOjOBDnlBYu7O93SQzPbq
+fTmHzz5vX6vUID0tWsnW/Wces/kDqLhh66XDc1xTahIikzRYaGGtcOL2tLfvG9qv
+Q5UD0+BJD2Qqc5KDTPL11H7+v38suy+wjm5+X0FaNUWSV7mjSU/ptJmN2l1ZQISt
+ZDwrDiodLpzQJ5Yt2E9bMLCh+zmmypdPizP+61I67q2Q1EIfgIGLvOS0VlZpTtec
+q7odGDTwn8qUR745AHlj
+=lAQi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2013.60.ebuild b/net-misc/dropbear/dropbear-2013.60.ebuild
index ca63c2342ee7..2a2532de75ef 100644
--- a/net-misc/dropbear/dropbear-2013.60.ebuild
+++ b/net-misc/dropbear/dropbear-2013.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.60.ebuild,v 1.10 2013/12/09 01:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.60.ebuild,v 1.11 2013/12/22 14:55:31 vapier Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
@@ -39,6 +39,8 @@ set_options() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	epatch "${FILESDIR}"/${PN}-2013.62-multi-install-man.patch
+	epatch "${FILESDIR}"/${PN}-2013.62-multi-no-relink.patch
 	sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
 	sed -i \
 		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \