diff options
author | Daniel Ahlberg <aliz@gentoo.org> | 2003-04-30 16:42:44 +0000 |
---|---|---|
committer | Daniel Ahlberg <aliz@gentoo.org> | 2003-04-30 16:42:44 +0000 |
commit | 6f0fce6c1810c2428a8b96df44e0dedb49eed1b6 (patch) | |
tree | f71f8db17bde38a978fe10e0c9a815f31283d7c2 | |
parent | version bump (diff) | |
download | gentoo-2-6f0fce6c1810c2428a8b96df44e0dedb49eed1b6.tar.gz gentoo-2-6f0fce6c1810c2428a8b96df44e0dedb49eed1b6.tar.bz2 gentoo-2-6f0fce6c1810c2428a8b96df44e0dedb49eed1b6.zip |
Security update
-rw-r--r-- | net-misc/openssh/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/openssh/files/digest-openssh-3.6.1_p2 | 2 | ||||
-rw-r--r-- | net-misc/openssh/openssh-3.6.1_p2.ebuild | 136 |
3 files changed, 144 insertions, 1 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 9f3bd87de015..c2db2dc718a3 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/openssh # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.38 2003/04/02 18:47:31 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.39 2003/04/30 16:42:44 aliz Exp $ + +*openssh-3.6.1_p2 (30 Apr 2003) + + 30 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.6.1_p2.ebuild : + Security update. *openssh-3.6.1_p1 (02 Apr 2003) diff --git a/net-misc/openssh/files/digest-openssh-3.6.1_p2 b/net-misc/openssh/files/digest-openssh-3.6.1_p2 new file mode 100644 index 000000000000..7576198e5d33 --- /dev/null +++ b/net-misc/openssh/files/digest-openssh-3.6.1_p2 @@ -0,0 +1,2 @@ +MD5 f3879270bffe479e1bd057aa36258696 openssh-3.6.1p2.tar.gz 879629 +MD5 c425e65927b359382bf3618d265d45f1 openssh_3.6p1-5.se1.diff.bz2 54985 diff --git a/net-misc/openssh/openssh-3.6.1_p2.ebuild b/net-misc/openssh/openssh-3.6.1_p2.ebuild new file mode 100644 index 000000000000..bae06de45a1d --- /dev/null +++ b/net-misc/openssh/openssh-3.6.1_p2.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.6.1_p2.ebuild,v 1.1 2003/04/30 16:42:44 aliz Exp $ + +inherit eutils + +IUSE="ipv6 static pam tcpd kerberos selinux" + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_/} +S=${WORKDIR}/${PARCH} +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="ftp://ftp.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/${PARCH}.tar.gz + selinux? http://lostlogicx.com/gentoo/openssh_3.6p1-5.se1.diff.bz2" + +# openssh recognizes when openssl has been slightly upgraded and refuses to run. +# This new rev will use the new openssl. +RDEPEND="virtual/glibc + pam? ( >=sys-libs/pam-0.73 >=sys-apps/shadow-4.0.2-r2 ) + kerberos? ( app-crypt/krb5 ) + selinux? ( sys-apps/selinux-small ) + >=dev-libs/openssl-0.9.6d + sys-libs/zlib" + +DEPEND="${RDEPEND} + dev-lang/perl + sys-apps/groff + tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" + + +SLOT="0" +LICENSE="as-is" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa arm" + +src_unpack() { + unpack ${PARCH}.tar.gz + cd ${S} + use selinux && epatch ${DISTDIR}/openssh_3.6p1-5.se1.diff.bz2 + + if [ `use alpha` ]; then + epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch || die + fi +} + +src_compile() { + local myconf + use tcpd || myconf="${myconf} --without-tcp-wrappers" + use tcpd && myconf="${myconf} --with-tcp-wrappers" + use pam || myconf="${myconf} --without-pam" + use pam && myconf="${myconf} --with-pam" + use ipv6 || myconf="${myconf} --with-ipv4-default" + + # app-crypt/krb5 + use kerberos && myconf="${myconf} --with-kerberos5" + + # app-crypt/kth-krb + # KTH's implementation of kerberos IV + # KTH_KRB="yes" emerge openssh-3.5_p1-r1.ebuild + if [ ! -z $KTH_KRB ]; then + myconf="${myconf} --with-kerberos4=/usr/athena" + fi + + use selinux && CFLAGS="${CFLAGS} -DWITH_SELINUX" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/ssh \ + --mandir=/usr/share/man \ + --libexecdir=/usr/lib/misc \ + --datadir=/usr/share/openssh \ + --disable-suid-ssh \ + --with-privsep-path=/var/empty \ + --with-privsep-user=sshd \ + --with-md5-passwords \ + --host=${CHOST} ${myconf} || die "bad configure" + + if [ "`use static`" ] + then + # statically link to libcrypto -- good for the boot cd + perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile + fi + + if [ "`use selinux`" ] + then + #add -lsecure + sed "s:LIBS=\(.*\):LIBS=\1 -lsecure:" < Makefile > Makefile.new + mv Makefile.new Makefile + fi + + emake || die "compile problem" +} + +src_install() { + make install-files DESTDIR=${D} || die + chmod 600 ${D}/etc/ssh/sshd_config + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + insinto /etc/pam.d ; newins ${FILESDIR}/sshd.pam sshd + exeinto /etc/init.d ; newexe ${FILESDIR}/sshd.rc6 sshd + touch ${D}/var/empty/.keep +} + +pkg_preinst() { + + userdel sshd 2> /dev/null + if ! groupmod sshd; then + groupadd -g 90 sshd 2> /dev/null || \ + die "Failed to create sshd group" + fi + useradd -u 22 -g sshd -s /dev/null -d /var/empty -c "sshd" sshd || \ + die "Failed to create sshd user" + +} + +pkg_postinst() { + + # empty dir for the new priv separation auth chroot.. + install -d -m0755 -o root -g root ${ROOT}/var/empty + + einfo + einfo "Remember to merge your config files in /etc/ssh!" + einfo "As of version 3.4 the default is to enable the UsePrivelegeSeparation" + einfo "functionality, but please ensure that you do not explicitly disable" + einfo "this in your configuration as disabling it opens security holes" + einfo + einfo "This revision has removed your sshd user id and replaced it with a" + einfo "new one with UID 22. If you have any scripts or programs that" + einfo "that referenced the old UID directly, you will need to update them." + einfo + if use pam >/dev/null 2>&1; then + einfo "Please be aware users need a valid shell in /etc/passwd" + einfo "in order to be allowed to login." + einfo + fi +} |