summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-12-22 14:55:31 +0000
committerMike Frysinger <vapier@gentoo.org>2013-12-22 14:55:31 +0000
commit622242d419f3f3e0016f3b4d4d13637a12c569c7 (patch)
tree70a506f75677b4eb883000b8687e4303e55371a4
parentStable for HPPA (bug #493780). (diff)
downloadgentoo-2-622242d419f3f3e0016f3b4d4d13637a12c569c7.tar.gz
gentoo-2-622242d419f3f3e0016f3b4d4d13637a12c569c7.tar.bz2
gentoo-2-622242d419f3f3e0016f3b4d4d13637a12c569c7.zip
Add multicall install fixes to stable version too.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
-rw-r--r--net-misc/dropbear/ChangeLog5
-rw-r--r--net-misc/dropbear/dropbear-2013.60.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 839103fdc1cc..d250801b4152 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,9 @@
# 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.114 2013/12/09 01:25:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.115 2013/12/22 14:55:31 vapier Exp $
+
+ 22 Dec 2013; Mike Frysinger <vapier@gentoo.org> dropbear-2013.60.ebuild:
+ Add multicall install fixes to stable version too.
09 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+files/dropbear-2013.62-multi-install-man.patch,
diff --git a/net-misc/dropbear/dropbear-2013.60.ebuild b/net-misc/dropbear/dropbear-2013.60.ebuild
index ca63c2342ee7..2a2532de75ef 100644
--- a/net-misc/dropbear/dropbear-2013.60.ebuild
+++ b/net-misc/dropbear/dropbear-2013.60.ebuild
@@ -1,6 +1,6 @@
# 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.60.ebuild,v 1.10 2013/12/09 01:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2013.60.ebuild,v 1.11 2013/12/22 14:55:31 vapier Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${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"
+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(+)] )
@@ -39,6 +39,8 @@ set_options() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+ epatch "${FILESDIR}"/${PN}-2013.62-multi-install-man.patch
+ epatch "${FILESDIR}"/${PN}-2013.62-multi-no-relink.patch
sed -i '1i#define _GNU_SOURCE' scpmisc.c || die
sed -i \
-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \