Version bump. Correction of the grsec-cryptoloop patch (removed some hunk). Removed _p8.

7 files changed, 68 insertions, 55 deletions

diff --git a/sys-kernel/hppa-sources-dev/ChangeLog b/sys-kernel/hppa-sources-dev/ChangeLog
index fd1e13bf0114..f347384448a9 100644
--- a/sys-kernel/hppa-sources-dev/ChangeLog
+++ b/sys-kernel/hppa-sources-dev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/hppa-sources-dev
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources-dev/ChangeLog,v 1.5 2003/08/12 16:51:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources-dev/ChangeLog,v 1.6 2003/08/13 15:24:34 gmsoft Exp $
+
+*hppa-sources-dev-2.4.21_p10 (13 Aug 2003)
+
+  13 Aug 2003; Guy Martin <gmsoft@gentoo.org> hppa-sources-dev-2.4.21_p10.ebuild :
+  Version bump. Correction of the grsec-cryptoloop patch (removed some hunk). Removed _p8.
 
 *hppa-sources-dev-2.4.21_p9 (06 Aug 2003)
 
diff --git a/sys-kernel/hppa-sources-dev/Manifest b/sys-kernel/hppa-sources-dev/Manifest
index 27273bd3e300..ef12cf4c2faf 100644
--- a/sys-kernel/hppa-sources-dev/Manifest
+++ b/sys-kernel/hppa-sources-dev/Manifest
@@ -1,5 +1,5 @@
-MD5 3f20aeee7ae0d335a5a8ec7cfa6d2535 ChangeLog 1083
+MD5 c28b7a915116c15b3b88a992ec3f8f76 ChangeLog 1083
 MD5 8fe96f782d2b9e8bf251bd5b631ee153 hppa-sources-dev-2.4.21_p9.ebuild 1863
-MD5 3520d90aa5e6e015f49ea6abbb5defb0 hppa-sources-dev-2.4.21_p10.ebuild 1894
+MD5 ee40302970d7cee039bf11bfcbf59bff hppa-sources-dev-2.4.21_p10.ebuild 1895
 MD5 2aae84d46c41ef47a4981a2c0da0565c files/digest-hppa-sources-dev-2.4.21_p9 439
 MD5 6487fedd2ab53da806dc165bca15bd70 files/digest-hppa-sources-dev-2.4.21_p10 506
diff --git a/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p10 b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p10
new file mode 100644
index 000000000000..037c99edffd2
--- /dev/null
+++ b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p10
@@ -0,0 +1,7 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 7ba65d0bf885ab820235c8234fbccb44 patch-2.4.21-pa7.diff.gz 688086
+MD5 d23ac4f2d5e20cf3dbebe838ebe40fb8 patch-2.4.21-pa7-pa8.gz 5027
+MD5 6444f68f190a716185067ebb5af97669 patch-2.4.21-pa8-pa9.gz 471
+MD5 bc3f046435a9525f9ce1dd70cc64872d patch-2.4.21-pa9-pa10.gz 2424
+MD5 d63e658c8cd61c1076f20ad7ccfdbba8 hppa-sources-dev-2.4.21-grsec-crypto.diff.bz2 461421
+MD5 7ce7e6e5c4a5ca1154fde7f4d0f0b372 hppa-sources-dev-grsec-hppa64-fix.patch 1399
diff --git a/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p8 b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p8
deleted file mode 100644
index f17c5bf95887..000000000000
--- a/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p8
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 7ba65d0bf885ab820235c8234fbccb44 patch-2.4.21-pa7.diff.gz 688086
-MD5 d23ac4f2d5e20cf3dbebe838ebe40fb8 patch-2.4.21-pa7-pa8.gz 5027
-MD5 3fa1c28d5985e52c13d28cebcc8dad9f parisc-linux-2.4.21-pa8-grsecurity-1.9.11.patch 386379
diff --git a/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p9 b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p9
index 5a0b53127390..f46f942bde94 100644
--- a/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p9
+++ b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p9
@@ -2,5 +2,5 @@ MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
 MD5 7ba65d0bf885ab820235c8234fbccb44 patch-2.4.21-pa7.diff.gz 688086
 MD5 d23ac4f2d5e20cf3dbebe838ebe40fb8 patch-2.4.21-pa7-pa8.gz 5027
 MD5 6444f68f190a716185067ebb5af97669 patch-2.4.21-pa8-pa9.gz 471
-MD5 0668a1f27700ad3aecd2230349c48715 hppa-sources-dev-2.4.21-grsec-crypto.diff.bz2 461421
+MD5 d63e658c8cd61c1076f20ad7ccfdbba8 hppa-sources-dev-2.4.21-grsec-crypto.diff.bz2 461421
 MD5 7ce7e6e5c4a5ca1154fde7f4d0f0b372 hppa-sources-dev-grsec-hppa64-fix.patch 1399
diff --git a/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p10.ebuild b/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p10.ebuild
new file mode 100644
index 000000000000..f1c1125dc5fa
--- /dev/null
+++ b/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p10.ebuild,v 1.1 2003/08/13 15:24:34 gmsoft Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+OKV="${PV/_p*/}"
+PATCH_LEVEL="${PV/${OKV}_p/}"
+EXTRAVERSION="-pa${PATCH_LEVEL}-dev"
+KV=${OKV}${EXTRAVERSION}
+S=${WORKDIR}/linux-${KV}
+
+# What's in this kernel?
+
+# INCLUDED:
+# stock 2.4.20 kernel sources
+# patches for hppa
+
+PATCH_BASE="7"
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa${PATCH_BASE}.diff.gz
+`for i in \`seq $((PATCH_BASE + 1)) ${PATCH_LEVEL}\`; do echo http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa$((i - 1))-pa${i}.gz; done`
+http://dev.gentoo.org/~gmsoft/${PN}-${OKV}-grsec-crypto.diff.bz2
+http://dev.gentoo.org/~gmsoft/hppa-sources-dev-grsec-hppa64-fix.patch"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" 
+KEYWORDS="hppa -*"
+SLOT="${KV}"
+
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
+	cd ${S}
+
+	einfo Applying ${OKV}-pa${PATCH_BASE}
+	zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_BASE}.diff.gz | patch -sp 1
+	
+	for i in `seq $((PATCH_BASE + 1)) ${PATCH_LEVEL}`
+	do
+		einfo Applying patch from ${OKV}-pa$((i - 1)) to  ${OKV}-pa${i}
+		zcat ${DISTDIR}/patch-${OKV}-pa$((i - 1))-pa${i}.gz | patch -sp 1 > /dev/null
+	done
+
+	einfo Patching for grsecurity and CryptoApi support
+	bzcat ${DISTDIR}/${PN}-${OKV}-grsec-crypto.diff.bz2 | patch -sp 1
+	einfo Fix for grsec on hppa64
+	cat ${DISTDIR}/hppa-sources-dev-grsec-hppa64-fix.patch | patch -sp 1
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p8.ebuild b/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p8.ebuild
deleted file mode 100644
index ee6ea472d2ac..000000000000
--- a/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p8.ebuild
+++ /dev/null
@@ -1,47 +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/hppa-sources-dev/hppa-sources-dev-2.4.21_p8.ebuild,v 1.3 2003/08/07 01:59:40 gmsoft Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-OKV="${PV/_p*/}"
-PATCH_LEVEL="-pa${PV/${OKV}_p/}"
-EXTRAVERSION="${PATCH_LEVEL}-dev"
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.20 kernel sources
-# patches for hppa
-# security patches
-
-PATCH_BASE="pa7"
-
-
-DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-${PATCH_BASE}.diff.gz
-	http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-${PATCH_BASE}${PATCH_LEVEL}.gz
-	http://nikita.ath.cx/users/pappy/grsecurity-parisc/parisc-linux-2.4.21-pa8-grsecurity-1.9.11.patch"
-
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org" 
-KEYWORDS="hppa -*"
-SLOT="${KV}"
-
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
-	cd ${S}
-	einfo Patching the kernel with the base patch
-	zcat ${DISTDIR}/patch-${OKV}-${PATCH_BASE}.diff.gz | patch -p 1 || die Unable to patch the kernel
-	einfo Patching the kernel with the final patch
-	zcat ${DISTDIR}/patch-${OKV}-${PATCH_BASE}${PATCH_LEVEL}.gz | sed -e "s/Revision: 1.30/Revision: 1.31/" | patch -p 1 || die Unable to patch the kernel
-	einfo Patching for grsecurity support
-	cat ${DISTDIR}/parisc-linux-2.4.21-pa8-grsecurity-1.9.11.patch | patch -p 1 || die Unable to patch the kernel
-
-	kernel_universal_unpack
-}