Version bump. Security fix.

5 files changed, 62 insertions, 2 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index 3abab071a455..f3afe99ade4a 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.51 2005/01/10 17:44:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.52 2005/01/16 13:30:01 gmsoft Exp $
+
+*hppa-sources-2.6.10_p11 (16 Jan 2005)
+
+  16 Jan 2005; Guy Martin <gmsoft@gentoo.org> +files/LSM-capability-fix.patch,
+  +hppa-sources-2.6.10_p11.ebuild:
+  Version bump. Security fix.
 
 *hppa-sources-2.6.10_p10 (10 Jan 2005)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index af745e92636e..e9afcba14b7e 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,4 +1,5 @@
-MD5 fbfd4f9cf611b51f445dc4d48ae0b3da ChangeLog 9407
+MD5 1df10c0d89865d97c1565c5ca584095f ChangeLog 9592
+MD5 b3f3f3026234e3e4e09eb594357f2883 hppa-sources-2.6.10_p11.ebuild 755
 MD5 dcf6adc464035c767d3183e5f7774b26 hppa-sources-2.6.10_p1.ebuild 692
 MD5 f176b7d1c3f6ed8055e2d49209e0fa90 hppa-sources-2.6.10_p10.ebuild 781
 MD5 074dd720871b3b04b90e6f39c3664c7c hppa-sources-2.6.10_p2.ebuild 717
@@ -13,3 +14,5 @@ MD5 bd7b5cad7b0cadde6daab1e2c3abd13e files/digest-hppa-sources-2.6.10_p10 132
 MD5 818ff61f20404922a662b3383416b453 files/digest-hppa-sources-2.6.10_p2 131
 MD5 47f5d83813a16f62c031edd2e0c1b79b files/digest-hppa-sources-2.6.10_p4 131
 MD5 db1af05869240e3d6499fb4554fa4540 files/digest-hppa-sources-2.6.10_p6 131
+MD5 655251f31f0bdc85bdd0cd0280af22b7 files/LSM-capability-fix.patch 979
+MD5 55ffb01e7102f6f1c4a6a0e888dbddb0 files/digest-hppa-sources-2.6.10_p11 132
diff --git a/sys-kernel/hppa-sources/files/LSM-capability-fix.patch b/sys-kernel/hppa-sources/files/LSM-capability-fix.patch
new file mode 100644
index 000000000000..80390f13bd73
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/LSM-capability-fix.patch
@@ -0,0 +1,32 @@
+--- linux-2.6.10/security/dummy.c	2004-12-24 21:34:26.000000000 +0000
++++ linux-2.6.10.plasmaroo/security/dummy.c	2005-01-07 20:13:50.763073872 +0000
+@@ -74,11 +74,8 @@
+ 
+ static int dummy_capable (struct task_struct *tsk, int cap)
+ {
+-	if (cap_is_fs_cap (cap) ? tsk->fsuid == 0 : tsk->euid == 0)
+-		/* capability granted */
++	if (cap_raised (tsk->cap_effective, cap))
+ 		return 0;
+-
+-	/* capability denied */
+ 	return -EPERM;
+ }
+ 
+@@ -191,6 +188,8 @@
+ 
+ 	current->suid = current->euid = current->fsuid = bprm->e_uid;
+ 	current->sgid = current->egid = current->fsgid = bprm->e_gid;
++
++	dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
+ }
+ 
+ static int dummy_bprm_set_security (struct linux_binprm *bprm)
+@@ -550,6 +549,7 @@
+ 
+ static int dummy_task_post_setuid (uid_t id0, uid_t id1, uid_t id2, int flags)
+ {
++	dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
+ 	return 0;
+ }
+ 
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.10_p11 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.10_p11
new file mode 100644
index 000000000000..009867073e51
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.10_p11
@@ -0,0 +1,2 @@
+MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 cca268af240e39a8cffebc1048453a83 patch-2.6.10-pa11.gz 192026
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.6.10_p11.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.6.10_p11.ebuild
new file mode 100644
index 000000000000..95ce92b053d1
--- /dev/null
+++ b/sys-kernel/hppa-sources/hppa-sources-2.6.10_p11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 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.6.10_p11.ebuild,v 1.1 2005/01/16 13:30:01 gmsoft Exp $
+
+ETYPE="sources"
+inherit kernel-2
+K_NOUSENAME=true
+K_NOSETEXTRAVERSION=true
+
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+PATCH_LEVEL="${PV/${OKV}_p/}"
+SRC_URI="${KERNEL_URI} http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz"
+UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz ${FILESDIR}/CAN-2004-1056.patch ${FILESDIR}/LSM-capability-fix.patch"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
+KEYWORDS="hppa -*"