diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-11-16 05:11:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-11-16 05:11:12 +0000 |
| commit | a382f6dc2921b170575c6e444fb975531cbbdcc0 (patch) | |
| tree | 73281bed33c4ffac8bc273622247330fabaf76ca | |
| parent | Fix the buildcsr demo target to use the correct linking flags #71194. (diff) | |
| download | historical-a382f6dc2921b170575c6e444fb975531cbbdcc0.tar.gz historical-a382f6dc2921b170575c6e444fb975531cbbdcc0.tar.bz2 historical-a382f6dc2921b170575c6e444fb975531cbbdcc0.zip | |
If USE=pam, then disable PasswordAuthentication since PAM overrides it #71233.
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/Manifest | 14 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-3.9_p1.ebuild | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 8d8a0361f88b..4e4f7ab9f5b3 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.102 2004/09/18 15:18:24 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.103 2004/11/16 05:11:12 vapier Exp $ + + 16 Nov 2004; Mike Frysinger <vapier@gentoo.org> openssh-3.9_p1.ebuild: + If USE=pam, then disable PasswordAuthentication since PAM overrides it #71233. 14 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> openssh-3.9_p1.ebuild, files/openssh-3.9_p1-fix_suid.patch.bz2: diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index e5cf1e9b969b..514b7e896916 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 5b82460b0bc341721db791733ca49b61 ChangeLog 17190 +MD5 4c036ee248fdf0dd7157545e36a83003 ChangeLog 17347 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 MD5 aec43e5b3a4401a4acb51363c755a729 openssh-3.7.1_p2-r1.ebuild 4113 MD5 a028e2299c7750ee138516c268f1eeec openssh-3.7.1_p2-r2.ebuild 4644 @@ -9,7 +6,7 @@ MD5 f80730dd66dcef312979858e358615e7 openssh-3.8.1_p1.ebuild 4064 MD5 2358cb06c79fcfc3c2cde9444309a324 openssh-3.8_p1.ebuild 4241 MD5 12097112d6d6bf07220294da6c6d5d29 openssh-3.8.1_p1-r1.ebuild 4242 MD5 b4353850fbc9705f26093f98055cfc69 openssh-3.8.1_p1-r2.ebuild 4266 -MD5 be7434eabb07a1ae37fcaf793711321c openssh-3.9_p1.ebuild 4326 +MD5 e9523dae352f6d0b78f1574f05df7f74 openssh-3.9_p1.ebuild 4425 MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r2 142 MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142 MD5 7880e18b2a91e5927810dddc7bda270f files/openssh-3.7.1_p1-selinux.diff.bz2 1353 @@ -43,10 +40,3 @@ MD5 6905aafd16d110e8e8b74cad4914ceb7 files/openssh-3.8.1_p1-largekey.patch.bz2 1 MD5 6c92c72a7cbec59eed493e728d14ad3c files/openssh-3.8.1p1-sftplogging-1.2-gentoo.patch.bz2 6164 MD5 328a5f063659ddb400d21201feb92170 files/openssh-3.9_p1-opensc.patch.bz2 1381 MD5 93d19c0ef91091a730510c46ab8e811e files/openssh-3.9_p1-selinux.diff.bz2 1307 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBiZj6HTu7gpaalycRAqKvAJ9d1swqG3c7if8GY5vPAHsbQSyL/QCeO5qS -P9Hd+SksqhIOeED2QOGcZU8= -=hrOQ ------END PGP SIGNATURE----- diff --git a/net-misc/openssh/openssh-3.9_p1.ebuild b/net-misc/openssh/openssh-3.9_p1.ebuild index 1b5c8f8dadb2..d05da329d65d 100644 --- a/net-misc/openssh/openssh-3.9_p1.ebuild +++ b/net-misc/openssh/openssh-3.9_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.7 2004/11/04 02:49:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1.ebuild,v 1.8 2004/11/16 05:11:12 vapier Exp $ inherit eutils flag-o-matic ccc gnuconfig @@ -115,7 +115,9 @@ src_install() { exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd keepdir /var/empty dosed "/^#Protocol /s:.*:Protocol 2:" /etc/ssh/sshd_config - use pam && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config + use pam \ + && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \ + && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config } pkg_postinst() { |