Version bump #487682 by Agostino Sarubbo.

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

5 files changed, 211 insertions, 15 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index c90786e2b353..11d18daaf1ff 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,13 @@
 # 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.101 2013/09/25 18:14:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.102 2013/10/12 21:13:38 vapier Exp $
+
+*dropbear-2013.59 (12 Oct 2013)
+
+  12 Oct 2013; Mike Frysinger <vapier@gentoo.org> +dropbear-2013.59.ebuild,
+  +files/dropbear-2013.59-exec-prefix.patch,
+  +files/dropbear-2013.59-scp-inst.patch:
+  Version bump #487682 by Agostino Sarubbo.
 
   25 Sep 2013; Anthony G. Basile <blueness@gentoo.org> -dropbear-0.52-r1.ebuild,
   -dropbear-0.52.ebuild, -dropbear-0.53.1.ebuild, -dropbear-2011.54.ebuild:
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 00a572865b9d..faf6666e49b8 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,32 +3,36 @@ Hash: SHA256
 
 AUX dropbear-0.46-dbscp.patch 500 SHA256 b133670f2417a112e06ae0e4ec7fe50eeb76015e44a5c19d4f55a8df3636ed2d SHA512 33596d1b59ba266eade106e8fe058cc9d20d1657db88d51fb11c2111835f7887b3fa5714b3feb9767c48ed94d3af0c539864886e0a2586b6f58a38bb9f741210 WHIRLPOOL d442a66dbbc6aff293ef4b6b358573fe6a08c22cbfc31a02ef8fc9fe0b88e9a80d7f9cf3c1fe3ac6470e922d512054f0543d714e6a1bf07f482e3546e68df045
 AUX dropbear-0.53.1-link.patch 1580 SHA256 91878164e0ff1998f4d2043e7b9a918536690579b67ef30a59543cc4d5f9a18f SHA512 ccfdd6d778ed3908af62ca8c7e7b2c7a55e9cd882940073d71bce24d9b4f01a607709f2dbacc988d3dae40754e25ba1b820805ccfaa60402e38e8f3862726591 WHIRLPOOL 2105f96c6cd6d0d4f1f3ad8dd3c40c3fd159884c9036dc575abe1acd04086ec3ad18406b7d55f1f72752bc67744b85d1fb7c25209ac957f89dd8b6ba8de8096d
+AUX dropbear-2013.59-exec-prefix.patch 476 SHA256 6f3167f2d49c74fe8e659737b08c5833ca651e70d149fba2a6e81deec3001354 SHA512 d22ca72961e68fa14cf816026a7f4457bf4d1b2f73a84423f7955d5c156fbdaa0b595985e882f26de30b0f3039f69391f29b53738b853ce2bf5f7ab36a50d28c WHIRLPOOL c1e9a3555c34e32148c35ba47d16a46ede0ce4f56b3aa7c7d3a80de0bdbc209b93f06ad967c0cd0073da8af300be18f8989348ddcca38f85ec3389e40c7aeca2
+AUX dropbear-2013.59-scp-inst.patch 2333 SHA256 f8d84576dc731326a20c85b8a41c3a7f8cd9d218d39967dcc5f49ef4aaf6a9d4 SHA512 7b98a364aef79e0664e0f6cf8f2ede1c84e62f12c19ee9242dc5c42e0904ed450af132e908eb8c71c1a64f19403ecd5344b5c3f4fd77b59c1d55a406d04e81be WHIRLPOOL f00276488f613bcbb9ad03720a4c3d1ae2a60749b4282a87d300c6d7eed27840ac3769de89f0f58c7d5cea8bff66baa0154278b55e192b4dd4cef69f244fa468
 AUX dropbear.conf.d 190 SHA256 e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f WHIRLPOOL 91db627754119bec23cb22b047741699f732a8f23fef84d35cacc1977dc738e16631f936c36ee9f86dafe0a30962c9583dad44b36b798961668875451106b18b
 AUX dropbear.init.d 913 SHA256 b115e922fa679adca29e24464dd7ffb1a21a0962333d7822a11e0bcea29ea5ed SHA512 82ab77fae3a475afd4b4d1840cb6af8ae5c72f38ef49637bc6822a11e90c7c6c0d8105fb09243ac3a1a75346e8efdd8659fa08228f44e94e998abb7d052c5f7f WHIRLPOOL bbb7dffb37df1051cb8d34b11b4dfdb0b75b31d7d43e5d9e4d4f1c7ed0eb924595fc10f3cc1a26aa41e8fa891ac5485415c66129917d6acca6b3e7963474dd19
 DIST dropbear-2012.55.tar.bz2 1581421 SHA256 04982af2a10b220fa940f9f72f276d612c9bb643cfbb5ee1416e5a0f00de9b0f SHA512 34d4b15fc6d46508b5b93a3bf63e4de9de7a72fa3da56fba4815bacbd2df9e683b3f710d71baee492dfb6d3cfb2c6a454f39e3b752649e1024cd160f96fad0a9 WHIRLPOOL 21fed6d08fb92b52e2e520e3f1efde3308594e8de9d73b801230e73e239356053cd3bc811cab8b2a9eb245070fd52e9769d19d1ba3c3cd5c62ce4a517cddbc32
 DIST dropbear-2013.56.tar.bz2 1578454 SHA256 bd01d5759948d78dfac7a929f11119f1174c03e1a09fa7fd197f9e9649f27251 SHA512 dd6ef30a21564b9532a6a9845dedcdab8af759a3272cfffb7856f41adc46f5e168ace4c0f448ed6e1ee0ec3628941cf4de2a244a737a341bf359cc7e4ecd2a97 WHIRLPOOL 3357d6fb77c7d735560d804ddb470d3907882cccc4cb3aed8f626669375aa8c6d6538a56599ce8667c9d25801413bb2b6ee290f4bdf3d2d2f58aec85766cf75a
 DIST dropbear-2013.57.tar.bz2 1580725 SHA256 7797c4b4074e1d53766e7329b172289873b49f2bd4be3412980f29647505ab13 SHA512 d37c36e32f5430c84b9f4c55d53bb72936a96674c87d327a87e764f2e97692d499a46a33def791ebb0e122cfed9a64534c49206e994c6ce7ad24234d98ae7b4e WHIRLPOOL 7c8232475bbd5316e315f91f2ae57fecaeca59939c8ffbbffa62c333a150b29edf541d54be0d49c9251a6d4d01be611ae92dc608852de1774bc6dfeed63a8397
 DIST dropbear-2013.58.tar.bz2 1580584 SHA256 d866189b1d14e15353aeb4feb616f6132a63ea7c25ca8aa12b63a3a397822e55 SHA512 8b1c46d41642e0cf75e9e290695416c4577ef6ef740c2b28cf67df29f0f72a096e8a38ff67db307b4235cc2735d98a2a563c38539acbfaa60e73a41b9a1bae7f WHIRLPOOL 7a834d6f42337ab5412bc63df7ce1983e2c090c2f89374ec534313c81780f099a9056ff69b3c09d669f4a950a5dacbaa111cf67454868ca861504098e150efc2
+DIST dropbear-2013.59.tar.bz2 1583000 SHA256 5e09d773bc4ed4ee904cfa253ab3ac9cd180bf6cdf62475e610bae41dbeb499f SHA512 6ab1ce83edb8d3d0082ad2a3074dc5f128ea96eab22e0168620e32c3befec631a90aefe0309aaf54a302b4f0654b817dd2bb09f1b4d885afe83ea6f1841b1fc5 WHIRLPOOL 6be6e497002291eecfa23844ed763a6b4171e34ad24169994af0a48dfccd77ddd5c247ca5fcf14538c3e0be0ef094f8e2eec2ebf93572c460c67d3b2f778cc78
 EBUILD dropbear-2012.55.ebuild 2480 SHA256 f93efb713ca63cd5fd4f52f6357f89b5e434cec02b456b0ac939044b7ea722ff SHA512 a9c4cef174270af12901638492c598ce61fd8c09d22afe6f821d1f470a4423a8efc7e217be8e393e93d38ca55d5ba11e35b56a8b2ddb658361002ba16a280f1d WHIRLPOOL bdf6451ee8d93fff3a9e5382f8de3bdfe7726e68ce276020f94f93401e6f51a0f780dd4cc014561a9ed35f08c53f459d81006a21a49ad8adbfcc691d1a8954cf
 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
-MISC ChangeLog 12999 SHA256 ac8e5b78aac7043c759b0651c4193f87fa5a96b4c90958319bc780ff4a636dc9 SHA512 7f08bb369f518f2e69191e0852362ae87f18a4526283fce47c6b6e798e321f2dc77614a6fa4916299a7f210f5e89d6c196684fba048eb9786b80a97562ada3f9 WHIRLPOOL 1c5f8a2aea4f84c84741b451e35c7127f85e02613cfa6d682d87a2145dacff12df9d6bfdc068ce4944f28ac7fd4602549bae54ac86bfd29cc4ed710fd52eadaf
+EBUILD dropbear-2013.59.ebuild 2884 SHA256 2a2d346058da203be52b0ee68430ba3a726e4686db0f8ac23c2fdcb80aedac85 SHA512 515d22e2601d0acfe50e3f1504787ee0c0d8dcefdfde930594a9c82ec34db2265647b227dd5a96f23405a282f9013622e1319c650fbbe5b853402d4b71cd4069 WHIRLPOOL 72bfe2e880774d16784cfc15d6254328897429c42c884e4e4393c4477b46726d42671733de70fa4479cf73cc009d7b32a81830718e3b8c515cadacb14b7813d7
+MISC ChangeLog 13238 SHA256 5a50a26d7e13024b3ed4b8ba7cb435824c4db4a1baecf0e1504a790482fff994 SHA512 bf734f88ac0780e893136b08979bf024ba46775a0a20a3c88b0bb0e47ede0b745c39a74af5debe046eec05511de1516bd5a7add46dadccbe43a651fa5bb2dfd3 WHIRLPOOL 92c1b33ff91c3a6b2118b4b0fd7ae3e2f2bb92701657f353fae24011d17715d4cbdec2caa234eb245e3a5797ed33c759d8a3a2c91566bee77d455650317d78c1
 MISC metadata.xml 1597 SHA256 7004c16f947868bd973e18b32dbae55c891a4714d454ec2ef5e835ddf5e1539b SHA512 9abf8e6dc46448060a76acbca75f90d513c4150b016356eb5bf482814ebcf16bb37a61163f363a61e9fab888d4919c20224f8bb9b2d7764a22515802a17b7260 WHIRLPOOL 9f634eb93008b74dfdf885faff5c05f53c970a1105298acc9f2c5107d321b1a74706a4e42b847d2ba8ea6e84e9b928c598c1380cac613afc0bf806194c7e494f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSQyhRAAoJEJOE+m71LUu6ixYQAKZ03SVU7j229u5oEdGYyDCh
-Ur/jMvvRRAslFgLtWOu6C8hzfxzGq7E1Vq5OGlFtCpaf2qZO8Jaug8sPa3PNit3U
-jWLnnyO+aSQLRrEGeN7ICf7jEAXwP8GPNI4udIypweAZZkx7MPa0QBDQ2yyoh9wJ
-My7jGTQq9SX4ENo2gc0t7hyUP1ZpInMiwN2ZW/lL7W3/2pakLqS+NbZ/ErdVierU
-jLpz7luSulSRryR+qSJB5vt1hNeN496OI9sbHnPoZjwQ3U4qUkRjZAIWcRgLjhwO
-nj78igDZRshed2/gu+A9elJRpFd/EnXq9wqs7fZqYUHQHnN4401EwFJdYA1Af4bQ
-X63fKtxr+7pYSrMJbeQCL9563PvznSv33Fhf8OhlZfGcJo2qmT3ipfCo5hBdaLMu
-pDP8E12m1ifyiihPOMCLn68fxUMBIhjrbtDGm80+1hR/rMrv6y8PVYKRI3hrQgM6
-A53IHQGbbNffK/BqnTjjD6AV/ezPBZlTE3xSq5fNSD52K/eh2KLN0y7S2ZR1TbVt
-JQitU7R7PMbSnDEhdtCT4TKN8At/MPg4sNyrsdkIxT7A/JhFsZvGuIwFr8JoiqF+
-ZIkCsi1GdQ/kwWiZGGbnPv1RFJ3rSC1pZxtkOWfz5EO/VtWmUFBqu5QgK3UEgaYP
-FLMGH9hsvMRthExde/Oj
-=lOgF
+iQIcBAEBCAAGBQJSWbuHAAoJELEHsLL7fEFW2QMQALfTcX03qRU5N1sM7/z7TnQY
+XlxsCTI11UyfVyEuB1i9ey+yGhvf9HRFIGqH07EUnwCkOuqjii99smi74g9bXHVg
+vynon74eLnfyj5phzmGil5I1RnoUkZWair09Dz7S+fNWCTABCA4IvNmgZaAKhkCM
+JgxDNfti1ZoYbc9Lhfk6evcw0+VbBoCNGtEy++IyqBp7vrq5rSn6JHD7X2amxost
+vj6W5dPLL+VCJx9ri21DXrI9PZ9sI0IBtpIoTAcKgMIW71RqxdWJgH8SoLO/O36J
+c7qdHDpSldzCZ8wn3afbMJHmJub6QueP99gX4oMNJd5HJ4vayHlX3/twFV47lLVB
+Me8j326GSfpOZ6DfDUXGY1pSyG5LEpS7DVSYh2E0FmIxCC55keTUuvCbb7m4cODv
+nr4v7IHpdb7PFYojd4a83lMFFneLc8AGFhd3d6NC0AlCL23WtdiG4AkSoLccNZmV
+iVBbqTaVzxvrzN2MuwysTgy3j1FbnZWFC4RyidViRyvy4KOibvCYE7kH14H1ETB3
+1UzeWPhB5ZI17N6Taboow0/VgWA3bUCXakCkp9WyUHzvIGPY5NK1tqWRor+wbxch
+QzgNS896/XnowgCWmxIo/lMsvT3bFaQdRF4S0iFb/fHWyYq/X0Mpf8x6QFZ5R1/Q
+VBRXRlFzYKvjEcxpfDxd
+=kpa2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2013.59.ebuild b/net-misc/dropbear/dropbear-2013.59.ebuild
new file mode 100644
index 000000000000..cbc25746dae3
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2013.59.ebuild
@@ -0,0 +1,107 @@
+# 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.59.ebuild,v 1.1 2013/10/12 21:13:38 vapier Exp $
+
+EAPI="4"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	http://matt.ucc.asn.au/dropbear/testing/${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"
+IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+	dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+		STATIC=$(usex static 1 0)
+	)
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+	epatch "${FILESDIR}"/${P}-exec-prefix.patch
+	epatch "${FILESDIR}"/${P}-scp-inst.patch
+	sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
+		options.h || die
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	# patch sent upstream to make configure option work.
+	# XXX: Need to add libtomcrypt to the tree and change this to 0.
+	sed -i \
+		-e '/BUNDLED_LIBTOM=1/s:=1:=1:' \
+		configure || die
+	restore_config options.h
+}
+
+src_configure() {
+	econf \
+		--disable-bundled-libtom \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable shadow) \
+		$(use_enable syslog)
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README TODO SMALL MULTI
+
+	# The multi install target does not install the links
+	if use multicall ; then
+		cd "${ED}"/usr/bin
+		local x
+		for x in "${progs[@]}" ; do
+			ln -s dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}"
+	fi
+	save_config options.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch b/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch
new file mode 100644
index 000000000000..05bc0227d293
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2013.59-exec-prefix.patch
@@ -0,0 +1,16 @@
+changeset:   827:4a788a3162a1
+user:        Matt Johnston <matt@ucc.asn.au>
+date:        Wed Oct 09 21:58:07 2013 +0800
+summary:     Add @exec_prefix@ that was missing
+
+diff -r 125012c4d107 -r 4a788a3162a1 Makefile.in
+--- a/Makefile.in	Fri Oct 04 22:40:28 2013 +0800
++++ b/Makefile.in	Wed Oct 09 21:58:07 2013 +0800
+@@ -66,6 +66,7 @@ VPATH=@srcdir@
+ srcdir=@srcdir@
+ 
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir = @datarootdir@
+ bindir=@bindir@
+ sbindir=@sbindir@
diff --git a/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch b/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch
new file mode 100644
index 000000000000..ee398a54043a
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2013.59-scp-inst.patch
@@ -0,0 +1,62 @@
+changeset:   828:93e04b9ff676
+user:        Matt Johnston <matt@ucc.asn.au>
+date:        Wed Oct 09 22:24:39 2013 +0800
+summary:     - Fix "inst_scp" target since there isn't a manpage
+
+diff -r 4a788a3162a1 -r 93e04b9ff676 MULTI
+--- a/MULTI	Wed Oct 09 21:58:07 2013 +0800
++++ b/MULTI	Wed Oct 09 22:24:39 2013 +0800
+@@ -20,7 +20,3 @@ etc
+ then execute as normal:
+ 
+ ./dropbear <options here>
+-
+-"make install" doesn't currently work for multi-binary configuration, though
+-in most situations where it is being used, the target and build systems will
+-differ.
+diff -r 4a788a3162a1 -r 93e04b9ff676 Makefile.in
+--- a/Makefile.in	Wed Oct 09 21:58:07 2013 +0800
++++ b/Makefile.in	Wed Oct 09 22:24:39 2013 +0800
+@@ -122,34 +122,34 @@ strip: $(TARGETS)
+ 
+ install: $(addprefix inst_, $(TARGETS))
+ 
+-installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS)) 
+-
+-insdbmulti: dropbearmulti
+-	$(INSTALL) -d $(DESTDIR)$(bindir)
+-	$(INSTALL) dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)
+-
+ insmultidropbear: dropbearmulti
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
+ 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
++	$(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
+ 
+ insmulti%: dropbearmulti
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
+ 	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
+ 
+ # dropbear should go in sbin, so it needs a seperate rule
+ inst_dropbear: dropbear
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir)
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 644 dropbear.8  $(DESTDIR)$(mandir)/man8/dropbear.8
++	$(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
+ 
+ inst_%: $*
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir)
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) -m 644 $*.1  $(DESTDIR)$(mandir)/man1/$*.1
++	if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi
++
++inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) 
+ 
+ 
+ # for some reason the rule further down doesn't like $($@objs) as a prereq.