use addpredict rather than a patch to handle the skey sandbox violation

Package-Manager: portage-2.0.53_rc6

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b043f01a5bef289e5641b7cc85400f4d4d03af26..2752c28353c7e5f87fd0a4b1f4b6497c6c2b06d7 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -45,11 +45,11 @@ MD5 3af6afd052caef27a0707c9b941d41c6 openssh-3.8.1_p1-r1.ebuild 4407
 MD5 007223c0520d91c52557714c4bc6b0ca openssh-3.9_p1-r3.ebuild 5010
 MD5 f57b335cd90d3ec4233a98c6617dce3b openssh-4.0_p1-r2.ebuild 5362
 MD5 6a8c34205a609252e4811a9ff5fbb8bf openssh-4.1_p1-r1.ebuild 5323
-MD5 da3c2285f1201b47e97a6ae506fb839a openssh-4.2_p1.ebuild 5273
+MD5 949e94179fedf55aff0863c52f3f9051 openssh-4.2_p1.ebuild 5274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDWYHzgIKl8Uu19MoRAlIQAJ46vJQgEpYnptZq3vDL5xw4ayCbUwCdHKdQ
-iSzHTQFHx/qyU/tWX56477c=
-=GtnT
+iD8DBQFDWdaFgIKl8Uu19MoRAkxDAJ9pNOoS/cAkbXcdB37r1P/evUN7UgCeNCpk
+wLCMdmyBJVXchxwp7b8vitg=
+=c4sy
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild
index 5a6ec4f3759c226a4887ede3ec58b51bc97d6088..88f557e2066a98f926ed13e1bc51134fbf5f2a4e 100644 (file)
--- 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