diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-07 03:33:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-07 03:33:26 +0000 |
| commit | 3f49f7c4e0ffb26fcb2c753795663a1779259e58 (patch) | |
| tree | 1521fe4c4f6fa8a4521a883c75d197e633960500 | |
| parent | Add USE=static-libs support #378227 by Agostino Sarubbo. (diff) | |
| download | gentoo-2-3f49f7c4e0ffb26fcb2c753795663a1779259e58.tar.gz gentoo-2-3f49f7c4e0ffb26fcb2c753795663a1779259e58.tar.bz2 gentoo-2-3f49f7c4e0ffb26fcb2c753795663a1779259e58.zip | |
Retain default AuthorizedKeysFile behavior.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.9_p1.ebuild | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 62d76440e06f..1d1664a5b8d2 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.421 2011/09/07 01:38:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.422 2011/09/07 03:33:26 vapier Exp $ + + 07 Sep 2011; Mike Frysinger <vapier@gentoo.org> openssh-5.9_p1.ebuild: + Retain default AuthorizedKeysFile behavior. *openssh-5.9_p1 (07 Sep 2011) diff --git a/net-misc/openssh/openssh-5.9_p1.ebuild b/net-misc/openssh/openssh-5.9_p1.ebuild index 92ebf548fd39..a409f873c17c 100644 --- a/net-misc/openssh/openssh-5.9_p1.ebuild +++ b/net-misc/openssh/openssh-5.9_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1.ebuild,v 1.1 2011/09/07 01:38:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1.ebuild,v 1.2 2011/09/07 03:33:26 vapier Exp $ EAPI="2" inherit eutils flag-o-matic multilib autotools pam @@ -73,6 +73,9 @@ src_prepare() { # this file. cp version.h version.h.pristine + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + if use X509 ; then epatch "${WORKDIR}"/${X509_PATCH%.*} epatch "${FILESDIR}"/${PN}-5.8_p1-x509-hpn-glue.patch |