From f9c1cf3f77e4045871fa1004fa919b14a6826b3c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 15 Feb 2015 09:39:50 +0000
Subject: [PATCH] Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
---
 net-misc/dropbear/ChangeLog               |  9 ++-
 net-misc/dropbear/Manifest                | 30 +++----
 net-misc/dropbear/dropbear-2015.67.ebuild | 99 +++++++++++++++++++++++
 3 files changed, 122 insertions(+), 16 deletions(-)
 create mode 100644 net-misc/dropbear/dropbear-2015.67.ebuild

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 5900081898d0..9aa559bde97e 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.120 2014/10/23 19:10:55 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.121 2015/02/15 09:39:49 vapier Exp $
+
+*dropbear-2015.67 (15 Feb 2015)
+
+  15 Feb 2015; Mike Frysinger <vapier@gentoo.org> +dropbear-2015.67.ebuild:
+  Version bump.
 
 *dropbear-2014.66 (23 Oct 2014)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index e3dd33f2533e..692848608148 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -11,27 +11,29 @@ DIST dropbear-2013.62.tar.bz2 1598084 SHA256 c6656302bbcc54b0a9c361f505822f69940
 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
 DIST dropbear-2014.66.tar.bz2 1604981 SHA256 ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76 SHA512 3005f754ad97e5eb84221740577f4dd962e38f38b3f6ba84dbb0811a7a35d487069c35b30055e129541c224769fe0a7e594084a9b0f1cc667029ad43d4988149 WHIRLPOOL c077328bf5c21faa655f3a2e6fe1aa775b046eec7cf0f527a86c0ec01b62ab9c6ae3530fcdf49db19be8208ea22f8cd198cd3ab6a5eb605a55daf0bf0c40e4ff
+DIST dropbear-2015.67.tar.bz2 1606312 SHA256 7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5 SHA512 6a23f7dbe8ccd39683488a16ce4db39cdba529e9d302165742eb818d3cf520a3793660ff6c8ce0520ddb87dcac726ff34ed3dbcb7efa83115deafad2c6c0a5f3 WHIRLPOOL c1103be19c86a0b40ca262715646244911032e97aba52279be1f7a0382367554c34455497b604dacacb69da0873fd26d3d457abeb7d265e6ca6bdff8938dc065
 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
 EBUILD dropbear-2014.65.ebuild 2597 SHA256 d1abc3f019b978165332f14d7e5a1cbb13bb5f9734fa067e3826f5b23778ec30 SHA512 1fedea9d482a9580389a8426332ec53665c2e048af44c46abb5fcbb9cb970ddf4ec90267c892d59a0803409fc688fa9f5802be6593c63751ad02e29dffaaf4c1 WHIRLPOOL 37a0bc3fa0cf59c0540a4b4b27447a26629479a07a12ec72db0120f92ee5147b44303cebc93af87fff09c9ba4be72e67e6c081c617104cc1dbccb816e3e7edc8
 EBUILD dropbear-2014.66.ebuild 2604 SHA256 c5d5386c26ec9be00e0427f6ddcea276b86f9dc053f121168b5d6b839588bd88 SHA512 eb4eef56a88d6b194597a7d6ba4c875f3170ba3a8635e82fa29be16a5f3555df9ccf0a9faf9528174deb43fabfde064fc4c4981673e96f36595f3b86bbd2f7fe WHIRLPOOL afd9da8869e5544df8a151ea1e11891e37a948b3fe4fd456cdf646c485c530b180610bf21ebec3fe11dcc1f325787e3368a47464a9dd98a4d2091e5b9ebc232f
-MISC ChangeLog 15694 SHA256 a2d09369ee06a8db794bab068e48f653dfd38b6bfe6db6cfb35faaab30853239 SHA512 c368c98fc2bea4ec1deadb1a6d07648c5871db056e18a38635428de339615a1139443643624802ae60a3c0ee5edc8ae0908c26414cbf435d5cc00962b97bb2c2 WHIRLPOOL fa025ab1b055dec63feb069646469bcfd76c9699015235ebb6cfacadd36dd5fa37077af5349bb3cfc70200debb6fe6c7bfff53a2bd1725b881d36f559139d6f3
+EBUILD dropbear-2015.67.ebuild 2604 SHA256 3052005c77404604a9e5df6e7afd0f4b773bde5b62f70a93fdecb76b47003e31 SHA512 91d900888ad7e861f6d1cb10c1b6c9fdb7f108f6aec74ad84ddfcdad8226b77f3a377a016c47565334022e5dba9a6b6de942fcc2a86c7eb3c5250388a78d1d88 WHIRLPOOL b5b063b9d69ac10b3b29c7068d1669ebe6d76da62b70b09addfe9ebc3e124d3e89c59f094d3ed87646ef8055e675d0496986ed74790b7265f57430e5de86cd9b
+MISC ChangeLog 15820 SHA256 57b09a99ff18061131c162f8097ebcd4f916889c698fc93a1fe06f0a72a9df84 SHA512 2d5ca7cc78175ba61748f70b41e67f314589a3f726a134b9f079606c658fe97e5500c42b6c6eb865e071199eb90582bf12a21421cf341ffcbb6be16286ccb51b WHIRLPOOL f951a77f28a00f1d283525e9ee86f72fd4c89bba1f9b8f26e0eca2b80f664bec3597c2eb10a0e7d17e29d9107b97a7e37d78b046ae586bfa6a9808b5f2df0e65
 MISC metadata.xml 1597 SHA256 7004c16f947868bd973e18b32dbae55c891a4714d454ec2ef5e835ddf5e1539b SHA512 9abf8e6dc46448060a76acbca75f90d513c4150b016356eb5bf482814ebcf16bb37a61163f363a61e9fab888d4919c20224f8bb9b2d7764a22515802a17b7260 WHIRLPOOL 9f634eb93008b74dfdf885faff5c05f53c970a1105298acc9f2c5107d321b1a74706a4e42b847d2ba8ea6e84e9b928c598c1380cac613afc0bf806194c7e494f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUSVLAAAoJEPGu1DbS6WIA3JwQAIN/lPNsm9Rg/S4244pVkBtZ
-eBGT/0mg+71cJI+TYCIot2LwTrQfqeyzqZZgyfoSScY3rDLWpGevgS+2Nz/GHwrR
-Dnu1IYh288GcGx9hzm/Q6/6NedTORi7bvOncLUqLijZyN476PG5DLOzS6fdh34VR
-SrSyxx5EqIpHnMjxWl+WApnTL6YnxFzJxOK3V53ajovZdVwjoDu/EG5JyE3lLXZ/
-wOcg4DmQuh/l8L4073Onk8RB2KGw8fMCbMwwuWn/oeUsFMvIzRKTwUOMgcYqBXgv
-hUYUcb+gULSQuJgoSVBV22cEKwKlolZyZvrWmqImpYiDHpGZHfhVqXFYWhm0TMhq
-rZbaMJWGvDmM9RFdNmgAoVy8X3iHdxRqBoU49d5uWqntnVaOhxpOCZ1PizT31dG2
-APjdaP1HU9In4DK5b94tbZdvzF/LKvWwmfS7MWdTr/9yJAhQUzPaZ6jUTKi9w01/
-O3j7gXiFHbd4w7F+qHIfJQq0x32O9+l5gp5a2WbL/0o9ThOihoeWHc/y64g1IRj4
-bOgB/QZk0CNQSREyqlwVqnivKgJ5g9Vg27DWvNc9Kx6GGZbg1BxGZgkHMpG8eHu1
-aNudmybuNp9nZMEXi8yTdED19NrKE3+RbD+9NqFiRDjBpJ4gyssnR7KLzvcSymjn
-EMD5VpoG5Xcx4G6+fTn5
-=okLB
+iQIcBAEBCAAGBQJU4GlmAAoJEPGu1DbS6WIAqr8P/izD6TyMECHfODa5/w6MWH8w
+pT6Cw5SCjEwwDty44IYhW91dpnzHT5Wy7IKtzfkSquX+hJQ3OSlu3/5ic85Z5EIH
+A0/BrPNS4AChjakexpQroEPMzYJE1s6LPYS9+SURgcRBRwx6tgdeylOZv0yeXyN4
+obYGAGtw02jzsjlacEutvs2WFM4RRm+c/srd3hiM/W0vDNDFZSaDDodbInt2NjYY
+/FZL1pD4KEja5CnrlCl77JhXDXfDCJo6lYNPcZQsIJ2G3JrVV2kZ7fY4SCgCfctG
+ae+s5isqpcheo9ZZ6Y0KYpljN+T7MERuUdq1//jfGnyPN6WURxZ2Aq6E0fcWtw4X
+6zxRfCxKSC5q2PPDi4mppo/bFMyNi3dGXvMR+aCW2uk4SorYO5Kc1NWANIoZuNzj
+1Cwa2pe7f6i6lFNo4wlPREHlzUFKssvnEj4PjFY13Wb6W/gqYSpgQzz7UXHtU/3H
+f5eaZQ7tTaRmJWsrR27qz0U7Dpc9hT+I8YMp7nTK0vpok6JAvy9RnZ0j+hqv3Q2B
+n50wpokUYJlheizF1kwQ+gPrCo52PBsPXtr7j0Bau4qEBvbHk8PTeFQ4YQTlU6rf
+xXTXWq7kyvBLdTkwmuNNozVpNwQSCznMKrvfWKfem8ADnzC3pdLBWIPEBsNcUzDC
++Sy90zlEuU8mgGvbtrnS
+=bN5C
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2015.67.ebuild b/net-misc/dropbear/dropbear-2015.67.ebuild
new file mode 100644
index 000000000000..d2103ea2ceff
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2015.67.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2015.67.ebuild,v 1.1 2015/02/15 09:39:49 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 ~arm64 ~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
+}
-- 
2.26.2