Closing #29105

5 files changed, 14 insertions, 28 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a8e80364401b..a36c74856c2a 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.49 2003/09/18 14:46:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.50 2003/09/19 13:27:25 aliz Exp $
+
+  19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p1-r1.ebuild :
+  Disabled selinux patch until a new can be made.
+  Fixed some of the patches to allow the X509 patch to apply. Closing #29105.
 
 *openssh-3.7.1_p1-r1 (18 Sep 2003)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index aa6c7efb34ce..ca74c3c1e5eb 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,4 +1,4 @@
-MD5 70c2d35365d4f3d65f60e3fd6cc98c80 ChangeLog 7887
+MD5 78cc93619d364a6f123ffcbce0435ff2 ChangeLog 8093
 MD5 bf8c9e2ff963deb77f7dd8adf7ad2037 openssh-3.5_p1-r1.ebuild 3932
 MD5 3c2bbd03a745c1e0b2a5e4a6e600b030 openssh-3.6.1_p2-r1.ebuild 4148
 MD5 a50daec66d75cc8248da65d91269b359 openssh-3.6.1_p2.ebuild 3948
@@ -6,7 +6,7 @@ MD5 564d864226cf89ea6396748305042fd9 openssh-3.6.1_p2-r2.ebuild 4204
 MD5 9da5e02603f79633fe36e2337d4ae626 openssh-3.6.1_p2-r3.ebuild 4488
 MD5 b95ca58a06be4f68640911f9e64a8c95 openssh-3.7_p1.ebuild 4479
 MD5 50373292e185c35f7a254ede2a90adda openssh-3.7.1_p1.ebuild 4634
-MD5 e7569bf0bb9f8a188e6c7edf9a2b32bc openssh-3.7.1_p1-r1.ebuild 4248
+MD5 e61cba2d105f6bd59b999ba6cd02e8af openssh-3.7.1_p1-r1.ebuild 4249
 MD5 f2472f97f00f203eee538d04a25acac5 files/digest-openssh-3.5_p1-r1 136
 MD5 3d26d49ccd595bca906f540f5d8b8c31 files/digest-openssh-3.6.1_p2 139
 MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r1 213
@@ -19,6 +19,6 @@ MD5 2509087626bbaf1ad026899718167722 files/digest-openssh-3.7_p1 137
 MD5 1830b9ef3eadf20461658be064566841 files/digest-openssh-3.7.1_p1 214
 MD5 1830b9ef3eadf20461658be064566841 files/digest-openssh-3.7.1_p1-r1 214
 MD5 af754a7a6d850621f44547c47f0a60e8 files/openssh-3.7.1_p1-memory-bugs.patch 3497
-MD5 9cf685ee972138d53ead48ab93b89229 files/openssh-3.7.1_p1-memory-leak.patch 818
-MD5 32f5b511a168f9fb7def64603643a582 files/openssh-3.7.1_p1-connect-timeout.patch 836
+MD5 f070df558fd67efd545ac77a2749ea6d files/openssh-3.7.1_p1-memory-leak.patch 575
+MD5 116c0ddbe11e98eb9724d30193f65d95 files/openssh-3.7.1_p1-connect-timeout.patch 609
 MD5 fcdec1634d390aed62b8a6a7e90c4b09 files/openssh-3.7.1_p1-double-free.patch 677
diff --git a/net-misc/openssh/files/openssh-3.7.1_p1-connect-timeout.patch b/net-misc/openssh/files/openssh-3.7.1_p1-connect-timeout.patch
index 1d62b5754524..adabbce786ba 100644
--- a/net-misc/openssh/files/openssh-3.7.1_p1-connect-timeout.patch
+++ b/net-misc/openssh/files/openssh-3.7.1_p1-connect-timeout.patch
@@ -5,15 +5,6 @@ retrieving revision 1.148
 diff -u -r1.147 -r1.148
 --- src/usr.bin/ssh/sshconnect.c	2003/06/29 12:44:38	1.147
 +++ src/usr.bin/ssh/sshconnect.c	2003/09/18 07:52:54	1.148
-@@ -13,7 +13,7 @@
-  */
- 
- #include "includes.h"
--RCSID("$OpenBSD: sshconnect.c,v 1.147 2003/06/29 12:44:38 markus Exp $");
-+RCSID("$OpenBSD: sshconnect.c,v 1.148 2003/09/18 07:52:54 markus Exp $");
- 
- #include <openssl/bn.h>
- 
 @@ -267,9 +267,10 @@
  		optval = 0;
  		optlen = sizeof(optval);
diff --git a/net-misc/openssh/files/openssh-3.7.1_p1-memory-leak.patch b/net-misc/openssh/files/openssh-3.7.1_p1-memory-leak.patch
index 62695d6deff3..d349a3d0f03c 100644
--- a/net-misc/openssh/files/openssh-3.7.1_p1-memory-leak.patch
+++ b/net-misc/openssh/files/openssh-3.7.1_p1-memory-leak.patch
@@ -5,15 +5,6 @@ retrieving revision 1.55
 diff -u -r1.54 -r1.55
 --- src/usr.bin/ssh/authfile.c	2003/05/24 09:30:39	1.54
 +++ src/usr.bin/ssh/authfile.c	2003/09/18 07:56:05	1.55
-@@ -36,7 +36,7 @@
-  */
- 
- #include "includes.h"
--RCSID("$OpenBSD: authfile.c,v 1.54 2003/05/24 09:30:39 djm Exp $");
-+RCSID("$OpenBSD: authfile.c,v 1.55 2003/09/18 07:56:05 markus Exp $");
- 
- #include <openssl/err.h>
- #include <openssl/evp.h>
 @@ -143,6 +143,7 @@
  	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
  	if (fd < 0) {
diff --git a/net-misc/openssh/openssh-3.7.1_p1-r1.ebuild b/net-misc/openssh/openssh-3.7.1_p1-r1.ebuild
index 7868716bfff4..3b5c63952513 100644
--- a/net-misc/openssh/openssh-3.7.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p1-r1.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_p1-r1.ebuild,v 1.1 2003/09/18 14:46:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p1-r1.ebuild,v 1.2 2003/09/19 13:27:25 aliz Exp $
 
 inherit eutils flag-o-matic ccc
 [ `use kerberos` ] && append-flags -I/usr/include/gssapi
@@ -43,15 +43,15 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ~ia64"
 src_unpack() {
 	unpack ${PARCH}.tar.gz ; cd ${S}
 
+#	use selinux && epatch ${DISTDIR}/openssh_3.6p1-5.se1.diff.bz2
+	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
 	epatch ${FILESDIR}/${P}-memory-bugs.patch
 
-	use selinux && epatch ${DISTDIR}/openssh_3.6p1-5.se1.diff.bz2
-	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch
-	use X509 && epatch ${DISTDIR}/${X509_PATCH}
-
 	use skey && {
 		# prevent the conftest from violating the sandbox
 		sed -i 's#skey_keyinfo("")#"true"#g' configure