summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-02-12 15:12:43 +0000
committerMike Frysinger <vapier@gentoo.org>2004-02-12 15:12:43 +0000
commit8911d8c79fc49ed0802a19cf00e971b948467863 (patch)
treeeb8159aa58501ca92a29517dd871b5027eaacb62 /net-misc/openssh
parentBump and cleanup. (diff)
downloadhistorical-8911d8c79fc49ed0802a19cf00e971b948467863.tar.gz
historical-8911d8c79fc49ed0802a19cf00e971b948467863.tar.bz2
historical-8911d8c79fc49ed0802a19cf00e971b948467863.zip
sshv2 and pam config defaults
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/openssh-3.7.1_p2-r2.ebuild17
2 files changed, 14 insertions, 8 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 93fc25b1df2b..392110d21654 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.61 2004/01/10 22:56:42 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.62 2004/02/12 15:12:43 vapier Exp $
+
+ 12 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+ Set Protocol to only allow ssh2 by default #41215 and enable pam if in USE.
10 Jan 2004; Brad House <brad_mssw@gentoo.org> openssh-3.7.1_p2-r2.ebuild:
install doesn't seem to be creating /var/empty
diff --git a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
index b112dfd38937..c1882c1ccd9b 100644
--- a/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.3 2004/01/29 07:05:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2-r2.ebuild,v 1.4 2004/02/12 15:12:43 vapier Exp $
inherit eutils flag-o-matic ccc gnuconfig
-[ `use kerberos` ] && append-flags -I/usr/include/gssapi
# Make it more portable between straight releases
# and _p? releases.
@@ -63,6 +62,8 @@ src_unpack() {
}
src_compile() {
+ use kerberos && append-flags -I/usr/include/gssapi
+
local myconf
# Allow OpenSSH to detect mips systems
@@ -76,10 +77,8 @@ src_compile() {
use ipv6 || myconf="${myconf} --with-ipv4-default"
- use skey && {
- # make sure .sbss is large enough
- use alpha && append-ldflags -mlarge-data
- }
+ # make sure .sbss is large enough
+ use skey && use alpha && append-ldflags -mlarge-data
use selinux && append-flags "-DWITH_SELINUX"
@@ -93,7 +92,9 @@ src_compile() {
--with-privsep-path=/var/empty \
--with-privsep-user=sshd \
--with-md5-passwords \
- --host=${CHOST} ${myconf} || die "bad configure"
+ --host=${CHOST} \
+ ${myconf} \
+ || die "bad configure"
use static && {
# statically link to libcrypto -- good for the boot cd
@@ -110,6 +111,8 @@ src_install() {
insinto /etc/pam.d ; newins ${FILESDIR}/sshd.pam sshd
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
}
pkg_postinst() {