version bump for do_brk vuln

6 files changed, 94 insertions, 10 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 6e9826864202..aaea1def270d 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.30 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.31 2003/12/02 23:27:50 iggy Exp $
+
+*xfs-sources-2.4.20-r4 (02 Dec 2003)
+
+  02 Dec 2003; Brian Jackson <iggy@gentoo.org> xfs-sources-2.4.20-r2.ebuild,
+  xfs-sources-2.4.20-r3.ebuild, xfs-sources-2.4.20-r4.ebuild:
+  version bump for do_brk vuln
 
   01 Dec 2003; Brian Jackson <iggy@gentoo.org> xfs-sources-2.4.19-r2.ebuild,
   xfs-sources-2.4.20-r1.ebuild, xfs-sources-2.4.20-r2.ebuild,
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 8988f64e4696..2a39badb7a50 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,11 +1,11 @@
 MD5 dd6ee1f917d97dff4db5e3ce25c4486d xfs-sources-2.4.20-r1.ebuild 2193
 MD5 db428299389ac834854b0732c5d0bec4 xfs-sources-2.4.19-r2.ebuild 2123
 MD5 7d250d77b5ca14b9e7b5f37d6ab79dd7 xfs-sources-2.4.20.ebuild 2203
-MD5 faa010d557ffbd6f460d09d5475e1a3b xfs-sources-2.4.20-r3.ebuild 2295
+MD5 59959a88007dd2b87ac5e73322e4e1de xfs-sources-2.4.20-r3.ebuild 2296
 MD5 48e098d9147d10a695585c51a033aa9c xfs-sources-2.4.22.ebuild 2255
-MD5 c5a25d4bbd950fa23086c8b483a0570c xfs-sources-2.4.20-r2.ebuild 2192
-MD5 386a022aed5c3f2dc2ed752e565ee08d xfs-sources-2.4.20-r4.ebuild 2303
-MD5 98c73057ef9d34cc3679108af4e4de33 ChangeLog 8512
+MD5 e0dc97f85ee89d05e1f0808e96ad15d1 xfs-sources-2.4.20-r2.ebuild 2202
+MD5 3e1479535c336200a4cc66e7b22887d3 xfs-sources-2.4.20-r4.ebuild 2322
+MD5 6b1d2613d69c6e124f178ae24f1897f8 ChangeLog 8721
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4
new file mode 100644
index 000000000000..b2e2064cc396
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.20-r4
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 56b5aa9df07831f541baaefb927086f9 patches-2.4.20-xfs-r3.tar.bz2 3303544
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
index 5c665072fce9..6d4bed5bcb94 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.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/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.7 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.8 2003/12/02 23:27:50 iggy Exp $
 
 IUSE="build crypt"
 
@@ -63,7 +63,9 @@ src_unpack() {
 		einfo "Cryptographic support enabled..."
 	fi
 
+	kernel_src_unpack
+
+	cd ${S}
 	#IMPORTANT! Root Exploit!
 	epatch ${FILESDIR}/do_brk_fix.patch
-	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
index c25fb6d25b97..ce7d5cad57a1 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.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/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.8 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.9 2003/12/02 23:27:50 iggy Exp $
 
 IUSE="build crypt"
 
@@ -63,11 +63,12 @@ src_unpack() {
 		einfo "Cryptographic support enabled..."
 	fi
 
+	kernel_src_unpack
+
 	#IMPORTANT! Root Exploit!
 	cd ${S}
 	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
 
-	kernel_src_unpack
+	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
 
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
new file mode 100644
index 000000000000..6e1462700126
--- /dev/null
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild,v 1.1 2003/12/02 23:27:50 iggy Exp $
+
+IUSE="build crypt"
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
+# *evms*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+
+inherit kernel
+OKV=2.4.20
+EXTRAVERSION=-xfs-r4
+KV=${OKV}${EXTRAVERSION}
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	 mirror://gentoo/patches-${KV/-r4/-r3}.tar.bz2"
+KEYWORDS="x86 -ppc -sparc "
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv ${WORKDIR}/${KV/-r4/-r3} ${WORKDIR}/${KV}
+	mv linux-${OKV} linux-${KV} || die
+
+	cd ${KV}
+	# Kill patches we aren't suppposed to use, don't worry about
+	# failures, if they aren't there that is a good thing!
+
+	# If the compiler isn't gcc3 drop the gcc3 patches
+	if [[ "${COMPILER}" == "gcc3" ]];then
+		einfo "You are using gcc3, check out the special"
+		einfo "processor types just for you"
+	else
+		einfo "Your compiler is not gcc3, dropping patches..."
+		for file in *gcc3*;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
+	# This is the ratified crypt USE flag, enables IPSEC and patch-int
+	if [ -z "`use crypt`" ]; then
+		einfo "No Cryptographic support, dropping patches..."
+		for file in 8*;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	else
+		einfo "Cryptographic support enabled..."
+	fi
+
+	kernel_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
+
+}