Disable printing of motd and lastlog when enabling PAM, on the pambase-dependent...

Package-Manager: portage-2.1.4.4

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index b6129be82911de7b4b9791664f763c982b5c5b8c..7f43e12eb9f1839fb33c9f09748b4ff13f3d1f57 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.286 2008/03/06 11:17:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.287 2008/03/14 11:53:30 flameeyes Exp $
+
+  14 Mar 2008; Diego Pettenò <flameeyes@gentoo.org>
+  openssh-4.7_p1-r20.ebuild:
+  Disable printing of motd and lastlog when enabling PAM, on the
+  pambase-dependent ebuild, as system-login takes care of that. Closes bug
+  #213234.
 
   06 Mar 2008; Raúl Porcel <armin76@gentoo.org> openssh-4.7_p1-r20.ebuild:
   Add ~alpha/~ia64 wrt #210777

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 7336db37e9b0229093587b0e48c2d2247f7e68fb..1584052d388775fb6f878d480dae79a06a3797b3 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.0_p1-smartcard-ldap-happy.patch 545 RMD160 2287950de3385bdffaf6af8eec8b355358891ef1 SHA1 8f24acbab71b677b81d5108a85eaf88a208b3b86 SHA256 c6a6f82dd9d5fe34310e2a2bd82558809d28b29cad6e8f0b4a1c3f232ded67be
 AUX openssh-4.3_p1-chroot.patch 1034 RMD160 5971fa1466fd9817a8ec811329a8129fcd651bec SHA1 f580aa1a180397b422193c3ebb4cc69eaa7007a0 SHA256 ccedff9ba82db6782ff80cfcafa6bd1dc754f564e61a4e789b792aaa6b3d4fc3
@@ -42,8 +45,15 @@ EBUILD openssh-4.5_p1-r2.ebuild 5353 RMD160 90bed9edb21391a3be1053e1acfff991bb20
 EBUILD openssh-4.6_p1-r3.ebuild 5392 RMD160 6b065d4828da0f41d04b86742cb7747503c768f5 SHA1 b5252e3251e33bc17f7b42954a068368cb514b97 SHA256 f57567628badaa7f5cd5f3c3e61adfffc1d667dfb06e306b8ca89e4a2c9309c4
 EBUILD openssh-4.6_p1-r4.ebuild 4941 RMD160 3b7c3b3d47c2e67d931535ac15eb5ac8f7595d8e SHA1 671163ec26a3ba32fc28d259a8847d41ab55e380 SHA256 c7b6bbe53c6cc52d2c06fc13019849f3d7ef7f31a92b0665bd6a990d705e5a21
 EBUILD openssh-4.7_p1-r1.ebuild 4844 RMD160 49458284027e44be196bb866590bf16bc26da922 SHA1 672d4b178f5cb2872695b55ef1524a0175f3f4a8 SHA256 71d7bbe1d591a98d7d2c9115d66f0cef11b41f30fddb55ccd719490d45af4116
-EBUILD openssh-4.7_p1-r20.ebuild 4926 RMD160 962d75269b16a2b68122059137f9be77175de74e SHA1 f57de7056a9b73284f4546dc7ed00fa22d524625 SHA256 621b3715cc7e81e65d695dfb90a873e514d8f10c12000ab39e54f59e59e0a291
+EBUILD openssh-4.7_p1-r20.ebuild 5269 RMD160 4fe55e7178b2288dd64276ba8f1c04619d0905f8 SHA1 618d5f7134bb2c5c6108af26af19ae816675ba72 SHA256 0b7b3b4930bdcfbeddf3f1bb5ca3dae61706bfd03e8695c99ba63c8eac483eac
 EBUILD openssh-4.7_p1-r3.ebuild 4915 RMD160 476b83968de74e338684b195fd802a51e5ed41c4 SHA1 ab3ad38c5982893ecca9f8fbd2e2406b01c9406b SHA256 d3bf81a534bd09c6f64050f86cdc16d2322536c8532399b750dbe28ab43b9db3
 EBUILD openssh-4.7_p1-r4.ebuild 4924 RMD160 7b8cf4cd131feecfd333871243233a714e68d91b SHA1 529fa15a45bebb268930ef901173579a3a801d2b SHA256 b566cc678a34530f17f0ef385c47e8867286f6647874e78c03fce995a571e551
-MISC ChangeLog 44844 RMD160 4027bcf014678ed23f360aca8553618b50865224 SHA1 a88f165e0ce659cffefe1ac23c60fe01c74dd00a SHA256 f1d26df3aa404939ed033920f397939a6682dc1dd0118e4b6361ba9ba395bacf
+MISC ChangeLog 45080 RMD160 e507ec1a89858d3b7c123fa0cb2d30f43d19c9d3 SHA1 ba9b1b7b3b3e878c4562381b5e48cad27eeb0a0e SHA256 5056a22189bb6cb16ec6d61f22870f394e6e1b33e80caa58b2a77753e0926ddd
 MISC metadata.xml 1332 RMD160 9f96034724f474db823db616b97f7d00e9e32113 SHA1 e30379335b893109d9e299bd3aa066eb088c59cd SHA256 9fe068bf6625a11848277690f110289f37915a1a2237c3cfb69014fea5226c88
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH2mdYAiZjviIA2XgRAig5AJ4hMIfgHgHPVk3ITG0hgDrkkvG5JACg0+mF
+AQsM2TkHfMxd/Pr3bT/bbPQ=
+=Alec
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-4.7_p1-r20.ebuild b/net-misc/openssh/openssh-4.7_p1-r20.ebuild
index 3c920d06bb34d81571f614faf259f0c303dee2bd..e9f6e6991b4d908ea008a5948dd2d541b036dc32 100644 (file)
--- a/net-misc/openssh/openssh-4.7_p1-r20.ebuild
+++ b/net-misc/openssh/openssh-4.7_p1-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r20.ebuild,v 1.7 2008/03/06 11:17:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r20.ebuild,v 1.8 2008/03/14 11:53:30 flameeyes Exp $
 
 inherit eutils flag-o-matic ccc multilib autotools pam
 
@@ -135,9 +135,18 @@ src_install() {
        keepdir /var/empty
 
        newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-       use pam \
-               && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-               && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
+       if use pam; then
+               # Whenever enabling the pam USE flag, enable PAM support on
+               # the configuration file. Also disable password authentication
+               # and printing of motd and last login. The latter is done to
+               # leave those tasks up to PAM itself, through pambase.
+               sed -i \
+                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
+                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+                       "${D}"/etc/ssh/sshd_config
+       fi
 
        doman contrib/ssh-copy-id.1
        dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config