diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-04-20 08:02:51 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-04-20 08:02:51 +0000 |
commit | f37020fcebade379a3b49ffe22ec42b37ac51b89 (patch) | |
tree | 5995f44119eab85c04f68648ec62386897e91897 /net-misc | |
parent | Add dev-lang/perl to DEPEND, just for correctness. (diff) | |
download | gentoo-2-f37020fcebade379a3b49ffe22ec42b37ac51b89.tar.gz gentoo-2-f37020fcebade379a3b49ffe22ec42b37ac51b89.tar.bz2 gentoo-2-f37020fcebade379a3b49ffe22ec42b37ac51b89.zip |
old
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dropbear/dropbear-0.49.ebuild | 78 | ||||
-rw-r--r-- | net-misc/dropbear/dropbear-0.50-r1.ebuild | 88 | ||||
-rw-r--r-- | net-misc/dropbear/dropbear-0.50.ebuild | 79 | ||||
-rw-r--r-- | net-misc/dropbear/dropbear-0.51.ebuild | 88 | ||||
-rw-r--r-- | net-misc/dropbear/files/dropbear-0.45-urandom.patch | 57 |
5 files changed, 0 insertions, 390 deletions
diff --git a/net-misc/dropbear/dropbear-0.49.ebuild b/net-misc/dropbear/dropbear-0.49.ebuild deleted file mode 100644 index 4985cf822a8d..000000000000 --- a/net-misc/dropbear/dropbear-0.49.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.49.ebuild,v 1.12 2008/12/20 11:05:04 pva Exp $ - -inherit eutils savedconfig - -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.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86" -IUSE="minimal multicall pam static zlib" - -RDEPEND="zlib? ( sys-libs/zlib ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -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() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/dropbear-0.45-urandom.patch - epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch - sed -i \ - -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ - options.h - restore_config options.h -} - -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 ${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 - 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 - save_config options.h - - mv "${D}"/usr/bin/{,db}scp -} diff --git a/net-misc/dropbear/dropbear-0.50-r1.ebuild b/net-misc/dropbear/dropbear-0.50-r1.ebuild deleted file mode 100644 index bfd74a8257b2..000000000000 --- a/net-misc/dropbear/dropbear-0.50-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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.50-r1.ebuild,v 1.9 2008/03/29 04:15:27 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.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~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() { - 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() { - 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.50.ebuild b/net-misc/dropbear/dropbear-0.50.ebuild deleted file mode 100644 index 847f3be0bd10..000000000000 --- a/net-misc/dropbear/dropbear-0.50.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.50.ebuild,v 1.2 2007/10/06 12:28:22 vapier Exp $ - -inherit eutils savedconfig - -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.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -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" - -RDEPEND="zlib? ( sys-libs/zlib ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND}" -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() { - 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 - restore_config options.h -} - -src_compile() { - 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 - - mv "${D}"/usr/bin/{,db}scp || die -} diff --git a/net-misc/dropbear/dropbear-0.51.ebuild b/net-misc/dropbear/dropbear-0.51.ebuild deleted file mode 100644 index d328ed22f307..000000000000 --- a/net-misc/dropbear/dropbear-0.51.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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.51.ebuild,v 1.8 2008/12/07 11:04:47 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.gz - http://matt.ucc.asn.au/dropbear/testing/${P}.tar.gz" - -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() { - 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() { - 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/files/dropbear-0.45-urandom.patch b/net-misc/dropbear/files/dropbear-0.45-urandom.patch deleted file mode 100644 index 10ed9de92b31..000000000000 --- a/net-misc/dropbear/files/dropbear-0.45-urandom.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- dropbear-0.45.orig/options.h 2005-03-08 14:43:07.000000000 -0500 -+++ dropbear-0.45/options.h 2005-03-08 14:44:41.000000000 -0500 -@@ -148,6 +148,10 @@ - /* prngd must be manually set up to produce output */ - /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/ - -+/* If the normal random source would block for a while, fall back to -+ * the urandom source so that connections don't hang forever. */ -+#define DROPBEAR_URANDOM_DEV "/dev/urandom" -+ - /* Specify the number of clients we will allow to be connected but - * not yet authenticated. After this limit, connections are rejected */ - #ifndef MAX_UNAUTH_CLIENTS -diff -ur dropbear-0.45.orig/random.c dropbear-0.45/random.c ---- dropbear-0.45.orig/random.c 2005-03-08 14:43:07.000000000 -0500 -+++ dropbear-0.45/random.c 2005-03-08 14:57:31.000000000 -0500 -@@ -57,9 +57,14 @@ - struct sockaddr_un egdsock; - char egdcmd[2]; - #endif -+ mode_t readmode = O_RDONLY; -+#ifdef DROPBEAR_URANDOM_DEV -+ unsigned int readtries = 0; -+ readmode |= O_NONBLOCK; -+#endif - - #ifdef DROPBEAR_RANDOM_DEV -- readfd = open(DROPBEAR_RANDOM_DEV, O_RDONLY); -+ readfd = open(DROPBEAR_RANDOM_DEV, readmode); - if (readfd < 0) { - dropbear_exit("couldn't open random device"); - } -@@ -97,6 +102,24 @@ - if (readlen < 0 && errno == EINTR) { - continue; - } -+#ifdef DROPBEAR_URANDOM_DEV -+ /* if the main random source blocked, lets retry a few times, -+ * but then give up and try a constant random source. */ -+ if (readlen < 0 && errno == EAGAIN) { -+ ++readtries; -+ if (readtries < 3) { -+ //sleep(0); -+ continue; -+ } else if (readtries == 3) { -+ close (readfd); -+ readfd = open(DROPBEAR_URANDOM_DEV, readmode); -+ if (readfd < 0) { -+ dropbear_exit("couldn't open secondary random device"); -+ } -+ continue; -+ } -+ } -+#endif - dropbear_exit("error reading random source"); - } - readpos += readlen; |