summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-22 06:04:32 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-22 06:04:32 +0000
commit5d9e89a9ffe9890520e591b8b047de6ec9049b0d (patch)
tree8476e9905c289679123dbbb1d29a78086affc338 /net-misc/openssh
parentadd back fixes to use posix -P with cp instead of gnu -d (diff)
downloadgentoo-2-5d9e89a9ffe9890520e591b8b047de6ec9049b0d.tar.gz
gentoo-2-5d9e89a9ffe9890520e591b8b047de6ec9049b0d.tar.bz2
gentoo-2-5d9e89a9ffe9890520e591b8b047de6ec9049b0d.zip
use addpredict rather than a patch to handle the skey sandbox violation
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/openssh-4.2_p1.ebuild7
1 files changed, 3 insertions, 4 deletions
diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild
index 5a6ec4f3759c..88f557e2066a 100644
--- a/net-misc/openssh/openssh-4.2_p1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1.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/openssh/openssh-4.2_p1.ebuild,v 1.11 2005/10/22 00:03:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.12 2005/10/22 06:04:32 vapier Exp $
inherit eutils flag-o-matic ccc pam
@@ -56,7 +56,6 @@ src_unpack() {
use X509 && epatch "${DISTDIR}"/${X509_PATCH}
use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
- use skey && epatch "${FILESDIR}"/openssh-3.9_p1-skey.patch.bz2
use chroot && epatch "${FILESDIR}"/openssh-3.9_p1-chroot.patch
epatch "${FILESDIR}"/openssh-4.2_p1-selinux.patch
use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch.bz2
@@ -81,10 +80,10 @@ src_unpack() {
}
src_compile() {
- local myconf
-
addwrite /dev/ptmx
+ addpredict /etc/skey/skeykeys #skey configure code triggers this
+ local myconf
# make sure .sbss is large enough
use skey && use alpha && append-ldflags -mlarge-data
if use ldap ; then