From 4659a2af32ba0e392bf838d0cf3c54f6dadbbc7b Mon Sep 17 00:00:00 2001 From: Gustavo Felisberto Date: Wed, 10 Oct 2007 13:51:28 +0000 Subject: new revision that fixes #168584 (Portage version: 2.1.3.9) --- net-misc/ssh/ChangeLog | 8 +++- net-misc/ssh/files/digest-ssh-3.2.9.1-r1 | 3 -- net-misc/ssh/files/digest-ssh-3.2.9.1-r2 | 3 ++ net-misc/ssh/files/sshfilexfers.diff | 21 +++++++++++ net-misc/ssh/ssh-3.2.9.1-r1.ebuild | 62 ------------------------------- net-misc/ssh/ssh-3.2.9.1-r2.ebuild | 64 ++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 66 deletions(-) delete mode 100644 net-misc/ssh/files/digest-ssh-3.2.9.1-r1 create mode 100644 net-misc/ssh/files/digest-ssh-3.2.9.1-r2 create mode 100644 net-misc/ssh/files/sshfilexfers.diff delete mode 100644 net-misc/ssh/ssh-3.2.9.1-r1.ebuild create mode 100644 net-misc/ssh/ssh-3.2.9.1-r2.ebuild (limited to 'net-misc/ssh') diff --git a/net-misc/ssh/ChangeLog b/net-misc/ssh/ChangeLog index d1b3bc15f54a..832ad1fe5415 100644 --- a/net-misc/ssh/ChangeLog +++ b/net-misc/ssh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/ssh # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.15 2007/07/22 08:14:11 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ChangeLog,v 1.16 2007/10/10 13:51:28 humpback Exp $ + +*ssh-3.2.9.1-r2 (10 Oct 2007) + + 10 Oct 2007; Gustavo Felisberto + +files/sshfilexfers.diff, -ssh-3.2.9.1-r1.ebuild, +ssh-3.2.9.1-r2.ebuild: + Removed older version and added new revision that fixes #168584. 22 Jul 2007; Donnie Berkholz ; ssh-3.2.9.1-r1.ebuild: diff --git a/net-misc/ssh/files/digest-ssh-3.2.9.1-r1 b/net-misc/ssh/files/digest-ssh-3.2.9.1-r1 deleted file mode 100644 index a642df21236c..000000000000 --- a/net-misc/ssh/files/digest-ssh-3.2.9.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f3ed49f13419d97dc1d0d3bfb4bb99bf ssh-3.2.9.1.tar.gz 2269281 -RMD160 21bfe97fae477dea1109c6e6eb44a448b6b2f250 ssh-3.2.9.1.tar.gz 2269281 -SHA256 9d989fa1d99e2c95bd8a9dbf73b9495fc831061b8b6a951effd4c1bb1902a373 ssh-3.2.9.1.tar.gz 2269281 diff --git a/net-misc/ssh/files/digest-ssh-3.2.9.1-r2 b/net-misc/ssh/files/digest-ssh-3.2.9.1-r2 new file mode 100644 index 000000000000..a642df21236c --- /dev/null +++ b/net-misc/ssh/files/digest-ssh-3.2.9.1-r2 @@ -0,0 +1,3 @@ +MD5 f3ed49f13419d97dc1d0d3bfb4bb99bf ssh-3.2.9.1.tar.gz 2269281 +RMD160 21bfe97fae477dea1109c6e6eb44a448b6b2f250 ssh-3.2.9.1.tar.gz 2269281 +SHA256 9d989fa1d99e2c95bd8a9dbf73b9495fc831061b8b6a951effd4c1bb1902a373 ssh-3.2.9.1.tar.gz 2269281 diff --git a/net-misc/ssh/files/sshfilexfers.diff b/net-misc/ssh/files/sshfilexfers.diff new file mode 100644 index 000000000000..cb6133c7bebf --- /dev/null +++ b/net-misc/ssh/files/sshfilexfers.diff @@ -0,0 +1,21 @@ +--- lib/sshfilexfer/sshfilexfers.c.orig 2003-12-03 15:17:22.000000000 +0200 ++++ lib/sshfilexfer/sshfilexfers.c 2006-02-22 10:44:25.000000000 +0200 +@@ -5,7 +5,7 @@ + Authors: Tatu Ylonen + Sami Lehtinen + +- Copyright (c) 1998-2001 SSH Communications Security Corp, Finland ++ Copyright (c) 1998-2001, 2006 SSH Communications Security Corp, Finland + All rights reserved + + Generic file transfer module, server side. +@@ -115,7 +115,8 @@ + if (server->log_facility >= 0) \ + { \ + char *msg = ssh_debug_format varcall; \ +- ssh_log_event(det_fac(category, server->log_facility), severity, msg); \ ++ ssh_log_event(det_fac(category, server->log_facility), severity, \ ++ "%s", msg); \ + ssh_xfree(msg); \ + } \ + } while (0) diff --git a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild b/net-misc/ssh/ssh-3.2.9.1-r1.ebuild deleted file mode 100644 index 17ac058a7044..000000000000 --- a/net-misc/ssh/ssh-3.2.9.1-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r1.ebuild,v 1.5 2007/07/22 08:14:11 dberkholz Exp $ - -inherit eutils pam - -DESCRIPTION="SSH.COM free for Non-Commercial Use ssh version" -HOMEPAGE="http://www.ssh.com/" -SRC_URI="ftp://ftp.ssh.com/pub/ssh/${P}.tar.gz" - -LICENSE="ssh" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="X ipv6 crypt openssh" - -RDEPEND="X? ( x11-libs/libSM - x11-libs/libXext ) - !openssh? ( !virtual/ssh )" -DEPEND="${RDEPEND} - X? ( x11-proto/xextproto )" -PROVIDE="virtual/ssh" - -pkg_setup() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}" - epatch "${FILESDIR}"/patch-readline.diff -} - -src_compile() { - econf \ - $(use_with ipv6 ipv6) \ - $(use_with X) \ - $(use_with crypt gpg) \ - || die "configure failed" - make || die "make failed" -} - -src_install() { - # TODO: fix this crap which messes with $ROOT - if [ -e ${ROOT}/etc/ssh2/hostkey ] ; then - # this keeps the install from generating these keys again - insinto /etc/ssh2 - doins ${ROOT}/etc/ssh2/hostkey{,.pub} - fperms go-rwx /etc/ssh2/hostkey - fi - #this is ugly but helps on some problems on fresh installs see bug #57915 - addwrite /root/.ssh2 - make install DESTDIR=${D} || die "install failed" - chmod 600 ${D}/etc/ssh2/sshd2_config - dodoc CHANGES FAQ HOWTO.anonymous.sftp README* SSH2.QUICKSTART - - newpamd "${FILESDIR}"/pamd.sshd2 sshd2 - newinitd "${FILESDIR}"/sshd2 sshd2 - - cd "${D}"/usr - use openssh && find bin sbin share/man -type l -exec rm '{}' \; -} diff --git a/net-misc/ssh/ssh-3.2.9.1-r2.ebuild b/net-misc/ssh/ssh-3.2.9.1-r2.ebuild new file mode 100644 index 000000000000..82b5dbef4646 --- /dev/null +++ b/net-misc/ssh/ssh-3.2.9.1-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh/ssh-3.2.9.1-r2.ebuild,v 1.1 2007/10/10 13:51:28 humpback Exp $ + +inherit eutils pam + +DESCRIPTION="SSH.COM free for Non-Commercial Use ssh version" +HOMEPAGE="http://www.ssh.com/" +SRC_URI="ftp://ftp.ssh.com/pub/ssh/${P}.tar.gz" + +LICENSE="ssh" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X ipv6 crypt openssh" + +RDEPEND="X? ( x11-libs/libSM + x11-libs/libXext ) + !openssh? ( !virtual/ssh )" +DEPEND="${RDEPEND} + X? ( x11-proto/xextproto )" +PROVIDE="virtual/ssh" + +pkg_setup() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +src_unpack() { + unpack ${A} + cd "${WORKDIR}" + epatch "${FILESDIR}"/patch-readline.diff + cd "${S}" + epatch "${FILESDIR}"/sshfilexfers.diff +} + +src_compile() { + econf \ + $(use_with ipv6 ipv6) \ + $(use_with X) \ + $(use_with crypt gpg) \ + || die "configure failed" + make || die "make failed" +} + +src_install() { + # TODO: fix this crap which messes with $ROOT + if [ -e ${ROOT}/etc/ssh2/hostkey ] ; then + # this keeps the install from generating these keys again + insinto /etc/ssh2 + doins ${ROOT}/etc/ssh2/hostkey{,.pub} + fperms go-rwx /etc/ssh2/hostkey + fi + #this is ugly but helps on some problems on fresh installs see bug #57915 + addwrite /root/.ssh2 + make install DESTDIR=${D} || die "install failed" + chmod 600 ${D}/etc/ssh2/sshd2_config + dodoc CHANGES FAQ HOWTO.anonymous.sftp README* SSH2.QUICKSTART + + newpamd "${FILESDIR}"/pamd.sshd2 sshd2 + newinitd "${FILESDIR}"/sshd2 sshd2 + + cd "${D}"/usr + use openssh && find bin sbin share/man -type l -exec rm '{}' \; +} -- cgit v1.2.3-65-gdbad