Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys-kernel/hppa-dev-sources/ChangeLog10
-rw-r--r--sys-kernel/hppa-dev-sources/Manifest3
-rw-r--r--sys-kernel/hppa-dev-sources/files/CAN-2004-0497.patch75
-rw-r--r--sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r12
-rw-r--r--sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r12
-rw-r--r--sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r2 (renamed from sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1)0
-rw-r--r--sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild31
-rw-r--r--sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r2.ebuild (renamed from sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild)3
-rw-r--r--sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1.ebuild31
9 files changed, 89 insertions, 68 deletions
diff --git a/sys-kernel/hppa-dev-sources/ChangeLog b/sys-kernel/hppa-dev-sources/ChangeLog
index d06f46844fa1..d84aba977ac2 100644
--- a/sys-kernel/hppa-dev-sources/ChangeLog
+++ b/sys-kernel/hppa-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-kernel/hppa-dev-sources
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.17 2004/07/03 21:09:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.18 2004/07/09 19:39:15 gmsoft Exp $
+
+*hppa-dev-sources-2.6.7_p1-r2 (09 Jul 2004)
+
+ 09 Jul 2004; Guy Martin <gmsoft@gentoo.org>
+ hppa-dev-sources-2.6.6_p4-r1.ebuild, hppa-dev-sources-2.6.7_p1-r1.ebuild,
+ hppa-dev-sources-2.6.7_p1-r2.ebuild, hppa-dev-sources-2.6.7_p1.ebuild,
+ files/CAN-2004-0497.patch:
+ CAN-2004-0497 fix. Removed old ebuild.
*hppa-dev-sources-2.6.7_p1-r1 (03 Jul 2004)
diff --git a/sys-kernel/hppa-dev-sources/Manifest b/sys-kernel/hppa-dev-sources/Manifest
index 042f30d030b5..9d7f9fe7aa40 100644
--- a/sys-kernel/hppa-dev-sources/Manifest
+++ b/sys-kernel/hppa-dev-sources/Manifest
@@ -3,8 +3,11 @@ MD5 3a54ee0d69f421f6853cdbdd842f17f1 hppa-dev-sources-2.6.6_p4-r1.ebuild 1072
MD5 54bc15f49fe21762e71f18994cae9d43 ChangeLog 3132
MD5 a27203f1593243cea48be1b99f7757b2 hppa-dev-sources-2.6.7_p1.ebuild 1067
MD5 840962cc0d85609317199b2fd0353c7b hppa-dev-sources-2.6.7_p1-r1.ebuild 1123
+MD5 afb5bfa833c0ccc9a97aa20e84c121c3 hppa-dev-sources-2.6.7_p1-r2.ebuild 1163
MD5 c857b174f7e6a6b0ab2e26f9306ad0a0 files/ncr53c8xx.diff 3701
MD5 b60da7697cdef1cea118a7766e2acc8e files/digest-hppa-dev-sources-2.6.6_p4-r1 129
MD5 ce5fc85224c09cf512dc725ee88945e4 files/digest-hppa-dev-sources-2.6.7_p1 129
MD5 c91330cc5b4044b6f59696095c2dc0fb files/CAN-2004-0626-death_packet.patch 423
MD5 ce5fc85224c09cf512dc725ee88945e4 files/digest-hppa-dev-sources-2.6.7_p1-r1 129
+MD5 b6e38b41c8a79943df2ab2642149d06f files/CAN-2004-0497.patch 2214
+MD5 ce5fc85224c09cf512dc725ee88945e4 files/digest-hppa-dev-sources-2.6.7_p1-r2 129
diff --git a/sys-kernel/hppa-dev-sources/files/CAN-2004-0497.patch b/sys-kernel/hppa-dev-sources/files/CAN-2004-0497.patch
new file mode 100644
index 000000000000..1e4ba6f7601a
--- /dev/null
+++ b/sys-kernel/hppa-dev-sources/files/CAN-2004-0497.patch
@@ -0,0 +1,75 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/07/02 20:55:04-07:00 chrisw@osdl.org
+# [PATCH] chown permission check fix for ATTR_GID
+#
+# SuSE discovered this problem with chown and ATTR_GID. Make sure user
+# is authorized to change the group, CAN-2004-0497.
+#
+# fs/attr.c
+# 2004/07/02 09:07:32-07:00 chrisw@osdl.org +2 -1
+# chown permission check fix for ATTR_GID
+#
+diff -Nru a/fs/attr.c b/fs/attr.c
+--- a/fs/attr.c 2004-07-08 16:35:57 -07:00
++++ b/fs/attr.c 2004-07-08 16:35:57 -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;
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/07/02 18:48:26-07:00 chrisw@osdl.org
+# [PATCH] check attr updates in /proc
+#
+# Any proc entry with default proc_file_inode_operations allow unauthorized
+# attribute updates. This is very dangerous for proc entries that rely
+# solely on file permissions for open/read/write.
+#
+# Signed-off-by: Chris Wright <chrisw@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# fs/proc/generic.c
+# 2004/07/02 15:47:55-07:00 chrisw@osdl.org +14 -7
+# check attr updates in /proc
+#
+diff -Nru a/fs/proc/generic.c b/fs/proc/generic.c
+--- a/fs/proc/generic.c 2004-07-08 17:03:20 -07:00
++++ b/fs/proc/generic.c 2004-07-08 17:03:20 -07:00
+@@ -231,14 +231,21 @@
+ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
+ {
+ struct inode *inode = dentry->d_inode;
+- int error = inode_setattr(inode, iattr);
+- if (!error) {
+- struct proc_dir_entry *de = PDE(inode);
+- de->uid = inode->i_uid;
+- de->gid = inode->i_gid;
+- de->mode = inode->i_mode;
+- }
++ struct proc_dir_entry *de = PDE(inode);
++ int error;
+
++ error = inode_change_ok(inode, iattr);
++ if (error)
++ goto out;
++
++ error = inode_setattr(inode, iattr);
++ if (error)
++ goto out;
++
++ de->uid = inode->i_uid;
++ de->gid = inode->i_gid;
++ de->mode = inode->i_mode;
++out:
+ return error;
+ }
+
diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1
deleted file mode 100644
index db4828fdb953..000000000000
--- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.6_p4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
-MD5 665cd5b095259c02ffeaf52f8fd6d243 patch-2.6.6-pa4.gz 133095
diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1
deleted file mode 100644
index 7e748cdf493c..000000000000
--- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 c9354bcf2a81d22a23d6c0c1725717a1 patch-2.6.7-pa1.gz 125457
diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r2
index 7e748cdf493c..7e748cdf493c 100644
--- a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1
+++ b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r2
diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild
deleted file mode 100644
index 325304780690..000000000000
--- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild
+++ /dev/null
@@ -1,31 +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-dev-sources/hppa-dev-sources-2.6.6_p4-r1.ebuild,v 1.2 2004/06/24 22:57:46 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version. They can be the same.
-
-ETYPE="sources"
-inherit kernel-2
-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.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz"
-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}
-
- epatch ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz
- epatch ${FILESDIR}/ncr53c8xx.diff
-
-}
diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r2.ebuild
index b927d41105f4..32ee5c2bae6f 100644
--- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild
+++ b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r2.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-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild,v 1.1 2004/07/03 21:09:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r2.ebuild,v 1.1 2004/07/09 19:39:15 gmsoft Exp $
#OKV=original kernel version, KV=patched kernel version. They can be the same.
ETYPE="sources"
@@ -28,5 +28,6 @@ src_unpack() {
epatch ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz
epatch ${FILESDIR}/ncr53c8xx.diff
epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+ epatch ${FILESDIR}/CAN-2004-0497.patch
}
diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1.ebuild
deleted file mode 100644
index ca4caf7ed797..000000000000
--- a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1.ebuild
+++ /dev/null
@@ -1,31 +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-dev-sources/hppa-dev-sources-2.6.7_p1.ebuild,v 1.3 2004/06/29 22:43:22 vapier Exp $
-#OKV=original kernel version, KV=patched kernel version. They can be the same.
-
-ETYPE="sources"
-inherit kernel-2
-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.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz"
-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}
-
- epatch ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz
- epatch ${FILESDIR}/ncr53c8xx.diff
-
-}