summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2003-09-23 16:46:21 +0000
committerNed Ludd <solar@gentoo.org>2003-09-23 16:46:21 +0000
commitb02f316f21d884a8f6f8eba65c7e4d9ffeaa95fd (patch)
tree18f8543b950dbd706fb3f4036c007efe60c106d2 /net-misc
parentset ppc in keywords (diff)
downloadgentoo-2-b02f316f21d884a8f6f8eba65c7e4d9ffeaa95fd.tar.gz
gentoo-2-b02f316f21d884a8f6f8eba65c7e4d9ffeaa95fd.tar.bz2
gentoo-2-b02f316f21d884a8f6f8eba65c7e4d9ffeaa95fd.zip
according to the ChangeLog for openssh =zlib-1.1.4 is a must now. Note: openssh needs a X509 patch made upstream for p2
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/Manifest4
-rw-r--r--net-misc/openssh/openssh-3.7.1_p2.ebuild12
3 files changed, 12 insertions, 10 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index c903c4f71df9..86d1fd1764f5 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# 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.52 2003/09/23 16:11:55 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.53 2003/09/23 16:46:17 solar Exp $
+
+ 23 Sep 2003; <solar@gentoo.org> openssh-3.7.1_p2.ebuild:
+ according to the ChangeLog for openssh =zlib-1.1.4 is a must now. Note:
+ openssh needs a X509 patch made upstream for p2
*openssh-3.7.1_p2 (23 Sep 2003)
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index c476245b19f1..19ff3b35e5e3 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -2,12 +2,12 @@ MD5 bf8c9e2ff963deb77f7dd8adf7ad2037 openssh-3.5_p1-r1.ebuild 3932
MD5 3c2bbd03a745c1e0b2a5e4a6e600b030 openssh-3.6.1_p2-r1.ebuild 4148
MD5 564d864226cf89ea6396748305042fd9 openssh-3.6.1_p2-r2.ebuild 4204
MD5 9da5e02603f79633fe36e2337d4ae626 openssh-3.6.1_p2-r3.ebuild 4488
-MD5 ca41d40ed4232add12ba8dcdcc9607ba ChangeLog 8385
+MD5 5a3e4fd0a1dce8e747decbad831e1354 ChangeLog 8569
MD5 a50daec66d75cc8248da65d91269b359 openssh-3.6.1_p2.ebuild 3948
MD5 6f9d1a7a3d8d84a099f9e8ae724cd750 openssh-3.7.1_p1.ebuild 4665
MD5 baa93c0bb81792f293041775106cda3d openssh-3.7.1_p1-r1.ebuild 4279
MD5 b95ca58a06be4f68640911f9e64a8c95 openssh-3.7_p1.ebuild 4479
-MD5 6eeb6807efa782e519055078cc397682 openssh-3.7.1_p2.ebuild 4289
+MD5 9be30a5cd53dd7295ba1ccf0ecdaa533 openssh-3.7.1_p2.ebuild 4207
MD5 f2472f97f00f203eee538d04a25acac5 files/digest-openssh-3.5_p1-r1 136
MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315
MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
diff --git a/net-misc/openssh/openssh-3.7.1_p2.ebuild b/net-misc/openssh/openssh-3.7.1_p2.ebuild
index c91c14c41b1d..c1461f217ce1 100644
--- a/net-misc/openssh/openssh-3.7.1_p2.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p2.ebuild
@@ -1,6 +1,6 @@
# 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.7.1_p2.ebuild,v 1.1 2003/09/23 16:11:55 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2.ebuild,v 1.2 2003/09/23 16:46:17 solar Exp $
inherit eutils flag-o-matic ccc
[ `use kerberos` ] && append-flags -I/usr/include/gssapi
@@ -29,7 +29,7 @@ RDEPEND="virtual/glibc
selinux? ( sys-apps/selinux-small )
skey? ( app-admin/skey )
>=dev-libs/openssl-0.9.6d
- sys-libs/zlib
+ >=sys-libs/zlib-1.1.4
>=sys-apps/sed-4"
DEPEND="${RDEPEND}
@@ -46,11 +46,9 @@ src_unpack() {
use selinux && epatch ${DISTDIR}/${SELINUX_PATCH}
use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch
- use X509 && epatch ${DISTDIR}/${X509_PATCH}
-
- # epatch ${FILESDIR}/${P}-connect-timeout.patch
- # epatch ${FILESDIR}/${P}-double-free.patch
- # epatch ${FILESDIR}/${P}-memory-leak.patch
+ # use X509 && epatch ${DISTDIR}/${X509_PATCH}
+
+ # looks like this one was rewriten somewhat.
# epatch ${FILESDIR}/${P}-memory-bugs.patch
use skey && {