security bump

(Portage version: 2.0.51.19)

5 files changed, 155 insertions, 16 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 19bf4acc8b8f..a8cd2f5bd585 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.104 2005/06/22 18:46:26 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.105 2005/06/27 23:29:37 marineam Exp $
+
+*ck-sources-2.6.12_p2-r1 (27 Jun 2005)
+
+  27 Jun 2005; Michael Marineau <marineam@gentoo.org>
+  +files/ck-sources-2.6.12.1.patch, +ck-sources-2.6.12_p2-r1.ebuild:
+  New genpatches version and add 2.6.12.1. Closes bug #96982.
 
   22 Jun 2005; Michael Marineau <marineam@gentoo.org>
   ck-sources-2.6.12_p2.ebuild:
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index c5e5f74a3ee3..0c0db7b066c3 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa52e13746e8258f0b008a57fe4f26ba ChangeLog 23717
+MD5 b81e3e74bb792aebd412b99b1e1b2273 ck-sources-2.6.12_p2-r1.ebuild 1523
 MD5 5d69e1de26377a9e0a4211e2c24ba046 ck-sources-2.6.11_p10.ebuild 1970
-MD5 9865aa5353a0d02dbd76ff401acd4d6a ck-sources-2.6.12_p2.ebuild 1377
-MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
-MD5 d508100c3ce32fb9ddfa6c4b992cb116 files/digest-ck-sources-2.6.12_p2 278
+MD5 aa52e13746e8258f0b008a57fe4f26ba ChangeLog 23717
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCucYsI1lqEGTUzyQRAmH5AJwP44vPClFON5Zp/+DMMQCuGBNvVgCfaXIz
-Z7Zd0VDEzCkbcU5PpDW62ac=
-=TS+l
------END PGP SIGNATURE-----
+MD5 cabf179e8073c4391a13f9c32148755a files/digest-ck-sources-2.6.11_p10 281
+MD5 aa6fb935ccbfcc340803cd35e046cee2 files/ck-sources-2.6.12.1.patch 3500
+MD5 520fc502a7524e3c96e180b150a7c1b5 files/digest-ck-sources-2.6.12_p2-r1 278
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.12_p2-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.12_p2-r1.ebuild
new file mode 100644
index 000000000000..167cb35eb59e
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-2.6.12_p2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.12_p2-r1.ebuild,v 1.1 2005/06/27 23:29:37 marineam Exp $
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="3"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+# A few hacks to set ck version via _p instead of -r
+MY_P=${P/_p*/}
+MY_PR=${PR/r/-r}
+MY_PR=${MY_PR/-r0/}
+EXTRAVERSION=-ck${PV/*_p/}${MY_PR}
+KV_FULL=${OKV}${EXTRAVERSION}
+KV_CK=${KV_FULL/-r*/}
+detect_version
+
+IUSE="ck-server"
+if use ck-server; then
+	CK_PATCH="patch-${KV_CK}-server.bz2"
+else
+	CK_PATCH="patch-${KV_CK}.bz2"
+fi
+
+UNIPATCH_LIST="${DISTDIR}/${CK_PATCH} ${FILESDIR}/ck-sources-2.6.12.1.patch"
+UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE}
+	10" #All of the 2.6.x.y patches (in ck or manual edit) start with 10
+
+DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
+HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+	ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}-server.bz2 )
+	!ck-server? ( http://ck.kolivas.org/patches/2.6/${OKV}/${KV_CK}/patch-${KV_CK}.bz2 )"
+
+KEYWORDS="~x86 ~amd64"
+
+pkg_postinst() {
+	postinst_sources
+
+	einfo "The ck patchset is tuned for desktop usage."
+	einfo "To better tune the kernel for server applications add"
+	einfo "ck-server to your use flags and reemerge ck-sources"
+}
+
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch
new file mode 100644
index 000000000000..a4860aa86f4a
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-2.6.12.1.patch
@@ -0,0 +1,93 @@
+diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
+--- a/arch/ia64/kernel/ptrace.c
++++ b/arch/ia64/kernel/ptrace.c
+@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child,
+ 				*data = (pt->cr_ipsr & IPSR_MASK);
+ 			return 0;
+ 
++		      case PT_AR_RSC:
++			if (write_access)
++				pt->ar_rsc = *data | (3 << 2); /* force PL3 */
++			else
++				*data = pt->ar_rsc;
++			return 0;
++
+ 		      case PT_AR_RNAT:
+ 			urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
+ 			rnat_addr = (long) ia64_rse_rnat_addr((long *)
+@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child,
+ 		      case PT_AR_BSPSTORE:
+ 			ptr = pt_reg_addr(pt, ar_bspstore);
+ 			break;
+-		      case PT_AR_RSC:
+-			ptr = pt_reg_addr(pt, ar_rsc);
+-			break;
+ 		      case PT_AR_UNAT:
+ 			ptr = pt_reg_addr(pt, ar_unat);
+ 			break;
+@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *chil
+ static long
+ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
+ {
+-	unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
++	unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
+ 	struct unw_frame_info info;
+ 	struct switch_stack *sw;
+ 	struct ia64_fpreg fpval;
+@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *chil
+ 	/* app regs */
+ 
+ 	retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
+-	retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
++	retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
+ 	retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
+ 	retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
+ 	retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
+@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *chil
+ 	retval |= __get_user(nat_bits, &ppr->nat);
+ 
+ 	retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
++	retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
+ 	retval |= access_uarea(child, PT_AR_EC, &ec, 1);
+ 	retval |= access_uarea(child, PT_AR_LC, &lc, 1);
+ 	retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
+diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
+--- a/arch/ia64/kernel/signal.c
++++ b/arch/ia64/kernel/signal.c
+@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *u
+ static long
+ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
+ {
+-	unsigned long ip, flags, nat, um, cfm;
++	unsigned long ip, flags, nat, um, cfm, rsc;
+ 	long err;
+ 
+ 	/* Always make any pending restarted system calls return -EINTR */
+@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __
+ 	err |= __get_user(ip, &sc->sc_ip);			/* instruction pointer */
+ 	err |= __get_user(cfm, &sc->sc_cfm);
+ 	err |= __get_user(um, &sc->sc_um);			/* user mask */
+-	err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
++	err |= __get_user(rsc, &sc->sc_ar_rsc);
+ 	err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
+ 	err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
+ 	err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
+@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __
+ 	err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8);	/* r15 */
+ 
+ 	scr->pt.cr_ifs = cfm | (1UL << 63);
++	scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
+ 
+ 	/* establish new instruction pointer: */
+ 	scr->pt.cr_iip = ip & ~0x3UL;
+diff --git a/fs/exec.c b/fs/exec.c
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -649,6 +649,7 @@ static inline int de_thread(struct task_
+ 	}
+ 	sig->group_exit_task = NULL;
+ 	sig->notify_count = 0;
++	sig->real_timer.data = (unsigned long)current;
+ 	spin_unlock_irq(lock);
+ 
+ 	/*
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2-r1
index 6b380df1a31f..bbf94a2799e0 100644
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.12_p2-r1
@@ -1,4 +1,4 @@
-MD5 b3614035f9892f8976ba9796138c40d6 genpatches-2.6.12-1.base.tar.bz2 15970
 MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
+MD5 008cd4c4713943df50867eccc911c1db genpatches-2.6.12-3.base.tar.bz2 19574
 MD5 f0be9fd59e692f3c4c5fddecd9239b2b patch-2.6.12-ck2-server.bz2 39826
 MD5 cbc1df125bb7d57796a800242309a80f patch-2.6.12-ck2.bz2 39907