added hppa support with custom grsecurity patch for gentoo-hppa

4 files changed, 69 insertions, 24 deletions

diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog
index 3469c54b5555..e4c3c2576b09 100644
--- a/sys-kernel/grsec-sources/ChangeLog
+++ b/sys-kernel/grsec-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/grsec-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.2 2003/09/04 06:33:49 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.3 2003/09/17 19:25:12 pappy Exp $
+
+  17 Sep 2003; Alexander Gabert <pappy@gentoo.org>
+  grsec-sources-2.4.22.1.9.12.ebuild:
+  added hppa support and custom grsec patch
 
 *grsec-sources-2.4.22.2.0_rc3 (04 Sep 2003)
 
diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest
index b60f7862e787..2aaebdb269e4 100644
--- a/sys-kernel/grsec-sources/Manifest
+++ b/sys-kernel/grsec-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 852d21edf1e3eb9530a9bbac9610f804 grsec-sources-2.4.21.1.9.11.ebuild 1670
 MD5 bc107d8f2c850e5fa12287b1d91d2a32 grsec-sources-2.4.22.2.0_rc3.ebuild 1671
-MD5 dfb26fd1279e64a3c86c79fc9cc87da9 grsec-sources-2.4.22.1.9.12.ebuild 3186
+MD5 fd6786a0953d9e9072b20c4de511e4a7 grsec-sources-2.4.22.1.9.12.ebuild 3216
 MD5 9089c9d8bb77456b8d35a6f25b268e23 grsec-sources-2.4.21.2.0_rc2.ebuild 1671
-MD5 fd89c7114a8e8eced578228e9cda24f5 ChangeLog 737
+MD5 fe0e49aaac7ab5a7b94f98aca9e2734b ChangeLog 737
 MD5 f546d12b85c9dc51d1707a31d9367487 metadata.xml 371
 MD5 a66ec80566f602367995d845a5266ed4 files/digest-grsec-sources-2.4.21.2.0_rc2 221
 MD5 d321249b3131edd6a4a7b55bd63a5f47 files/digest-grsec-sources-2.4.22.1.9.12 367
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.22.1.9.12 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.22.1.9.12
index f4cda01e902f..0f0867942406 100644
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.22.1.9.12
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.22.1.9.12
@@ -1,3 +1,5 @@
+MD5 5195c7e657483a78c4263a60a1901b51 patch-2.4.22-pa7.gz 710034
+MD5 a398445a1e02ec0d7b1b5579b9ba681a parisc-linux-2.4.22-pa7-grsec-1.9.12.gz 518062
 MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
 MD5 1765203a3f5ba2d73e2eae2f2cb6c604 grsecurity-1.9.12-2.4.22.patch 508872
 MD5 243b95e2305af88af637fd051c97babe grsecurity-1.9.12-2.4.22.patch.sign 189
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.22.1.9.12.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.22.1.9.12.ebuild
index ed3428c781db..e5b7dfdd81be 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.22.1.9.12.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.22.1.9.12.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/grsec-sources/grsec-sources-2.4.22.1.9.12.ebuild,v 1.1 2003/09/04 06:33:49 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.22.1.9.12.ebuild,v 1.2 2003/09/17 19:25:12 pappy Exp $
 
 # Documentation on the patch contained in this kernel will be installed someday
 
@@ -13,37 +13,76 @@ inherit kernel
 [ "$OKV" == "" ] && OKV="2.4.22"
 
 PATCH_BASE="${PV/${OKV}./}"
-PATCH_BASE=${PATCH_BASE/_/-}
+PATCH_BASE="${PATCH_BASE/_/-}"
 EXTRAVERSION="-grsec-${PATCH_BASE}"
-KV=${OKV}${EXTRAVERSION}
+KV="${OKV}${EXTRAVERSION}"
+PARISC_KERNEL_VERSION="pa7"
 
 ###################
 DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 \
-	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign"
-HOMEPAGE="http://www.kernel.org/ http://www.grsecuirty.net"
-[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86" || KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+
+SRC_URI="
+		hppa? ( http://cvs.parisc-linux.org/download/linux-2.4/patch-${OKV}-${PARISC_KERNEL_VERSION}.gz ) \
+		hppa? ( http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz ) \
+		http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 \
+		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
+		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign
+		"
+
+HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
+
+[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 ~hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+
 SLOT="${OKV}"
-S=${WORKDIR}/linux-${KV}
+S="${WORKDIR}/linux-${KV}"
 ###################
 
 src_unpack() {
-	unpack linux-${OKV}.tar.bz2 || die "Unable to unpack the kernel"
-	mv linux-${OKV} linux-${KV} || die "Unable to move the kernel"
-	cd linux-${KV} || die "Unable to cd into the kernel source tree"
-	if [ -f "${DISTDIR}/grsecurity-${PATCH_BASE}-${OKV}.patch" ]; then
-		ebegin "Patching the kernel with the grsecurity-${PATCH_BASE}-${OKV} patch"
-		cat ${DISTDIR}/grsecurity-${PATCH_BASE}-${OKV}.patch | patch -p 1
-		eend $?
+	if [ "${ARCH}" == "hppa" ]
+	then
+		KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}"
+		S="${WORKDIR}/linux-${KV}"
+		# ewarn "custom patch for gentoo-${ARCH}: linux-${KV}"
+		unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
+		mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
+		cd linux-"${KV}" || die "unable to cd into the kernel source tree"
+
+		if [ -f "${DISTDIR}/patch-${OKV}-${PARISC_KERNEL_VERSION}.gz" ]; then
+			ebegin "applying patch-${OKV}-${PARISC_KERNEL_VERSION}"
+			zcat "${DISTDIR}"/patch-"${OKV}"-"${PARISC_KERNEL_VERSION}".gz | patch -p 1 --quiet
+			eend $?
+		else
+			eerror "FAILURE: applying patch-${OKV}-${PARISC_KERNEL_VERSION}"
+			die "unable to apply parisc-linux kernel patch"
+		fi
+
+		if [ -f "${DISTDIR}/parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz" ]; then
+			ebegin "applying parisc-linux-grsecurity-${OKV}-${PARISC_KERNEL_VERSION}"
+			zcat "${DISTDIR}"/parisc-linux-"${OKV}"-"${PARISC_KERNEL_VERSION}${EXTRAVERSION}".gz | patch -p 1 --quiet
+			eend $?
+		else
+			eerror "FAILURE: applying parisc-linux-grsecurity-${OKV}-${PARISC_KERNEL_VERSION}"
+			die "unable to apply gentoo-hppa parisc-linux grsecurity patch"
+		fi
 	else
-		die "Unable to the kernel patch"
-	fi
+		unpack linux-${OKV}.tar.bz2 || die "Unable to unpack the kernel"
+		mv linux-${OKV} linux-${KV} || die "Unable to move the kernel"
+		cd linux-${KV} || die "Unable to cd into the kernel source tree"
 
-	mkdir -p docs
-	touch docs/patches.txt
+		if [ -f "${DISTDIR}/grsecurity-${PATCH_BASE}-${OKV}.patch" ]; then
+			ebegin "Patching the kernel with the grsecurity-${PATCH_BASE}-${OKV} patch"
+			cat ${DISTDIR}/grsecurity-${PATCH_BASE}-${OKV}.patch | patch -p 1
+			eend $?
+		else
+			die "Unable to the kernel patch"
+		fi
+
+		mkdir -p docs
+		touch docs/patches.txt
+		kernel_universal_unpack
+	fi
 
-	kernel_universal_unpack
+	# kernel_universal_unpack
 	# kernel_src_unpack
 }