Switch to unique-patch for 2.4.23, closed bug #37028, copyright statement update (year)

11 files changed, 48 insertions, 60 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 264f178270bd..bfd5df646f20 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.35 2003/12/06 16:34:59 scox Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.36 2004/01/04 01:22:58 scox Exp $
+
+*xfs-sources-2.4.23 (04 Jan 2004)
+
+  04 Jan 2004; Andrea Luzzardi <scox@gentoo.org>
+  xfs-sources-2.4.23.ebuild:
+  New patchset, updated grsec to 2.0-rc4. Closed bug #37028.
 
 *xfs-sources-2.4.23 (06 Dec 2003)
 
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 5fa1fa676288..02dc24f4d7a1 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,12 +1,12 @@
-MD5 c4fe9776ba210252ac441cd93dd27f93 xfs-sources-2.4.23.ebuild 922
-MD5 36ce3050f12e11cc8a1ea85945a44165 xfs-sources-2.4.20-r1.ebuild 2081
-MD5 6e5f4accb211adfb80fd568fa437b7d3 xfs-sources-2.4.19-r2.ebuild 2010
-MD5 198d1a397ccc514f9ef1461bd24ebf66 xfs-sources-2.4.20.ebuild 2094
-MD5 8060c13fe2f08ae64c68b068a0a8915c xfs-sources-2.4.20-r3.ebuild 2184
-MD5 a15442226e53ff9accc904ab093ecd81 xfs-sources-2.4.22.ebuild 2146
-MD5 bbb722d805cffa7122e9e9eb135c087c xfs-sources-2.4.20-r2.ebuild 2090
-MD5 5abd5885527adaecb6856b03dce61038 xfs-sources-2.4.20-r4.ebuild 2210
-MD5 68bb4d4dfc8c4bd347fb28cf3e2575c7 ChangeLog 9268
+MD5 3fbf66f8d3990f80fa05ab84fa60bbf1 xfs-sources-2.4.23.ebuild 1031
+MD5 ccb24e8a4128475f97bf020f5b0a952a xfs-sources-2.4.20-r1.ebuild 2193
+MD5 958d97c7200bd73219e28be8f20c034b xfs-sources-2.4.19-r2.ebuild 2123
+MD5 2540889800dda7b38f0c4f61899a5747 xfs-sources-2.4.20.ebuild 2203
+MD5 7502294f51542ace5d89419433107497 xfs-sources-2.4.20-r3.ebuild 2297
+MD5 c6226add7e0755834b10a3ff5ba540aa xfs-sources-2.4.22.ebuild 2255
+MD5 4980429952168194a39b7656d909137a xfs-sources-2.4.20-r2.ebuild 2202
+MD5 f02e213426423fa9c483eb893ab9e0e0 xfs-sources-2.4.20-r4.ebuild 2322
+MD5 d4a3f10a63233a8506dd18bedb6fe4d4 ChangeLog 9362
 MD5 9d0457271fd1f3afdcf4f7ee602d3b34 metadata.xml 414
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 26b986cdd4c24df8ad3d0f0b21e802be files/digest-xfs-sources-2.4.22 139
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23
index cdd6859dcf2e..e8b0d47bcf65 100644
--- a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23
+++ b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.23
@@ -1,2 +1,2 @@
 MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 09ea5098f6b66023b2f016e985d0d15e patches-2.4.23-xfs.tar.bz2 1428396
+MD5 832536656afe8784d23fb7eb64771591 xfs-sources-2.4.23.patch.bz2 1652549
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
index f5f506416f84..d7232e9a920f 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.19-r2.ebuild,v 1.11 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.12 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
index 75ce1d3fc297..7e777f3d30eb 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r1.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-r1.ebuild,v 1.8 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
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 6d4bed5bcb94..f31e9e52fcb0 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.
+# Copyright 1999-2004 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.8 2003/12/02 23:27:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.9 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
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 ce7d5cad57a1..20cce6157ecf 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.
+# Copyright 1999-2004 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.9 2003/12/02 23:27:50 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.10 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
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
index 6e1462700126..158a763754d8 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r4.ebuild,v 1.2 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
index d36700de0eb8..12612fbe3302 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.ebuild,v 1.6 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.7 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
index 694a940d2495..ee8fce77c2f2 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.22.ebuild,v 1.3 2003/12/02 03:17:53 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild,v 1.4 2004/01/04 01:22:58 scox Exp $
 
 IUSE="build crypt"
 
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
index bd807ed7a4da..331fe524e5f7 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild
@@ -1,26 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.23.ebuild,v 1.2 2003/12/06 16:34:59 scox 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.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.23.ebuild,v 1.3 2004/01/04 01:22:58 scox Exp $
 
 ETYPE="sources"
 
 inherit kernel
-OKV=2.4.23
-EXTRAVERSION=-${P/-sources-2.4.23}
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}"
 KV=${OKV}${EXTRAVERSION}
+
 S=${WORKDIR}/linux-${KV}
 
 # Documentation on the patches contained in this kernel will be installed
@@ -28,7 +16,8 @@ S=${WORKDIR}/linux-${KV}
 
 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}.tar.bz2"
+	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PVR}.patch.bz2"
+
 KEYWORDS="~x86 -ppc -sparc "
 SLOT="${KV}"
 
@@ -36,21 +25,14 @@ src_unpack() {
 	unpack ${A}
 	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!
-
-	# 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 *freeswan*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-	kernel_src_unpack
+	cd linux-${KV}
+
+	bzcat ${DISTDIR}/xfs-sources-${PVR}.patch.bz2 | patch -p1 \
+		|| die "Failed to patch kernel"
+
 	cd ${S}
-	epatch ${FILESDIR}/xconfig_target_fix.patch || die "failed to fix xconfig"
+
+	make mrproper || die "make mrproper failed"
+
 }
+