Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-misc/dropbear/ChangeLog7
-rw-r--r--net-misc/dropbear/dropbear-2012.55.ebuild97
-rw-r--r--net-misc/dropbear/dropbear-2013.56.ebuild100
-rw-r--r--net-misc/dropbear/dropbear-2013.57.ebuild100
-rw-r--r--net-misc/dropbear/dropbear-2013.58.ebuild100
-rw-r--r--net-misc/dropbear/files/dropbear-0.53.1-link.patch41
6 files changed, 6 insertions, 439 deletions
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index d250801b4152..d615a9259928 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/dropbear
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.115 2013/12/22 14:55:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.116 2013/12/31 04:08:14 radhermit Exp $
+
+ 31 Dec 2013; Tim Harder <radhermit@gentoo.org> -dropbear-2012.55.ebuild,
+ -dropbear-2013.56.ebuild, -dropbear-2013.57.ebuild, -dropbear-2013.58.ebuild,
+ -files/dropbear-0.53.1-link.patch:
+ Remove old, vulnerable versions (bug #487682).
22 Dec 2013; Mike Frysinger <vapier@gentoo.org> dropbear-2013.60.ebuild:
Add multicall install fixes to stable version too.
diff --git a/net-misc/dropbear/dropbear-2012.55.ebuild b/net-misc/dropbear/dropbear-2012.55.ebuild
deleted file mode 100644
index 73d18caef1f7..000000000000
--- a/net-misc/dropbear/dropbear-2012.55.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild,v 1.12 2012/08/12 03:56:20 vapier Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-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 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- 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_configure() {
- econf \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable syslog)
-}
-
-src_compile() {
- set_options
- emake ${makeopts[@]} PROGRAMS="${progs[*]}"
-}
-
-src_install() {
- set_options
- emake install DESTDIR="${D}" ${makeopts[@]} PROGRAMS="${progs[*]}"
- 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 "${ED}"/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 "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2013.56.ebuild b/net-misc/dropbear/dropbear-2013.56.ebuild
deleted file mode 100644
index b53e0db53b01..000000000000
--- a/net-misc/dropbear/dropbear-2013.56.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.56.ebuild,v 1.1 2013/03/23 07:08:35 vapier Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-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 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
- sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- 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_configure() {
- econf \
- --disable-bundled-libtom \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-src_compile() {
- set_options
- emake ${makeopts[@]} PROGRAMS="${progs[*]}"
-}
-
-src_install() {
- set_options
- emake install DESTDIR="${D}" ${makeopts[@]} PROGRAMS="${progs[*]}"
- 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 "${ED}"/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 "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2013.57.ebuild b/net-misc/dropbear/dropbear-2013.57.ebuild
deleted file mode 100644
index d66bfba0d0d5..000000000000
--- a/net-misc/dropbear/dropbear-2013.57.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.57.ebuild,v 1.1 2013/04/15 19:55:18 vapier Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-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 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
- sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- 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_configure() {
- econf \
- --disable-bundled-libtom \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-src_compile() {
- set_options
- emake ${makeopts[@]} PROGRAMS="${progs[*]}"
-}
-
-src_install() {
- set_options
- emake install DESTDIR="${D}" ${makeopts[@]} PROGRAMS="${progs[*]}"
- 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 "${ED}"/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 "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2013.58.ebuild b/net-misc/dropbear/dropbear-2013.58.ebuild
deleted file mode 100644
index d56f6387673d..000000000000
--- a/net-misc/dropbear/dropbear-2013.58.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.58.ebuild,v 1.1 2013/04/18 16:50:30 vapier Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig pam user
-
-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 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
- dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
- progs=(
- dropbear dbclient dropbearkey
- $(usex minimal "" "dropbearconvert scp")
- )
- makeopts=(
- MULTI=$(usex multicall 1 0)
- STATIC=$(usex static 1 0)
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
- sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
- 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_configure() {
- econf \
- --disable-bundled-libtom \
- $(use_enable zlib) \
- $(use_enable pam) \
- $(use_enable !bsdpty openpty) \
- $(use_enable shadow) \
- $(use_enable syslog)
-}
-
-src_compile() {
- set_options
- emake ${makeopts[@]} PROGRAMS="${progs[*]}"
-}
-
-src_install() {
- set_options
- emake install DESTDIR="${D}" ${makeopts[@]} PROGRAMS="${progs[*]}"
- 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 "${ED}"/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 "${ED}"/usr/bin/{,db}scp || die
- fi
-
- pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/files/dropbear-0.53.1-link.patch b/net-misc/dropbear/files/dropbear-0.53.1-link.patch
deleted file mode 100644
index 99a015ab385b..000000000000
--- a/net-misc/dropbear/files/dropbear-0.53.1-link.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-http://bugs.gentoo.org/357249
-
-fix from upstream
-
-#
-# old_revision [c7f6c45c46a2f8e2394756c68ae825d6e4dc7489]
-#
-# patch "Makefile.in"
-# from [ea21753734b01f01ea1062923f4cb5eac65eadec]
-# to [3dcc9b69742a8a4f59ea9f22b6d80bad2c761117]
-#
-============================================================
---- Makefile.in ea21753734b01f01ea1062923f4cb5eac65eadec
-+++ Makefile.in 3dcc9b69742a8a4f59ea9f22b6d80bad2c761117
-@@ -28,7 +28,7 @@ COMMONOBJS=dbutil.o buffer.o \
- queue.o \
- atomicio.o compat.o fake-rfc2553.o
-
--SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
-+SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
- svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
- svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
- svr-tcpfwd.o svr-authpam.o
-@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
- loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
- listener.h fake-rfc2553.h
-
--dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
-+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
- dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
- dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
- dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -167,7 +167,7 @@ ifeq ($(MULTI),1)
- # multi-binary compilation.
- MULTIOBJS=
- ifeq ($(MULTI),1)
-- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
-+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@
- CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
- endif
-