Version bump and reject USE="pam static" #236396.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27.4 x86_64

3 files changed, 107 insertions, 5 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 400b56f01e06..571cb72f93b7 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.64 2008/11/12 16:42:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.65 2008/11/12 17:41:41 vapier Exp $
+
+*dropbear-0.52 (12 Nov 2008)
+
+  12 Nov 2008; Mike Frysinger <vapier@gentoo.org> +dropbear-0.52.ebuild:
+  Version bump and reject USE="pam static" #236396.
 
   12 Nov 2008; Mike Frysinger <vapier@gentoo.org> dropbear-0.51.ebuild:
   Add back ~ppc #210795.
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index d426e1ab4bef..35630bef03c0 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -8,16 +8,18 @@ AUX dropbear.init.d 913 RMD160 be9cd23f061b0773966812b7f48552253c312d35 SHA1 86c
 DIST dropbear-0.49.tar.gz 1764444 RMD160 1e9606fb7e20c62c86629d7c97eaedc4fe22c099 SHA1 97ac3d863ffca386aa25b6f60c71ab086aaef591 SHA256 152f87b4fbfe3976c0409fb9e0812af17c9aa0907b04549604110c05248f810f
 DIST dropbear-0.50.tar.gz 1790358 RMD160 c5e643cf068d6cdc19f5da8318ec90e0a0dfb0c3 SHA1 6f56bc88bc29a99c58fe85c98a60249b9782ef36 SHA256 39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
 DIST dropbear-0.51.tar.gz 1777963 RMD160 94af59c474e914d3ef26853aa92a2699b72fcd66 SHA1 78c07d63d74e7f4fb09283ed9fab4defe9e3c35c SHA256 9e81261c39f51812d43c8eb23af64224f5182fe44acb3b5e4bbbef2738a7f29e
+DIST dropbear-0.52.tar.bz2 1601843 RMD160 396d06d612bbd2e49f9f2ad6fe17aa51e8ab452a SHA1 8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 SHA256 8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
 EBUILD dropbear-0.49.ebuild 2171 RMD160 03f778f5f16b282952ee625d0a1603b3a110b79f SHA1 c8cdb029591802c0dfe3ef42285961a4f28a5834 SHA256 f0ef37a51ed6431ce9680754fa55e693505b70f46d20aaa72110075940dab534
 EBUILD dropbear-0.50-r1.ebuild 2430 RMD160 5163259626e31b0f4d914bceeb193ac689a33afc SHA1 90a27a36c9b285c417048bd6ecd9c9b8e444b123 SHA256 bbc34a50aa105033e762800e3cbc884134855f32663ebab27447784c8561bbf4
 EBUILD dropbear-0.50.ebuild 2163 RMD160 1bf75000efbd9143718f5f92f1bd2e9f650d5f9c SHA1 03d53694131599a1345726013f2986bd9dcf6b57 SHA256 500777645950f7b1fc05ead1d76a0c7c5c7b202f039cdf265db45f331116f8e7
 EBUILD dropbear-0.51.ebuild 2432 RMD160 0798f9dc496e8cab22329faf29bcc36c4920b5de SHA1 3beb1605402d7da4de7b6e0bdb3b8d3f411f20f0 SHA256 2204d13aaf23ee37321a21093e2720f85df4a7195c6bc4b055c582c2f0521969
-MISC ChangeLog 8320 RMD160 5a60766031ea06c2011c93ba2c98d565e1832969 SHA1 ff368506ecc6be1ed5f30731ef685d9eb1d6c418 SHA256 98a724edd16c14b8b0ccabd2ee60384168fa1a5def38781c895b50f404aeadc1
+EBUILD dropbear-0.52.ebuild 2642 RMD160 2c8bd810240feeb4410f94f1aafd391529e227e5 SHA1 8c44253b4a8defe3a062e0f334570d19deca15b7 SHA256 c764062d433ae189f058f1efc3c68a24eb50195762fcddb8ed8968e06cf6e87f
+MISC ChangeLog 8476 RMD160 02476838c9ff4df2569a948bd3514acb5f8b8bc5 SHA1 782c807fe389f4c591cf15963ecbb9b02df35e16 SHA256 6d3d8625948ae15129471e4d96d58a554e12953ac453960badea8b616fb04dc1
 MISC metadata.xml 1535 RMD160 b952e11afa75b9db8d37003b87fc34e98aa1c817 SHA1 3292a14d570d524cca3b4823b864b32fabae07a5 SHA256 5394fdf87301c239a38e2f616f03ba1eaf25cdb43cdfb4c0db28555c7284fcda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkbB4oACgkQ67wieSYcaxdNKACgm/qf6fcI7zGamU1/zp5nie9b
-UN0An1CoPKvOuIOKdaQ/HtqK8e5O94YU
-=3y5v
+iEYEARECAAYFAkkbFVsACgkQ67wieSYcaxdpOgCg07drxATNTx/z7VRI1eRgnR+8
+1qsAn3MVr348I9ULncpytGK0mDJUo/tD
+=V1Hh
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-0.52.ebuild b/net-misc/dropbear/dropbear-0.52.ebuild
new file mode 100644
index 000000000000..a779f8f4bf41
--- /dev/null
+++ b/net-misc/dropbear/dropbear-0.52.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.1 2008/11/12 17:41:41 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bsdpty minimal multicall pam static syslog zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+	pam? ( virtual/pam )"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+PROVIDE="virtual/ssh"
+
+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":' \
+		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."
+}