Version bump. Added CryptoApi to the patchset.

5 files changed, 61 insertions, 9 deletions

diff --git a/sys-kernel/hppa-sources-dev/Manifest b/sys-kernel/hppa-sources-dev/Manifest
index 19437c96b0dc..212f236a6a9e 100644
--- a/sys-kernel/hppa-sources-dev/Manifest
+++ b/sys-kernel/hppa-sources-dev/Manifest
@@ -1,5 +1,5 @@
-MD5 609b1f5407df987d2f430bd84735e4e2 ChangeLog 731
-MD5 3e5957802d2f3b205f168796739dccab hppa-sources-dev-2.4.21_p8.ebuild 1778
-MD5 4292b5205bfd2133b213d72f58953b53 hppa-sources-dev-2.4.21_p9.ebuild 1715
+MD5 a7ba2a0063634f730ec0a02ce2f5debb ChangeLog 731
+MD5 89a1761e0766e09fde46860450079c7c hppa-sources-dev-2.4.21_p8.ebuild 1778
+MD5 0e6b136f08f880406573dbb34e419fac hppa-sources-dev-2.4.21_p9.ebuild 1723
 MD5 4c8c8cd7cc87845cc2f576c6aa619766 files/digest-hppa-sources-dev-2.4.21_p8 294
 MD5 2f1b3db506e6d77826f961168bac92f7 files/digest-hppa-sources-dev-2.4.21_p9 357
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
index 28eda05f7bd1..f17c5bf95887 100644
--- 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
@@ -1,4 +1,4 @@
 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 17150f750357f9e0180d1d83823b55fc patch-2.4.21-pa8-grsecurity-1.9.11.patch 200729
+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
new file mode 100644
index 000000000000..7b0b3d7ecd11
--- /dev/null
+++ b/sys-kernel/hppa-sources-dev/files/digest-hppa-sources-dev-2.4.21_p9
@@ -0,0 +1,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
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
index d1cfa9a48d98..ee6ea472d2ac 100644
--- 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
@@ -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/hppa-sources-dev/hppa-sources-dev-2.4.21_p8.ebuild,v 1.2 2003/08/06 01:47:59 gmsoft Exp $
+# $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"
@@ -20,14 +20,12 @@ S=${WORKDIR}/linux-${KV}
 
 PATCH_BASE="pa7"
 
-GRSEC_V="1.9.11"
-
 
 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://dev.gentoo.org/~gmsoft/patch-${OKV}${PATCH_LEVEL}-grsecurity-${GRSEC_V}.patch"
+	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 -*"
@@ -43,7 +41,7 @@ src_unpack() {
 	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}/patch-${OKV}${PATCH_LEVEL}-grsecurity-${GRSEC_V}.patch | patch -p 1 || die Unable to patch the kernel
+	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
 }
diff --git a/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p9.ebuild b/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p9.ebuild
new file mode 100644
index 000000000000..31580a4ae554
--- /dev/null
+++ b/sys-kernel/hppa-sources-dev/hppa-sources-dev-2.4.21_p9.ebuild
@@ -0,0 +1,49 @@
+# 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_p9.ebuild,v 1.1 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="${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"
+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
+
+	kernel_universal_unpack
+}