summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2003-09-30 17:49:28 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2003-09-30 17:49:28 +0000
commitd57df74bbb199e68b3f6a8ab0d63ce0cdba99662 (patch)
tree91603578f940d11ccba1a202e30e1d99aafd5ede /net-misc/openssh
parentClosing #29664 (diff)
downloadgentoo-2-d57df74bbb199e68b3f6a8ab0d63ce0cdba99662.tar.gz
gentoo-2-d57df74bbb199e68b3f6a8ab0d63ce0cdba99662.tar.bz2
gentoo-2-d57df74bbb199e68b3f6a8ab0d63ce0cdba99662.zip
Closing #29664
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/Manifest4
-rw-r--r--net-misc/openssh/files/digest-openssh-3.7.1_p21
-rw-r--r--net-misc/openssh/openssh-3.7.1_p2.ebuild10
4 files changed, 12 insertions, 8 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 86d1fd1764f5..8fa98bda37e1 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# 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.53 2003/09/23 16:46:17 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.54 2003/09/30 17:49:24 aliz Exp $
+
+ 30 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p2.ebuild :
+ Add X509 patch back in, closes #29664.
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:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 38a86a6e08f6..d9ef7a1c31f6 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,7 +1,7 @@
-MD5 5a3e4fd0a1dce8e747decbad831e1354 ChangeLog 8569
+MD5 504ad7df05ca6fd1502a9e09c789f3f9 ChangeLog 8684
MD5 1a78187fa0276dd70838221652de9904 openssh-3.5_p1-r1.ebuild 3952
MD5 7da0d74da62cb106957c26ad08235c30 openssh-3.6.1_p2.ebuild 3968
-MD5 e17df16a37ed18c5b87141431423703f openssh-3.7.1_p2.ebuild 4175
+MD5 f0fd721647f9585bce6cc709b7a69411 openssh-3.7.1_p2.ebuild 4173
MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329
MD5 f2472f97f00f203eee538d04a25acac5 files/digest-openssh-3.5_p1-r1 136
MD5 3d26d49ccd595bca906f540f5d8b8c31 files/digest-openssh-3.6.1_p2 139
diff --git a/net-misc/openssh/files/digest-openssh-3.7.1_p2 b/net-misc/openssh/files/digest-openssh-3.7.1_p2
index cd0c131742d5..d46309c81b8c 100644
--- a/net-misc/openssh/files/digest-openssh-3.7.1_p2
+++ b/net-misc/openssh/files/digest-openssh-3.7.1_p2
@@ -1,2 +1,3 @@
MD5 61cf5b059938718308836d00f6764a94 openssh-3.7.1p2.tar.gz 792280
MD5 d8f4c22cec973d2e22551455fe5bc28c openssh-3.7.1_p1-selinux.diff.bz2 7677
+MD5 83e000a867eba10ef7f18c169d979360 openssh-3.7.1p2+x509g2.diff.gz 125455
diff --git a/net-misc/openssh/openssh-3.7.1_p2.ebuild b/net-misc/openssh/openssh-3.7.1_p2.ebuild
index 437fe01b1a29..0b6d7815211c 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.5 2003/09/26 06:06:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p2.ebuild,v 1.6 2003/09/30 17:49:24 aliz Exp $
inherit eutils flag-o-matic ccc
[ `use kerberos` ] && append-flags -I/usr/include/gssapi
@@ -9,15 +9,15 @@ inherit eutils flag-o-matic ccc
# and _p? releases.
PARCH=${P/_/}
-#X509_PATCH="openssh-3.7.1p1+x509g2.diff.gz"
+X509_PATCH="${PARCH}+x509g2.diff.gz"
SELINUX_PATCH="openssh-3.7.1_p1-selinux.diff.bz2"
S=${WORKDIR}/${PARCH}
DESCRIPTION="Port of OpenBSD's free SSH release"
HOMEPAGE="http://www.openssh.com/"
SRC_URI="mirror://openssh/${PARCH}.tar.gz
- selinux? ( http://dev.gentoo.org/~pebenito/${SELINUX_PATCH} )"
-# X509? ( http://roumenpetrov.info/openssh/x509g2/${X509_PATCH} )
+ selinux? ( http://dev.gentoo.org/~pebenito/${SELINUX_PATCH} )
+ X509? ( http://roumenpetrov.info/openssh/x509g2/${X509_PATCH} )"
LICENSE="as-is"
SLOT="0"
@@ -47,7 +47,7 @@ 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}
+ use X509 && epatch ${DISTDIR}/${X509_PATCH}
# looks like this one was rewriten somewhat.
# epatch ${FILESDIR}/${P}-memory-bugs.patch