- version bump. fixed dbscp so that it actually works when using +multicall

(Portage version: 2.0.51.22-r1)

6 files changed, 105 insertions, 16 deletions

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 2a07e1347cde..ef4832f495c4 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dropbear
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.16 2005/03/08 21:10:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.17 2005/07/17 11:19:00 solar Exp $
+
+*dropbear-0.46 (17 Jul 2005)
+
+  17 Jul 2005; <solar.@gentoo.org> +files/dropbear-0.46-dbscp.patch,
+  dropbear-0.45.ebuild, +dropbear-0.46.ebuild:
+  - version bump. fixed dbscp so that it actually works when using +multicall
 
 *dropbear-0.45 (08 Mar 2005)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1288cccc2e76..ff1e63beebc2 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 52f6a23200f160aea0c83680de836a81 dropbear-0.45.ebuild 1861
-MD5 ef25f543b5438ee7595e2ae0f98a5093 metadata.xml 671
+MD5 654727b8b2f83b03b3d1d3e0b3c653f8 dropbear-0.45.ebuild 1870
+MD5 d9b966486abbd17f200d7cc0640e976a dropbear-0.46.ebuild 1924
 MD5 eca949c2fcf358c97cbf8071bf15e3ae dropbear-0.43.ebuild 1685
-MD5 1217cfad219fac8646640126f899b1a7 ChangeLog 2318
+MD5 f8ca30a40c3fd60c364265c89ed990f1 ChangeLog 2543
+MD5 ef25f543b5438ee7595e2ae0f98a5093 metadata.xml 671
+MD5 64abc6b82756a97391c12d730c8da084 files/dropbear.conf.d 352
 MD5 34fea1c967596ebcd6d10d38444f2b92 files/dropbear.init.d 913
 MD5 2f5c2ef2e357aa5225c9044f33fa2512 files/dropbear-0.45-urandom.patch 1887
 MD5 c3634543250cd9f910161b351bb15ccc files/digest-dropbear-0.43 67
-MD5 64abc6b82756a97391c12d730c8da084 files/dropbear.conf.d 352
 MD5 c9381e8354263ae69eda6efabca753ad files/digest-dropbear-0.45 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2i2LgIKl8Uu19MoRAvG/AJ4+7ksD1NSE9zvIzygAyGZm0B5ryQCfR6iE
-PpD86SvOg9+i4oM2ZX5chrE=
-=fbBY
------END PGP SIGNATURE-----
+MD5 8ae09936c352dfd5a8ddb95182b1afc6 files/digest-dropbear-0.46 67
+MD5 c7d976a23e72e6dce3c022e588def172 files/dropbear-0.46-dbscp.patch 500
diff --git a/net-misc/dropbear/dropbear-0.45.ebuild b/net-misc/dropbear/dropbear-0.45.ebuild
index 0729014a3699..7e377821d438 100644
--- a/net-misc/dropbear/dropbear-0.45.ebuild
+++ b/net-misc/dropbear/dropbear-0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.45.ebuild,v 1.4 2005/07/17 10:05:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.45.ebuild,v 1.5 2005/07/17 11:19:00 solar Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ set_options() {
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 	epatch "${FILESDIR}"/dropbear-0.45-urandom.patch
 }
 
diff --git a/net-misc/dropbear/dropbear-0.46.ebuild b/net-misc/dropbear/dropbear-0.46.ebuild
new file mode 100644
index 000000000000..9dc6a8db5859
--- /dev/null
+++ b/net-misc/dropbear/dropbear-0.46.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.46.ebuild,v 1.1 2005/07/17 11:19:00 solar Exp $
+
+inherit eutils
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/"
+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 ~mips ~ppc ~sparc ~sh ~x86"
+IUSE="minimal multicall pam static zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+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"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/dropbear-0.45-urandom.patch
+	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
+}
+
+src_compile() {
+	local myconf
+	# --disable-syslog? wouldn't need logger in init.d
+	use minimal && myconf="--disable-lastlog"
+	econf ${myconf} $(use_enable zlib) $(use_enable pam) || die
+	set_options
+	emake ${makeopts} PROGRAMS="${progs}" || die "make failed"
+}
+
+src_install() {
+	set_options
+	make install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
+	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 "${D}"/usr/bin
+		local x
+		for x in ${progs} ; do
+			ln -s dropbearmulti ${x}
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}"
+	fi
+
+	mv "${D}"/usr/bin/{,db}scp
+}
diff --git a/net-misc/dropbear/files/digest-dropbear-0.46 b/net-misc/dropbear/files/digest-dropbear-0.46
new file mode 100644
index 000000000000..64c85f11f411
--- /dev/null
+++ b/net-misc/dropbear/files/digest-dropbear-0.46
@@ -0,0 +1 @@
+MD5 f0e535a62b57e5bde9ecba4a11402178 dropbear-0.46.tar.bz2 1413918
diff --git a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
new file mode 100644
index 000000000000..18873f24c5a6
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
@@ -0,0 +1,20 @@
+--- dbmulti.c	2005-07-17 07:00:07.000000000 -0400
++++ dbmulti.c	2005-07-17 06:59:35.000000000 -0400
+@@ -60,7 +60,7 @@
+ 		}
+ #endif
+ #ifdef DBMULTI_scp
+-		if (strcmp(progname, "scp") == 0) {
++		if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) {
+ 			return scp_main(argc, argv);
+ 		}
+ #endif
+@@ -81,7 +81,7 @@
+ 			"'dropbearconvert' - the key converter\n"
+ #endif
+ #ifdef DBMULTI_scp
+-			"'scp' - secure copy\n"
++			"'dbscp' - secure copy\n"
+ #endif
+ 			,
+ 			DROPBEAR_VERSION);