Retain default AuthorizedKeysFile behavior.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 62d76440e06fa5f618cdca5981b1519060b1f95f..1d1664a5b8d2a3f19378b2c2a459f0deb08f2010 100644 (file)
--- 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/Manifest b/net-misc/openssh/Manifest
index 19932e293be3a5c5ea10f2b1d4e9917e43a0624b..652f53792747bc45f680399fa28defce09b04fb0 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -46,13 +46,13 @@ EBUILD openssh-5.6_p1-r2.ebuild 8382 RMD160 f211edf9dca59ceeb04a4b8ed6e65a6fa35a
 EBUILD openssh-5.7_p1-r1.ebuild 8231 RMD160 62b3bb8b59ad675f8e15ee6f3045806eda352258 SHA1 0fc459848cb5bde826647e095666a43598717b57 SHA256 9c5e767344eb2ae35e567dbf870b6adb1e44cc112fe9b89c8f1c5dccf565658f
 EBUILD openssh-5.8_p1-r1.ebuild 8446 RMD160 e674ea00d8be3d9297c2aa5f98f0d4d8e37a360c SHA1 3bafcd521dfc16fc9d6c39e74b4bccf1bef7088d SHA256 4b385808bcf59c3be6ab92c9cea1638c61db7b4c9089f7804f606b08c0fa3aa3
 EBUILD openssh-5.8_p2.ebuild 8480 RMD160 8d931edee1e597fdeb2f3dedc2e13fd81c96b3a2 SHA1 c50d89503ea7b2b6e8c07150f67895950ce39d43 SHA256 244927dfba721ef5f0cf036619e62744a7895879e607834bb601bc5488c2c12e
-EBUILD openssh-5.9_p1.ebuild 8477 RMD160 96ff61cf738672466590773b42d9e1083191431a SHA1 6f8909001d310f24ee446e007df2c99806f18ad8 SHA256 f09c44454dacf3795b18e0f9920b6a4107e5d5da88f0bb2e26b3fe1b0abc446e
-MISC ChangeLog 66335 RMD160 90f30976ff0386c5affb11f9d902dff350dedca8 SHA1 d738e2fcaf231435849d5185c51c84f2cd8673b1 SHA256 1d1b613170b8d365231460446bc697d5c6211abdfdf0df6fb08da0b2d14cf821
+EBUILD openssh-5.9_p1.ebuild 8580 RMD160 f6f6a438f23865f9c1250cc6a1ca15de4820e998 SHA1 4b6a8fd4b51ae9c9750625e44bc8031b43a6ec4b SHA256 20e17ea538144a1908299a55a1cfeb32c7c08b5c575fed9ac82aeacd772d158d
+MISC ChangeLog 66455 RMD160 2c71a625a295ccb67d6eda0f884422b4b10cbb1b SHA1 8ac3862fe56fd395e55f9e095705caf7839d08de SHA256 97f561572ccd28d57f340187ef91aca408198e4ad9fc35721273af3c70ea7fa7
 MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5myzEACgkQaC/OocHi7JZdSwD+Kg+5K7csPV48dBSucq7EYZYg
-t8+KvfjDbzoNn+TDpREA/iayIvzh6P5MH5GM7Mpyp7mA2uPESKkz9DU8i4kQa7VB
-=MynI
+iF4EAREIAAYFAk5m5hIACgkQaC/OocHi7JYcEQD/QKLe5hZ0dibZsw5A2at31Yfd
++lEmbJ4OOI5bdsIEdbkA/jaYvQZwh/j5LGo292GxDW+nHWPTE4Jrn/ZEFa08Jm+O
+=nsC3
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-5.9_p1.ebuild b/net-misc/openssh/openssh-5.9_p1.ebuild
index 92ebf548fd39b171ee0d305e5a15ba2e9290a20e..a409f873c17c776dd83f785618b3ec30ed265a77 100644 (file)
--- 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