New revision with various fixes. See the ChangeLog for details.

7 files changed, 41 insertions, 156 deletions

diff --git a/sys-kernel/pfeifer-sources/ChangeLog b/sys-kernel/pfeifer-sources/ChangeLog
index fd3bacc532cf..270555fea8bd 100644
--- a/sys-kernel/pfeifer-sources/ChangeLog
+++ b/sys-kernel/pfeifer-sources/ChangeLog
@@ -1,16 +1,24 @@
 # ChangeLog for sys-kernel/pfeifer-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/ChangeLog,v 1.12 2003/06/30 19:09:52 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/ChangeLog,v 1.13 2003/07/13 02:44:30 pfeifer Exp $
 
   TODO:
 	update FreeSWAN, aic7xxx
-	readd USAGI - i have a 2.4.21 diff but won't re-add till i clean it up.
 	update some of the docs
-	add ja1 patch 
     
-  * Maybe:
-    RSBAC
-    NPTL (doubtful)
+*pfeifer-sources-2.4.21.1_pre3 (12 Jul 2003)
+
+12 Jul 2003: Jay Pfeifer <pfeifer@gentoo.org> pfeifer-sources-2.4.21._pre3.ebuild
+ Changes:
+ * Re-added USAGI
+ * updated grsec to 1.9.11
+ * updated systrace to 1.4
+ * updated evms to 2.1.0
+ * added ja1 patch
+ * added epcam usb driver
+ * added hfsplus support
+ * minor fixes and cleanups
+ * Other things I am forgetting to mention
 
 *pfeifer-sources-2.4.21.1_pre2 (30 Jun 2003)
 
diff --git a/sys-kernel/pfeifer-sources/Manifest b/sys-kernel/pfeifer-sources/Manifest
index f82807a9ac1a..0905dcf6b7b4 100644
--- a/sys-kernel/pfeifer-sources/Manifest
+++ b/sys-kernel/pfeifer-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 8aa9b0fcc508e39928f2b1b3e62136f4 pfeifer-sources-2.4.20.1_pre12.ebuild 4609
-MD5 8dbd5f3976ea3683f9b560250079a6aa pfeifer-sources-2.4.21.1_pre3.ebuild 4407
+MD5 ba942bcfe2b2e6ccd177fbdd748b1e05 pfeifer-sources-2.4.21.1_pre3.ebuild 4407
 MD5 5d33c8ebfbf4d0694ccd5b289b802e0f pfeifer-sources-2.4.20.1_pre11.ebuild 4570
 MD5 99603d1c3505d4fc0e1454688e5a6eca pfeifer-sources-2.4.21.1_pre2.ebuild 3907
-MD5 17912051d19d86ce3036eb8e539e7214 ChangeLog 6121
+MD5 069af2793ade7ef774ecdbd817582bd5 ChangeLog 6121
 MD5 1ada6b5466d035f65ce80c2cd3ed060e files/digest-pfeifer-sources-2.4.20.1_pre11 152
 MD5 31a37f6216dd3d883c38e0701ccf686e files/digest-pfeifer-sources-2.4.20.1_pre12 152
 MD5 bd6b12f1ad4db5f2aa1035b0cc291a0d files/digest-pfeifer-sources-2.4.21.1_pre2 151
diff --git a/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.20.1_pre10 b/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.20.1_pre10
deleted file mode 100644
index c9054ac0dda6..000000000000
--- a/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.20.1_pre10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 a3fb327035ccb80f1ea5d8d89f7317e0 patches-2.4.20-pfeifer-r1_pre10.tar.bz2 4053859
diff --git a/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre1 b/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre1
deleted file mode 100644
index 0d26fdaee67b..000000000000
--- a/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 fe5a434e90ad8200c8dc04ea88bd4b0f patches-2.4.21-pfeifer-r1_pre1.tar.bz2 2940500
diff --git a/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre3 b/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre3
new file mode 100644
index 000000000000..269371b79198
--- /dev/null
+++ b/sys-kernel/pfeifer-sources/files/digest-pfeifer-sources-2.4.21.1_pre3
@@ -0,0 +1,2 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 399f7c23e35205bbb1aee594aed93cee patches-2.4.21-pfeifer-r1_pre3.tar.bz2 4079286
diff --git a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre10.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre10.ebuild
deleted file mode 100644
index 3195c3a72a68..000000000000
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre10.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.20.1_pre10.ebuild,v 1.1 2003/05/05 02:22:45 pfeifer 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 || die
-OKV="2.4.20"
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/pfeifer-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="Full sources for the experimental Gentoo Kernel. Patches from here may move into sys-kernel/gentoo-sources"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${KV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm"
-SLOT="${KV}"
-
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-
-	cd ${WORKDIR}/${KV}
-
-	# 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 "You are using gcc>3.1"
-		einfo "Enabling gcc>3.1 processor optimizations."
-		einfo "To use, choose the processor family labelled with (gcc>31) in"
-		einfo "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_src_unpack
-}
-
-pkg_postinst() {
-
-	kernel_pkg_postinst
-
-	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 "Please be warned, you have just installed an unstable"
-	einfo "patchset of the Gentoo Linux kernel sources."
-	einfo "This set contains the ptrace patch as part of grsecurity."
-	echo
-	einfo "If there are issues with it, please report them"
-	einfo "by assigning bugs on bugs.gentoo.org to"
-	einfo "x86-kernel@gentoo.org"
-	echo
-	einfo "Please read the changelog and associated docs for more information."
-}
diff --git a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre1.ebuild b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre3.ebuild
index 5693c51788b5..dc8e09d2ce4b 100644
--- a/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre1.ebuild
+++ b/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre1.ebuild,v 1.1 2003/06/19 01:35:41 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pfeifer-sources/pfeifer-sources-2.4.21.1_pre3.ebuild,v 1.1 2003/07/13 02:44:30 pfeifer Exp $
 
-IUSE="build crypt evms2 aavm"
+IUSE="build crypt evms2 aavm usagi"
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -27,7 +27,7 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://gentoo/patches-${KV}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm"
+KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm -amd64"
 SLOT="${KV}"
 
 
@@ -74,16 +74,16 @@ src_unpack() {
 			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."
+		einfo "Setting up kernel for EVMS 2.1.0 support."
+		ewarn "Please read the 'evms2' doc provided with this kernel."
+		ewarn "It is the install doc from the evms 2.1.0 tarball."
 		for file in 1* ;do
 			einfo "Dropping ${file}..."
 			rm -f ${file}
 		done
 	fi
 
-	# This is the crypt USE flag, keeps {superfreeswan/patch-int/loop-jari}
+	# This is the crypt USE flag, keeps {superfreeswan/patch-int/loop-aes}
 	if [ -z "`use crypt`" ]; then
 		einfo "No Cryptographic support, dropping patches..."
 		for file in 6* 8* ;do
@@ -94,6 +94,22 @@ src_unpack() {
 		einfo "Cryptographic patches will be applied"
 	fi
 
+	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-aes}
+	# Using USAGI will also cause you to drop all iptables ipv6 patches
+	if [ -z "`use usagi`" ]; then
+		einfo "Keeping {superfreeswan/patch-int/loop-aes} 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-aes}"
+		for file in *.ipv6 8* ;do
+			einfo "Dropping ${file}..."
+			rm -f ${file}
+		done
+	fi
+
 	kernel_src_unpack
 }
 
@@ -101,8 +117,6 @@ pkg_postinst() {
 
 	kernel_pkg_postinst
 
-	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."