Fixed do_brk patch in sparc-sources-2.4.22.ebuild and marked sparc-sources-2.4.23.ebuild stable

4 files changed, 23 insertions, 13 deletions

diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index d2482be2992b..e0285598fb7e 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.39 2003/12/02 17:17:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.40 2003/12/04 12:58:04 joker Exp $
+
+  04 Dec 2003; Christian Birchinger <joker@gentoo.org>
+  sparc-sources-2.4.23.ebuild:
+  Marked stable
+
+  04 Dec 2003; Christian Birchinger <joker@gentoo.org>
+  sparc-sources-2.4.22.ebuild:
+  Moved do_brk patch below kernel_src_unpack because kernel_src_unpack needs the
+  patchdir as current dir and not the kernel source tree. This made epatch fail.
 
   02 Dec 2003; Brian Jackson <iggy@gentoo.org> sparc-sources-2.4.22.ebuild:
   fix do_brk vuln... again ;)
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 5e9bd8948dcb..9dd1599fd446 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,11 +1,11 @@
-MD5 34a347e2b0eaa4ac76faa335675407f9 sparc-sources-2.4.23.ebuild 2150
-MD5 a45f28b94dce567607a95d7692394086 sparc-sources-2.4.22.ebuild 2224
-MD5 df5ba2b154b168bd433d94c220d16774 ChangeLog 6887
+MD5 c54f0424bb9c0afb9d8d1ffa85165fb1 ChangeLog 7240
+MD5 ad07544c32101f3f910d9dffb9b90fb7 sparc-sources-2.4.23.ebuild 2145
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
-MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
-MD5 8c8598fb61743bb94c3a9eaf3ff339f4 files/digest-sparc-sources-2.4.23 140
+MD5 0d524d16d16682fd4af99221b0891296 sparc-sources-2.4.22.ebuild 2241
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 8c8598fb61743bb94c3a9eaf3ff339f4 files/digest-sparc-sources-2.4.23 140
+MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
 MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
-MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
+MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
index 8256bb2733c2..c3b5c64ff405 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.22.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/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.7 2003/12/02 17:17:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.8 2003/12/04 12:58:04 joker Exp $
 
 IUSE="build ultra1"
 
@@ -39,10 +39,11 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 	cd ${KV} || die "Unable to cd into ${KV}"
 
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
 	kernel_src_unpack
 
+	# Security FIX
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	# Patch the HME driver only on Ultra1 machines.
 	use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch
 }
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.23.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.23.ebuild
index 635c8b5b0ad5..19c47a7a6ad9 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.23.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.23.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/sys-kernel/sparc-sources/sparc-sources-2.4.23.ebuild,v 1.2 2003/12/01 20:03:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.23.ebuild,v 1.3 2003/12/04 12:58:04 joker Exp $
 
 IUSE="build ultra1"
 
@@ -31,7 +31,7 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://gentoo/patches-${KV}.tar.bz2"
 
 S=${WORKDIR}/linux-${KV}
-KEYWORDS="~x86 -ppc ~sparc"
+KEYWORDS="~x86 -ppc sparc"
 SLOT="${KV}"
 
 src_unpack() {