Bumped version. Include CAN-2004-0394 fix. Removed other older ebuilds.

6 files changed, 19 insertions, 77 deletions

diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index d0d8b52439ab..a7de0d95dc53 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,9 +1,5 @@
-MD5 441a674256cbb458b40fa0fa053cbd8d ChangeLog 6105
-MD5 822bdf35c552bcd2ae151ec761268210 hppa-sources-2.4.25_p1.ebuild 2064
-MD5 dd786addedc65e6b15787febbf774b08 hppa-sources-2.4.26_p1.ebuild 2063
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
-MD5 798b0086e2a64510d75bf7653cd184e0 hppa-sources-2.4.26_p4.ebuild 1992
-MD5 1ac5978dbe50d7cf75a75ad3e5395c7b files/digest-hppa-sources-2.4.25_p1 224
-MD5 22feca77d6c47f57ef3ab0a879acfd14 files/digest-hppa-sources-2.4.26_p1 224
+MD5 d6bf6c261f9e489c067498c6b24a2e6b hppa-sources-2.4.26_p4.ebuild 1990
+MD5 0061ecb7ebe48c6df5ef8dafb175c2a7 ChangeLog 6389
 MD5 d4a740ae56c2049247083af387a22a85 files/CAN-2004-0394.patch 350
 MD5 2cd1309267a6cde4f858cfe95a323312 files/digest-hppa-sources-2.4.26_p4 224
diff --git a/sys-kernel/hppa-sources/files/CAN-2004-0394.patch b/sys-kernel/hppa-sources/files/CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/CAN-2004-0394.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.25_p1 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.25_p1
deleted file mode 100644
index 60c83b906db5..000000000000
--- a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.25_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 c6c0b18e2f5c6680bed2b714787f098c patch-2.4.25-pa0.gz 721518
-MD5 010fe6b49e97365f12ce3f70376d5eb0 parisc-2.4.23-pa4-missing-ioctl-translations.diff 18091
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p1 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p4
index 4a0dbd3befac..145fdbcdad34 100644
--- a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p1
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p4
@@ -1,3 +1,3 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 fd58373c7963605bdc99133d65bf92fb patch-2.4.26-pa1.gz 721754
+MD5 ebf21b90264e2ba1cbacf11309320c75 patch-2.4.26-pa4.gz 723886
 MD5 010fe6b49e97365f12ce3f70376d5eb0 parisc-2.4.23-pa4-missing-ioctl-translations.diff 18091
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.25_p1.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.25_p1.ebuild
deleted file mode 100644
index 454ffc3c90e0..000000000000
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.25_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.25_p1.ebuild,v 1.2 2004/04/27 21:59:50 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-OKV="${PV/_p*/}"
-PATCH_LEVEL="${PV/${OKV}_p/}"
-EXTRAVERSION="-pa${PATCH_LEVEL}"
-[ ! "${PR}" = "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-PATCH_SET="`seq 0 ${PATCH_LEVEL}`"
-PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))"
-
-
-DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz
-http://dev.gentoo.org/~gmsoft/patches/parisc-2.4.23-pa4-missing-ioctl-translations.diff"
-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`echo ${PATCH_SET} | awk '{ print $1 }'`
-	zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1
-
-
-	DEFCONFIG="${S}/arch/parisc/defconfig"
-
-	# Tweaks the default configuration
-
-	# Enable stuff
-	for i in CONFIG_SERIAL_NONSTANDARD CONFIG_PDC_CONSOLE CONFIG_DEVFS_FS \
-		CONFIG_USB CONFIG_USB_OHCI CONFIG_USB_HID CONFIG_USB_HIDINPUT \
-		CONFIG_CRC32 CONFIG_BLK_STATS CONFIG_TMPFS
-	do
-		sed -i -e "s/^.*${i}\ .*$//" "${DEFCONFIG}"
-		echo "${i}=y" >> "${DEFCONFIG}"
-	done
-
-	# Disable stuff
-	for i in CONFIG_HOTPLUG CONFIG_PARPORT CONFIG_BLK_DEV_RAM CONFIG_MD \
-		CONFIG_CRYPTO CONFIG_DEVPTS_FS
-	do
-		sed -i -e "s/^.*${i}=.*$/# ${i} is not set/" "${DEFCONFIG}"
-	done
-
-	epatch ${DISTDIR}/parisc-2.4.23-pa4-missing-ioctl-translations.diff || die "Failed to patch missing ioctls translations!"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p1.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild
index b70fb65d66b8..8144445fb215 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p1.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.26_p1.ebuild,v 1.1 2004/04/27 22:39:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild,v 1.1 2004/06/07 00:16:35 gmsoft Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -13,12 +13,9 @@ KV="${OKV}${EXTRAVERSION}"
 
 S=${WORKDIR}/linux-${KV}
 
-PATCH_SET="`seq 1 ${PATCH_LEVEL}`"
-PATCH_COUNT="$(( `echo ${PATCH_SET} | wc -w` - 1 ))"
-
 
 DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.4/patch-${OKV}-pa${PATCH_LEVEL}.gz
 http://dev.gentoo.org/~gmsoft/patches/parisc-2.4.23-pa4-missing-ioctl-translations.diff"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
 KEYWORDS="hppa -*"
@@ -30,8 +27,8 @@ src_unpack() {
 	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
 	cd ${S}
 
-	einfo Applying ${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`
-	zcat ${DISTDIR}/patch-${OKV}-pa`echo ${PATCH_SET} | awk '{ print $1 }'`.gz | patch -sp 1
+	einfo Applying ${OKV}-pa${PATCH_LEVEL}.gz
+	zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz | patch -sp 1
 
 	DEFCONFIG="${S}/arch/parisc/defconfig"
 
@@ -54,6 +51,7 @@ src_unpack() {
 	done
 
 	epatch ${DISTDIR}/parisc-2.4.23-pa4-missing-ioctl-translations.diff || die "Failed to patch missing ioctls translations!"
+	epatch ${FILESDIR}/CAN-2004-0394.patch || die "Failed to patch CAN-2004-0394 security fix!"
 
 	kernel_universal_unpack
 }