Removed the SKAS patch as it was causing regression issues with GRSecurity - bug #42141.

6 files changed, 35 insertions, 199 deletions

diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index afa3b83ec34e..673bc027a769 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,44 +1,42 @@
-MD5 2f5b34d48f970c35408ce284343ec488 gentoo-sources-2.4.22-r3.ebuild 2275
-MD5 3b725fe56b96923eaf37bd9588b9415d gentoo-sources-2.4.20-r13.ebuild 5615
-MD5 7df466da51d9c506ccb1a9b1a640f2d8 gentoo-sources-2.4.22-r5.ebuild 1053
-MD5 5ed42dacc019ea162347050d075f0059 gentoo-sources-2.4.22-r7.ebuild 1096
-MD5 a3da87be5a8a003c8a741747ca12672f gentoo-sources-2.4.20-r12.ebuild 5440
-MD5 af17640381fe454755d0a54e5bf85473 gentoo-sources-2.4.22-r4.ebuild 1966
-MD5 3d8ad6e27089077c302b968b621aaa00 gentoo-sources-2.4.19-r11.ebuild 2502
 MD5 7996ad4b6f7047b29ef524cd76149849 ChangeLog 15075
+MD5 3d8ad6e27089077c302b968b621aaa00 gentoo-sources-2.4.19-r11.ebuild 2502
+MD5 af17640381fe454755d0a54e5bf85473 gentoo-sources-2.4.22-r4.ebuild 1966
 MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
+MD5 7df466da51d9c506ccb1a9b1a640f2d8 gentoo-sources-2.4.22-r5.ebuild 1053
+MD5 b241384c9b554ea3ef9ed6d959c01681 gentoo-sources-2.4.20-r14.ebuild 5514
+MD5 2f5b34d48f970c35408ce284343ec488 gentoo-sources-2.4.22-r3.ebuild 2275
+MD5 5ed42dacc019ea162347050d075f0059 gentoo-sources-2.4.22-r7.ebuild 1096
 MD5 95fcdbd58c05a5297d15a5aa0c957bdd gentoo-sources-2.4.20-r7.ebuild 5390
-MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
-MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r7 147
+MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
-MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
+MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
+MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
 MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
+MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 8bc44a4c2cec1ebcfb4a08b4cc28a162 files/digest-gentoo-sources-2.4.22-r4 147
+MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
-MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
-MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
-MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
-MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
-MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
-MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
-MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
-MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
-MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
-MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r11 146
-MD5 2a73b1add24b1ae8364e7ca8e267fac1 files/digest-gentoo-sources-2.4.20-r12 146
-MD5 2a73b1add24b1ae8364e7ca8e267fac1 files/digest-gentoo-sources-2.4.20-r13 146
+MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
-MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
-MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r11 146
+MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
+MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r14 146
 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
 MD5 e06e41c29580142ad40709e369084b22 files/digest-gentoo-sources-2.4.22-r3 147
-MD5 8bc44a4c2cec1ebcfb4a08b4cc28a162 files/digest-gentoo-sources-2.4.22-r4 147
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r5 147
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r7 147
-MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
+MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
+MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
+MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
+MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
+MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
+MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
+MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
+MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
+MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
+MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12
deleted file mode 100644
index 41b830eea9bc..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 9ceea9d45776eec36c0bca5ff767dc05 patches-2.4.20-gentoo-r11.tar.bz2 4379194
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r13 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r13
deleted file mode 100644
index 41b830eea9bc..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 9ceea9d45776eec36c0bca5ff767dc05 patches-2.4.20-gentoo-r11.tar.bz2 4379194
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14
new file mode 100644
index 000000000000..0d9abd01d13b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 7b49804685bb54be619c8ca117dd129c patches-2.4.20-gentoo-r14.tar.bz2 4388716
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
deleted file mode 100644
index e69a0afe3fe3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild,v 1.3 2004/02/18 17:15:14 plasmaroo Exp $
-
-IUSE="build crypt evms2 aavm usagi"
-
-# 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="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/12/11}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-SLOT="${KV}"
-
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-
-	cd ${WORKDIR}/${KV/12/11}
-
-	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
-	if [ -z "`use aavm`" ]; then
-		einfo "Setting up kernel for rmap support(default)."
-		for file in *.aavm ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Setting up kernel for aavm support."
-		for file in *.rmap ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# If the compiler isn't gcc>3.1 drop the gcc>=3.1 patches
-	if [[ "${COMPILER}" == "gcc3" ]]; then
-		einfo "Enabling gcc > 3.1 processor optimizations..."
-		einfo "To use them, choose the processor families labelled with (gcc>31)"
-		einfo "in \"Processor type and features -> Processor Family\""
-	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* evms2 USE flag, enables evms2 support
-	if [ -z "`use evms2`" ]; then
-		einfo "Setting up kernel for EVMS 1.2.1 support (default)..."
-		for file in 2* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Setting up kernel for EVMS 2.0.1 support..."
-		ewarn "This is very beta. Please read the 'evms2' doc provided with this kernel."
-		ewarn "It is the install doc from the evms 2.0.1 tarball."
-		for file in 1* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 6* 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic patches will be applied."
-	fi
-
-	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
-	# Using USAGI will also cause you to drop all iptables ipv6 patches
-	if [ -z "`use usagi`" ]; then
-		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
-		for file in 6* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
-		for file in *.ipv6 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	kernel_exclude
-	./addpatches . ${WORKDIR}/linux-${KV} || die "Could not add patches!"
-	kernel_universal_unpack || die "Could not unpack!"
-
-	epatch ${FILESDIR}/security.patch1
-	epatch ${FILESDIR}/security.patch2
-	epatch ${FILESDIR}/security.patch3
-	epatch ${FILESDIR}/security.patch4
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-rtc_fix.patch || die "Failed to apply RTC fix!"
-
-}
-
-pkg_postinst() {
-
-	kernel_pkg_postinst
-
-	echo
-	ewarn "There is no xfs support in this kernel."
-	ewarn "If you need xfs support, emerge xfs-sources."
-	echo
-	ewarn "If iptables/netfilter behaves abnormally, such as 'Invalid Argument',"
-	ewarn "you will need to re-emerge iptables to restore proper functionality."
-	echo
-	einfo "This set contains the ptrace patch as part of grsecurity."
-	echo
-	einfo "If there are issues with it, read the docs and associated help provided."
-	einfo "Next you should check http://forums.gentoo.org/ for assistance."
-	echo
-	einfo "Otherwise check http://bugs.gentoo.org/ for an existing bug."
-	einfo "Only create a new bug if you have not found one that matches your issue."
-	einfo "It is best to do an advanced search to increase search yield."
-	echo
-	einfo "Please assign bugs to x86-kernel@gentoo.org"
-	echo
-	einfo "Please read the ChangeLog and associated docs for more information."
-	echo
-
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild
index 16c3e5779cbe..e7e1c9f131a3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild,v 1.3 2004/02/22 23:31:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild,v 1.1 2004/03/07 23:27:58 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/13/11}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips "
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/13/11}
+	cd ${WORKDIR}/${KV}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -129,7 +129,6 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
 	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC fix!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}-fix-proc-mm.patch || die "Failed to apply CONFIG_PROC_MM patch!"
 
 }