summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/dropbear/ChangeLog10
-rw-r--r--net-misc/dropbear/dropbear-0.52-r1.ebuild96
-rw-r--r--net-misc/dropbear/dropbear-0.52.ebuild5
3 files changed, 107 insertions, 4 deletions
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index f7ca2da64b06..b17fc0948727 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/dropbear
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.77 2009/11/05 16:02:47 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.78 2010/04/20 08:04:34 vapier Exp $
+
+*dropbear-0.52-r1 (20 Apr 2010)
+
+ 20 Apr 2010; Mike Frysinger <vapier@gentoo.org> dropbear-0.52.ebuild,
+ +dropbear-0.52-r1.ebuild:
+ Fix path to xauth #314645 by Jochen Schlick.
05 Nov 2009; Raúl Porcel <armin76@gentoo.org> dropbear-0.52.ebuild:
ia64/m68k/s390/sh/sparc stable wrt #282028
diff --git a/net-misc/dropbear/dropbear-0.52-r1.ebuild b/net-misc/dropbear/dropbear-0.52-r1.ebuild
new file mode 100644
index 000000000000..f022ae037514
--- /dev/null
+++ b/net-misc/dropbear/dropbear-0.52-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52-r1.ebuild,v 1.1 2010/04/20 08:04:34 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 )"
+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":' \
+ -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."
+}
diff --git a/net-misc/dropbear/dropbear-0.52.ebuild b/net-misc/dropbear/dropbear-0.52.ebuild
index 10c42adfbf22..755dc6ee22ea 100644
--- a/net-misc/dropbear/dropbear-0.52.ebuild
+++ b/net-misc/dropbear/dropbear-0.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.9 2009/11/05 16:02:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.52.ebuild,v 1.10 2010/04/20 08:04:34 vapier Exp $
inherit eutils savedconfig pam
@@ -43,6 +43,7 @@ src_unpack() {
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:' \