Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 122 insertions, 16 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index c7d9a9e30e9f..4db15cd82de0 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.118 2014/05/30 20:04:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.119 2014/08/09 13:52:07 vapier Exp $
+
+*dropbear-2014.65 (09 Aug 2014)
+
+  09 Aug 2014; Mike Frysinger <vapier@gentoo.org> +dropbear-2014.65.ebuild:
+  Version bump.
 
   30 May 2014; Mike Frysinger <vapier@gentoo.org> files/dropbear.init.d:
   Generate keys for all types dropbear supports.
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 469941e6fdbe..d56f141dcc96 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -9,25 +9,27 @@ AUX dropbear.init.d 844 SHA256 42c6dfd02af0575101bf76fe8fb4979f63e7db1d3cc9724cd
 DIST dropbear-2013.60.tar.bz2 1584837 SHA256 4c0c52453b4dd96ef79e5968ed3676de008ee0cf133632acae12bbad588681bb SHA512 2d9c374f17eef22a783d5fef9f30ee2fcbb8778ff7319bb028d8f6181f49827867e3b7f02eec580cbd48f2d97cad789a541c1fbe43fe3d23f6cb396d4138d712 WHIRLPOOL 901beb6fb1e09295aaeb32f9032a653cdeb87e69758f3b598af15f358605e77e24ceea99a418245e86ce665fef1d3a8da38d99105310fa4376586e60f41cb5d8
 DIST dropbear-2013.62.tar.bz2 1598084 SHA256 c6656302bbcc54b0a9c361f505822f6994039117ec32d2897ead3364da079ffa SHA512 8811eae921333bbb242227c52d057a01d0536bf47d37b553834a2cd4730ab1693460a7b4eacfafc8a2c20cc1ac6a4b8c5cdb735e9dd069f9499e4144767fe37b WHIRLPOOL d0b8a95bea6435cbdba86b985229e84a30b36aa7f9b871dac6e2a2eed878ce00799cc59d8ba9c6476a3173bd3ac851dc0314fe4315a464367a56c61f43b3eea1
 DIST dropbear-2014.63.tar.bz2 1598479 SHA256 595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae SHA512 19eccfc59b239b08c6e7d81707a9194ff43aaa6dcc7b572d149175deae74ce9a08bbd73ce5faab8124b3e6e28c33e4fa0d8eca11414b5ac97850c857c17e9323 WHIRLPOOL 0918dbfd61317021c2a9eb7d4cf1deafbae108da3775cac7606ecf7ba2e89db9bbea5888d6fa8496fbffa0ad1ee9a0763ace5ad75d32cf15aeffa555e1393ac2
+DIST dropbear-2014.65.tar.bz2 1604532 SHA256 e20057aa7db0f9ea4efdcbfc6fc6b73a648b47b6ab6a01659472142b06f5f56c SHA512 21ad2568d3ad369b55d8e04b86467fb204c775fe1fd8bfd5a310557e83bbb562db9041bd79a20edbaa1c6b8658a5d41fd54d87476f5e2d7bcf54ebc28615b878 WHIRLPOOL 4c0c3107a64fab185da2139d65ca5a85e687a05527e3ee3d64de63bbac947f3655fae222d895177a73467ce8bebc6dd2aa2d651267e1a6c80c7db8f839378692
 EBUILD dropbear-2013.60.ebuild 2790 SHA256 eb6186e0da4ce5927cd756bce78aaa830e6755bba07b29b33522e66e2b01b20e SHA512 88663b7cd274a960d3ad154a4719aa3f375397f9fe5445ea4940364cbb361052c6b073011badbfd80a18c3df48542fc4cb199c6799719df683f7732d74543c05 WHIRLPOOL d767d2568d210979c97f1f4285c8460c1b48380eb20f0ef63851edc3924d4ff1a2b9e31d5dd0af8d568e5dd301b8fefdfb3f9e1e6f19c5ca87e7b6822323b7e2
 EBUILD dropbear-2013.62.ebuild 2801 SHA256 0aba1514fdb1223a568a7e7704aaed287cb141c6c8280297051255b57bdccac4 SHA512 03d1d1dbc8bdc4ae6b9e30fc65793068faecc5fe0a84c8b8f139df2cd72e8e0ba167216fb780d72c4e2425ecdb1a02b3fa50f4a5c173de2b0af7486c739422c5 WHIRLPOOL 0cc42bc64eb0245d4a2d5659601b0ce0acbd1c1b5af989c52424dca14c39bbdfe215a8f83bd5cfacfebd7f8bc320b6d9623c29a8cf9074299d75f158b39e9c58
 EBUILD dropbear-2014.63.ebuild 2684 SHA256 c14ddbf3050655fb05cdf2b8a26678b92065c7639cbb6a49e150daac43ac44e8 SHA512 e59bc5fd68243695be0d6d73d6b18c7de3091726104df20a9853f31e641a979a519aa89965606becf17d7979a58406e80d1e13f3fd185f4ae556d85ea949597e WHIRLPOOL 72fd91f3b03869d545d0241f2f7b0387ef270dd8680d3eaa7d47974e8f996c781d73271a91391c7b7147ec99dbea3c38520c8457c8567cf8818091efde79e4c4
-MISC ChangeLog 15442 SHA256 82d345094dfd43a7bb97d178f332f08a38f20fedc54b7153b621dc9f4e9e976b SHA512 2535f1f855255baf34dbc688b36df4e17cb814a21c36cca0e4130fcb400ddbd5efeb8c2f67f6e019722b5dffad524df324c7f791553928c6258aeca9ceeb3468 WHIRLPOOL 6f5acdc31addb3eb9bb686545ce9fb4d35f8f8359db3df7adfa331100573cd9029a1f30b05eaa078320b7e78c64447e86ae712747c48691e958d310be9f91f95
+EBUILD dropbear-2014.65.ebuild 2597 SHA256 d1abc3f019b978165332f14d7e5a1cbb13bb5f9734fa067e3826f5b23778ec30 SHA512 1fedea9d482a9580389a8426332ec53665c2e048af44c46abb5fcbb9cb970ddf4ec90267c892d59a0803409fc688fa9f5802be6593c63751ad02e29dffaaf4c1 WHIRLPOOL 37a0bc3fa0cf59c0540a4b4b27447a26629479a07a12ec72db0120f92ee5147b44303cebc93af87fff09c9ba4be72e67e6c081c617104cc1dbccb816e3e7edc8
+MISC ChangeLog 15568 SHA256 17aed05f1ea470a7d325b6be10fbdcc57d1412c9397574903d4b55f4d6f45450 SHA512 6a341bee02ce4bba82a3beb847adaaa1aea9aaf8d69c83d5a4f1b0819059faed8ea274423acf7935f836941a4f5c9308917f654ad1af9cc5d26e6cf49d5a0a89 WHIRLPOOL c2f69af20cef6d7936e9f543a23c01b7ea8549a9fd6dfae32ab924db3044be2fda16b117b6e8113a6e6e0b6d62cd62cb24f3a0ad57891998979e940091811228
 MISC metadata.xml 1597 SHA256 7004c16f947868bd973e18b32dbae55c891a4714d454ec2ef5e835ddf5e1539b SHA512 9abf8e6dc46448060a76acbca75f90d513c4150b016356eb5bf482814ebcf16bb37a61163f363a61e9fab888d4919c20224f8bb9b2d7764a22515802a17b7260 WHIRLPOOL 9f634eb93008b74dfdf885faff5c05f53c970a1105298acc9f2c5107d321b1a74706a4e42b847d2ba8ea6e84e9b928c598c1380cac613afc0bf806194c7e494f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTiORtAAoJEPGu1DbS6WIAy0YQAJEu7JTkloPVc6SZHQms3gNx
-VTIjAh9KZ0z7BwcInJqa+Tlk7G0GLxe2DCZilykifopUGNhePpRzZ/CpmaBmYgXZ
-aTpeZg7bNu5UefX2xAEPpwjbmgwF61BVFNVT3Uvy5tu6RAsiGmpo/sui7Nbg77oW
-h2UFlESLBp3yN5rrSyUtqgjUWNEiKMd4muxgX2Q2HH1Gs70pk37TflIO6HZo6RHt
-2X0vLwRaT/Y6m4Uh+kf3k79WvKeJHq1gXi4vbRGYrJ3boq1Aqgefi8+NcQX5VUHb
-A+Fny67myaXnKiFyNPIaXXt+EuOr09dAn1jYUK2KtaOkqt4yLeec4kSm9tCYc+7D
-eeKA3VZC6FUZn2SBGOHxwBL3y9q4cg+9mZCCK6Lq8+R76TVHAG347ACF4aK99je0
-WsSB4VwOiCFjOCoDLrqlPaGTCboTU/01rP+eomAu4gSOt0xAbd2Lb6+CGnFBYaHK
-MF6P2zUh9ttGZnthGAU05BOLQqj/Ni2KA0UTUHF1vd3fkKy/GYaEIWkks/GQK0vj
-w4R2X8YE8TDuNfDY3+8DMX9JmHLFOKVXEqIBoxCr/uNx4aiPAknhJ6UlxluMv5VM
-IZ9EXBQk8uwL5MW7NjwgCA601LSauvUAbRTXgvps9B1GatK3wQGroxUvhMFCLvXH
-G7F3Yq/vCDsIqvLHSiKV
-=5fW6
+iQIcBAEBCAAGBQJT5ieLAAoJEPGu1DbS6WIAIQYP/RsBVpLxVM+uWdxeNLrWATn3
+nQStelAZoG7wwACdWTQc8V3u7fx237YZeSafKhEVySgUwQYGsHJAQ0y+8p8IJwi/
+UiRB9dYFdR9Yc/lFvHMeh4davcRPjSuGRSP0phKRzr94t3Lm2cMPgyFwr9HHgYLE
+sIl8OrP0XuixX+FEOgcShG3eFF3mF6wdBwJQfbqBm5vgjZe519F2h1Jy0y+t/3hl
+UXndMNbQ1PwC0CSE/ARn5UTNkhPYEn6ETm5JyKpNAC8sjlVPXpqJ+OMw+xSWYtiQ
+ZBUmXahYfFz2fgsRPWuE3fSJgiS15op4ltqTJMWB8UtOj4kkBsKGPLAXZCD8v7T2
+y5ux9jcuXHBD55w9EMdvHDC3vfeviF/KR6Cm9+QVYXMlf2znMWTWkJpI1iAJ8PUI
+GUZGyf/DjhGwBigH02R2TgjRWpL5mMlwlCDjSJ5vH5pdaN/9HJ+/Hqni5goMzkk1
+ufluVAq2KHqbXAYL2730P3277bF6+mEBeY4Reo3vmorLR9aUil1i+MTcdhW9wiW7
+5HOKF7h3j+IGiBcPGoUWyYTvSleg5ka0PFBDGTbBrojk2DdU50ORL4L0dOhdHVN/
+PJk8IyYobWWcycaUcZkTeNRInVzApkvpUhLYZioYkoMwGUvqQuQvWpKPZKql3qWP
+zAI0dCaqdPGfmDWl59UU
+=jNSh
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2014.65.ebuild b/net-misc/dropbear/dropbear-2014.65.ebuild
new file mode 100644
index 000000000000..a1c4891ca35f
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2014.65.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2014.65.ebuild,v 1.1 2014/08/09 13:52:07 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
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		options.h || die
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	restore_config options.h
+}
+
+src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
+	econf \
+		$(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 right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf 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
+}