CAN-2004-0497 fix. Removed old ebuild.

7 files changed, 37 insertions, 67 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index fa9e2d388d40..f6433de67d87 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.39 2004/07/03 22:15:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.40 2004/07/09 19:06:58 gmsoft Exp $
+
+*hppa-sources-2.4.26_p6-r1 (09 Jul 2004)
+
+  09 Jul 2004; Guy Martin <gmsoft@gentoo.org> hppa-sources-2.4.26_p4.ebuild,
+  hppa-sources-2.4.26_p6-r1.ebuild, hppa-sources-2.4.26_p6.ebuild,
+  files/CAN-2004-0497.patch:
+  CAN-2004-0497 fix. Removed old ebuild.
 
 *hppa-sources-2.4.26_p6 (03 Jul 2004)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index 9a44905831c9..8825dec39b99 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,9 +1,8 @@
-MD5 a83c5fac64d825487d0ec0aa06d6850b hppa-sources-2.4.26_p4.ebuild 1983
 MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
-MD5 31fb6ff5d8efb16d971925dccfda64f5 hppa-sources-2.4.26_p6.ebuild 2188
-MD5 a4fd24f10c5444a4c9b667010d9146f5 ChangeLog 6632
+MD5 db23c3d337ea040a2d5d526e9826e6f7 ChangeLog 6889
+MD5 b92081a2a762d816b53ea9ed60e3814b hppa-sources-2.4.26_p6-r1.ebuild 2284
 MD5 d4a740ae56c2049247083af387a22a85 files/CAN-2004-0394.patch 350
-MD5 2cd1309267a6cde4f858cfe95a323312 files/digest-hppa-sources-2.4.26_p4 224
 MD5 0f66013f643c79c97fda489618a4e2fd files/CAN-2004-0535-2.4-e1000.patch 476
 MD5 dc18e982f8149588a291956481885a8c files/CAN-2004-0495-2.4-sparse.patch 17549
-MD5 ff11f350435d0871b62d2f7a62bc463c files/digest-hppa-sources-2.4.26_p6 224
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/CAN-2004-0497.patch 707
+MD5 ff11f350435d0871b62d2f7a62bc463c files/digest-hppa-sources-2.4.26_p6-r1 224
diff --git a/sys-kernel/hppa-sources/files/CAN-2004-0497.patch b/sys-kernel/hppa-sources/files/CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/CAN-2004-0497.patch
@@ -0,0 +1,23 @@
+# ChangeSet
+#
+# fs/attr.c
+#   2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0
+#   Thomas Biege: Fix missing DAC check on sys_chown
+# 
+# fs/attr.c
+#   2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1
+#   Add missing bracket to inode_change_ok() fix
+# 
+diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c
+--- a/fs/attr.c	2004-07-08 17:05:20 -07:00
++++ b.plasmaroo/fs/attr.c	2004-07-08 17:05:20 -07:00
+@@ -35,7 +35,8 @@
+ 
+ 	/* Make sure caller can chgrp. */
+ 	if ((ia_valid & ATTR_GID) &&
+-	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
++	    (current->fsuid != inode->i_uid ||
++	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
+ 	    !capable(CAP_CHOWN))
+ 		goto error;
+ 
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p4 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p4
deleted file mode 100644
index 145fdbcdad34..000000000000
--- a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-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/files/digest-hppa-sources-2.4.26_p6 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p6-r1
index 1783d6ae9683..1783d6ae9683 100644
--- a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p6
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.4.26_p6-r1
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild
deleted file mode 100644
index 9c4d2e0119fd..000000000000
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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_p4.ebuild,v 1.2 2004/06/24 22:58:08 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}
-
-
-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${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 -*"
-SLOT="${KV}"
-
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
-	cd ${S}
-
-	einfo Applying ${OKV}-pa${PATCH_LEVEL}.gz
-	zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.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!"
-	epatch ${FILESDIR}/CAN-2004-0394.patch || die "Failed to patch CAN-2004-0394 security fix!"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p6.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p6-r1.ebuild
index c53cce626f34..638ea9876f7e 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.26_p6.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.26_p6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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_p6.ebuild,v 1.1 2004/07/03 22:15:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.26_p6-r1.ebuild,v 1.1 2004/07/09 19:06:58 gmsoft Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -54,6 +54,7 @@ src_unpack() {
 	epatch ${FILESDIR}/CAN-2004-0394.patch || die "Failed to patch CAN-2004-0394 security fix!"
 	epatch ${FILESDIR}/CAN-2004-0495-2.4-sparse.patch || die "Failed to patch CAN-2004-0495 security fix!"
 	epatch ${FILESDIR}/CAN-2004-0535-2.4-e1000.patch || die "Failed to patch CAN-2004-0535 security fix!"
+	epatch ${FILESDIR}/CAN-2004-0497.patch || die "Failed to patch CAN-2004-0497 security fix!"
 
 	kernel_universal_unpack
 }