Version bump.

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

3 files changed, 108 insertions, 6 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 0cb6da709112..b954d0983f94 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,11 @@
 # 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.82 2011/07/01 01:52:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.83 2011/11/08 13:21:30 vapier Exp $
+
+*dropbear-2011.54 (08 Nov 2011)
+
+  08 Nov 2011; Mike Frysinger <vapier@gentoo.org> +dropbear-2011.54.ebuild:
+  Version bump.
 
   01 Jul 2011; Mike Frysinger <vapier@gentoo.org> dropbear-0.53.1.ebuild,
   +files/dropbear-0.53.1-link.patch:
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1ac48393ec82..a0b98ae483e9 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -7,15 +7,17 @@ AUX dropbear.conf.d 190 RMD160 c877b7ead880060ddafe8deaf4cf478dbb33c1b0 SHA1 ade
 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
+DIST dropbear-2011.54.tar.bz2 1580502 RMD160 cb589af26260fd9d6a700b69f85c9f13aaadc331 SHA1 ebae34ae1f64324cae83f3440b3b05a93835d5fb SHA256 5aa4021ac9bac4092c2bd9d41d67143429b3cf791ddc8b590841e1765d8daf3a
 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 2710 RMD160 49f854c71cb288a926baeee25f4190dcef1cb926 SHA1 b3da8d875b8ad0b076266cff8ef54a6bdf4ae54c SHA256 7fc64502b71abca7fb0009f46fa2bb5cef141ab81a588b6f3d75b07b2b37341e
-MISC ChangeLog 10516 RMD160 fa2aa4f80d1d00515978f1fe654d7dc42b7f82e9 SHA1 de32cdcdf7be50bb1767ec6fb69322bc4e1990e6 SHA256 1d3f2f1aae06ab380ecb4a1c7f2d9495255401a8dc4a9afffbe2ea67ec8d517b
+EBUILD dropbear-2011.54.ebuild 2665 RMD160 f702567d41121860e8e15c283c964411e972782f SHA1 e143a70a1d94a5b04d5c96f9e09b571274b45c4a SHA256 fa5fffa7aedeb5796fa940b28a5935826e9f69d761ea3825c76d897738705504
+MISC ChangeLog 10642 RMD160 b85bd8a3cb27a62500dfefbaacdde5727a6a2094 SHA1 e9afaba93417c86a772507cb1cf9faf93352c99d SHA256 e32672e2f96d0204453ee51a727df7d751a42e08d8b6355aff4ee9b5928d2c6d
 MISC metadata.xml 1535 RMD160 b952e11afa75b9db8d37003b87fc34e98aa1c817 SHA1 3292a14d570d524cca3b4823b864b32fabae07a5 SHA256 5394fdf87301c239a38e2f616f03ba1eaf25cdb43cdfb4c0db28555c7284fcda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4NKQAACgkQaC/OocHi7JazggD9E1eHjnMk8aJiIMfFN2BFKY+F
-aPpslgzlJDGCxry2UVYBAJh+nHf93JWxmG9ntnJJtT6X+0X5XlRKNyNoBRJwYqsx
-=Qcp3
+iF4EAREIAAYFAk65OtUACgkQaC/OocHi7JbWSQD8DY/7tf6m1UddqlEy0D1ECeFa
+II1XF8bN8M5R3jCnCmcA/2w2LDlyrfz4CMwz6enasHZ+Dol8zLt1hfKgD/eqONc8
+=L81X
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-2011.54.ebuild b/net-misc/dropbear/dropbear-2011.54.ebuild
new file mode 100644
index 000000000000..d2df2681f64b
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2011.54.ebuild
@@ -0,0 +1,95 @@
+# 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-2011.54.ebuild,v 1.1 2011/11/08 13:21:30 vapier Exp $
+
+inherit eutils savedconfig pam
+
+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"
+IUSE="bsdpty minimal multicall pam static syslog zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+
+set_options() {
+	use minimal \
+		&& progs="dropbear dbclient dropbearkey" \
+		|| progs="dropbear dbclient dropbearkey dropbearconvert scp"
+	use multicall && makeopts="${makeopts} MULTI=1"
+	use static && makeopts="${makeopts} STATIC=1"
+}
+
+pkg_setup() {
+	if use pam && use static ; then
+		die "USE='pam static' makes no sense ... pick one"
+	fi
+
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
+	sed -i \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		-e '/XAUTH_COMMAND/s:/X11R6/:/:' \
+		options.h
+	sed -i \
+		-e '/pam_start/s:sshd:dropbear:' \
+		svr-authpam.c || die
+	restore_config options.h
+}
+
+src_compile() {
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	econf \
+		$(use_enable zlib) \
+		$(use_enable pam) \
+		$(use_enable !bsdpty openpty) \
+		$(use_enable syslog) \
+		|| die
+	set_options
+	emake ${makeopts} PROGRAMS="${progs}" || die "make ${makeopts} failed"
+}
+
+src_install() {
+	set_options
+	emake install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear || die
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear || die
+	dodoc CHANGES README TODO SMALL MULTI
+
+	# The multi install target does not install the links
+	if use multicall ; then
+		cd "${D}"/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 "${D}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session \
+		|| die "unable to mimic system-remote-login pamd file."
+}