fix selinux patch for 3.7.1_p1

6 files changed, 27 insertions, 21 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a36c74856c2a..e53c361cb696 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.50 2003/09/19 13:27:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.51 2003/09/20 01:02:37 pebenito Exp $
+
+  19 Sep 2003; Chris PeBenito <pebenito@gentoo.org>
+  openssh-3.7.1_p1-r1.ebuild, openssh-3.7.1_p1.ebuild:
+  Fix SELinux patch for 3.7.1_p1
 
   19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> openssh-3.7.1_p1-r1.ebuild :
   Disabled selinux patch until a new can be made.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index ca74c3c1e5eb..3b3006cde2cd 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,24 +1,24 @@
-MD5 78cc93619d364a6f123ffcbce0435ff2 ChangeLog 8093
-MD5 bf8c9e2ff963deb77f7dd8adf7ad2037 openssh-3.5_p1-r1.ebuild 3932
+MD5 61921ee33a727dfebc980b9691ef74dc ChangeLog 8238
 MD5 3c2bbd03a745c1e0b2a5e4a6e600b030 openssh-3.6.1_p2-r1.ebuild 4148
-MD5 a50daec66d75cc8248da65d91269b359 openssh-3.6.1_p2.ebuild 3948
+MD5 bf8c9e2ff963deb77f7dd8adf7ad2037 openssh-3.5_p1-r1.ebuild 3932
 MD5 564d864226cf89ea6396748305042fd9 openssh-3.6.1_p2-r2.ebuild 4204
+MD5 a50daec66d75cc8248da65d91269b359 openssh-3.6.1_p2.ebuild 3948
 MD5 9da5e02603f79633fe36e2337d4ae626 openssh-3.6.1_p2-r3.ebuild 4488
+MD5 baa93c0bb81792f293041775106cda3d openssh-3.7.1_p1-r1.ebuild 4279
+MD5 6f9d1a7a3d8d84a099f9e8ae724cd750 openssh-3.7.1_p1.ebuild 4665
 MD5 b95ca58a06be4f68640911f9e64a8c95 openssh-3.7_p1.ebuild 4479
-MD5 50373292e185c35f7a254ede2a90adda openssh-3.7.1_p1.ebuild 4634
-MD5 e61cba2d105f6bd59b999ba6cd02e8af openssh-3.7.1_p1-r1.ebuild 4249
+MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r1 213
+MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r2 213
 MD5 f2472f97f00f203eee538d04a25acac5 files/digest-openssh-3.5_p1-r1 136
+MD5 f7ce823ee079185e2fac5dd59eb61c0b files/digest-openssh-3.7.1_p1 218
 MD5 3d26d49ccd595bca906f540f5d8b8c31 files/digest-openssh-3.6.1_p2 139
-MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r1 213
+MD5 2509087626bbaf1ad026899718167722 files/digest-openssh-3.7_p1 137
 MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
 MD5 17b2fa077852f2c2990ec97c51bf198b files/sshd.rc6 1233
-MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r2 213
 MD5 3d5afb85b45dafdd05258d53f19a0b61 files/digest-openssh-3.6.1_p2-r3 213
-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 f070df558fd67efd545ac77a2749ea6d files/openssh-3.7.1_p1-memory-leak.patch 575
+MD5 f7ce823ee079185e2fac5dd59eb61c0b files/digest-openssh-3.7.1_p1-r1 218
 MD5 116c0ddbe11e98eb9724d30193f65d95 files/openssh-3.7.1_p1-connect-timeout.patch 609
 MD5 fcdec1634d390aed62b8a6a7e90c4b09 files/openssh-3.7.1_p1-double-free.patch 677
+MD5 af754a7a6d850621f44547c47f0a60e8 files/openssh-3.7.1_p1-memory-bugs.patch 3497
+MD5 f070df558fd67efd545ac77a2749ea6d files/openssh-3.7.1_p1-memory-leak.patch 575
diff --git a/net-misc/openssh/files/digest-openssh-3.7.1_p1 b/net-misc/openssh/files/digest-openssh-3.7.1_p1
index 74e5e4611361..b6a63ae36418 100644
--- a/net-misc/openssh/files/digest-openssh-3.7.1_p1
+++ b/net-misc/openssh/files/digest-openssh-3.7.1_p1
@@ -1,3 +1,3 @@
 MD5 f54e574e606c08ef63ebb1ab2f7689dc openssh-3.7.1p1.tar.gz 791161
-MD5 c425e65927b359382bf3618d265d45f1 openssh_3.6p1-5.se1.diff.bz2 54985
+MD5 d8f4c22cec973d2e22551455fe5bc28c openssh-3.7.1_p1-selinux.diff.bz2 7677
 MD5 62a83953c4a7fee0309961099c94d760 openssh-3.7.1p1+x509g2.diff.gz 125275
diff --git a/net-misc/openssh/files/digest-openssh-3.7.1_p1-r1 b/net-misc/openssh/files/digest-openssh-3.7.1_p1-r1
index 74e5e4611361..b6a63ae36418 100644
--- a/net-misc/openssh/files/digest-openssh-3.7.1_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-3.7.1_p1-r1
@@ -1,3 +1,3 @@
 MD5 f54e574e606c08ef63ebb1ab2f7689dc openssh-3.7.1p1.tar.gz 791161
-MD5 c425e65927b359382bf3618d265d45f1 openssh_3.6p1-5.se1.diff.bz2 54985
+MD5 d8f4c22cec973d2e22551455fe5bc28c openssh-3.7.1_p1-selinux.diff.bz2 7677
 MD5 62a83953c4a7fee0309961099c94d760 openssh-3.7.1p1+x509g2.diff.gz 125275
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 3b5c63952513..3bfd5a97b71f 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.2 2003/09/19 13:27:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p1-r1.ebuild,v 1.3 2003/09/20 01:02:37 pebenito Exp $
 
 inherit eutils flag-o-matic ccc
 [ `use kerberos` ] && append-flags -I/usr/include/gssapi
@@ -10,13 +10,14 @@ inherit eutils flag-o-matic ccc
 PARCH=${P/_/}
 
 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/"
 IUSE="ipv6 static pam tcpd kerberos skey selinux X509"
 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 )
+	selinux? ( http://dev.gentoo.org/~pebenito/${SELINUX_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509g2/${X509_PATCH} )"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
@@ -43,7 +44,7 @@ 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 selinux && epatch ${DISTDIR}/${SELINUX_PATCH}
 	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch
 	use X509 && epatch ${DISTDIR}/${X509_PATCH}
 
diff --git a/net-misc/openssh/openssh-3.7.1_p1.ebuild b/net-misc/openssh/openssh-3.7.1_p1.ebuild
index 055098ef6c06..8bbd76f12b6a 100644
--- a/net-misc/openssh/openssh-3.7.1_p1.ebuild
+++ b/net-misc/openssh/openssh-3.7.1_p1.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.ebuild,v 1.6 2003/09/18 12:22:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.7.1_p1.ebuild,v 1.7 2003/09/20 01:02:37 pebenito Exp $
 
 inherit eutils flag-o-matic ccc
 [ `use kerberos` ] && append-flags -I/usr/include/gssapi
@@ -10,13 +10,14 @@ inherit eutils flag-o-matic ccc
 PARCH=${P/_/}
 
 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/"
 IUSE="ipv6 static pam tcpd kerberos skey selinux X509"
 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 )
+	selinux? ( http://dev.gentoo.org/~pebenito/${SELINUX_PATCH} )
 	X509? ( http://roumenpetrov.info/openssh/x509g2/${X509_PATCH} )"
 
 # openssh recognizes when openssl has been slightly upgraded and refuses to run.
@@ -46,7 +47,7 @@ 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 selinux && epatch ${DISTDIR}/${SELINUX_PATCH}
 	use alpha && epatch ${FILESDIR}/${PN}-3.5_p1-gentoo-sshd-gcc3.patch
 	use X509 && epatch ${DISTDIR}/${X509_PATCH}
 }