diff options
author | Tim Yamin <plasmaroo@gentoo.org> | 2004-05-28 22:20:39 +0000 |
---|---|---|
committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-05-28 22:20:39 +0000 |
commit | cec88c6199e77e3f73fa5ef2749ae10683b5ddbd (patch) | |
tree | 4b6b11963af6b9c499e090fb2ca5da4337ec8ee9 | |
parent | Fixed BUG #51281 (again). (Manifest recommit) (diff) | |
download | gentoo-2-cec88c6199e77e3f73fa5ef2749ae10683b5ddbd.tar.gz gentoo-2-cec88c6199e77e3f73fa5ef2749ae10683b5ddbd.tar.bz2 gentoo-2-cec88c6199e77e3f73fa5ef2749ae10683b5ddbd.zip |
Added patches for the CAN-2004-0075, CAN-2004-0181, CAN-2004-0228, CAN-2004-0229, CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bugs #47881 and #51844. Old versions of sources removed.
38 files changed, 144 insertions, 906 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog index 1f13b562c0d6..d9582d282532 100644 --- a/sys-kernel/ck-sources/ChangeLog +++ b/sys-kernel/ck-sources/ChangeLog @@ -1,11 +1,20 @@ # ChangeLog for sys-kernel/ck-sources # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.33 2004/04/27 21:57:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.34 2004/05/28 22:20:39 plasmaroo Exp $ + +*ck-sources-2.4.26-r1 (28 May 2004) + + 28 May 2004; <plasmaroo@gentoo.org> +ck-sources-2.4.26-r1.ebuild, + ck-sources-2.6.4-r2.ebuild, +files/ck-sources-2.4.26.CAN-2004-0394.patch, + +files/ck-sources-2.6.4...patch: + Added patches for the CAN-2004-0075, CAN-2004-0181, CAN-2004-0228, + CAN-2004-0229, CAN-2004-0394, and CAN-2004-0427 vulnerabilities. Bugs + #47881 and #51844. Old versions of sources removed. 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ck-sources-2.4.22-r1.ebuild, ck-sources-2.4.22-r2.ebuild, ck-sources-2.4.22-r3.ebuild, ck-sources-2.4.23-r1.ebuild: - Add inherit eutils + Add inherit eutils. 17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ck-sources-2.4.24-r1.ebuild, ck-sources-2.4.25-r1.ebuild: @@ -25,17 +34,17 @@ Added patches for the CAN-2004-0109 issue; bug #47881. 14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ck-sources-2.6.4-r2.ebuild: - Added IUSE= + Added IUSE=. *ck-sources-2.6.4-r2 (13 Apr 2004) 13 Apr 2004; <coxj@gentoo.org> ck-sources-2.6.4-r2.ebuild: - Version Bump + Version Bump. 12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ck-sources-2.4.24-r1.ebuild, ck-sources-2.6.2-r1.ebuild, ck-sources-2.6.3-r1.ebuild, ck-sources-2.6.3-r2.ebuild: - Add eutils to inherit, add IUSE= + Add eutils to inherit, add IUSE=. *ck-sources-2.6.4-r1 (14 Mar 2004) *ck-sources-2.4.25-r1 (14 Mar 2004) diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild deleted file mode 100644 index cced3415689c..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.4.22-r1.ebuild +++ /dev/null @@ -1,69 +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/ck-sources/ck-sources-2.4.22-r1.ebuild,v 1.6 2004/04/27 21:57:29 agriffis Exp $ - -IUSE="build" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" - -inherit kernel eutils - -# CKV=con kolivas release version -CKV=ck${PR/r/} -# KV=patched kernel version -KV="${PV/_/-}-${CKV}" -# OKV=original kernel version as provided by ebuild -OKV="`echo ${KV} | cut -d- -f1`" -# OKVLAST=(working) last digit of OKV -OKVLAST="`echo ${OKV} | cut -d. -f3`" -# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release) -OKVLASTPR="`expr ${OKVLAST} - 1`" -# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac -PRERC="`echo ${PV}|grep \_`" - -# Other working variables -S=${WORKDIR}/linux-${KV} -EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`" -BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`" - -# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently -# ourkernel is the stable kernel we'll be working with (previous or current) -if [ ${PRERC} ]; then - OURKERNEL="2.4.${OKVLASTPR}" - SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2" -else - OURKERNEL="2.4.${OKVLAST}" - SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2" -fi - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" - -KEYWORDS="x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OURKERNEL}.tar.bz2 - mv linux-${OURKERNEL} linux-${KV} || die - - cd linux-${KV} - - # if we need a pre/rc patch, then use it - if [ ${PRERC} ]; then - bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" - fi - - bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-aa patch failed" - - epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!" - epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" - epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" - - kernel_universal_unpack -} - diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild deleted file mode 100644 index 3838ce0c0be4..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.4.22-r2.ebuild +++ /dev/null @@ -1,76 +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/ck-sources/ck-sources-2.4.22-r2.ebuild,v 1.6 2004/04/27 21:57:29 agriffis Exp $ - -IUSE="build" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" - -inherit kernel eutils - -# CKV=con kolivas release version -CKV=ck${PR/r/} -# KV=patched kernel version -KV="${PV/_/-}-${CKV}" -# OKV=original kernel version as provided by ebuild -OKV="`echo ${KV} | cut -d- -f1`" -# OKVLAST=(working) last digit of OKV -OKVLAST="`echo ${OKV} | cut -d. -f3`" -# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release) -OKVLASTPR="`expr ${OKVLAST} - 1`" -# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac -PRERC="`echo ${PV}|grep \_`" - -# Other working variables -S=${WORKDIR}/linux-${KV} -EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`" -BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`" - -# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently -# ourkernel is the stable kernel we'll be working with (previous or current) -if [ ${PRERC} ]; then - OURKERNEL="2.4.${OKVLASTPR}" - SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2" -else - OURKERNEL="2.4.${OKVLAST}" -##### Fix Me : grossness until these showstopper bugs are in a full -ck patch - SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2.4.22-ck2-fix.patch - http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 - http://ck.kolivas.org/patches/2.4/${BASE}/${KV}/patch-${KV}.bz2" - #http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2" -fi - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" - -KEYWORDS="x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OURKERNEL}.tar.bz2 - mv linux-${OURKERNEL} linux-${KV} || die - - cd linux-${KV} - - # if we need a pre/rc patch, then use it - if [ ${PRERC} ]; then - bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" - fi - - bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ck patch failed" - - epatch ${DISTDIR}/patch-2.4.22-ck2-fix.patch - epatch ${DISTDIR}/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 - - epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!" - epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" - epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" - - kernel_universal_unpack -} - diff --git a/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild deleted file mode 100644 index 83ea644670c9..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.4.22-r3.ebuild +++ /dev/null @@ -1,76 +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/ck-sources/ck-sources-2.4.22-r3.ebuild,v 1.4 2004/04/27 21:57:29 agriffis Exp $ - -IUSE="build" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" - -inherit kernel eutils - -# CKV=con kolivas release version -CKV=ck${PR/r/} -# KV=patched kernel version -KV="${PV/_/-}-${CKV}" -# OKV=original kernel version as provided by ebuild -OKV="`echo ${KV} | cut -d- -f1`" -# OKVLAST=(working) last digit of OKV -OKVLAST="`echo ${OKV} | cut -d. -f3`" -# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release) -OKVLASTPR="`expr ${OKVLAST} - 1`" -# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac -PRERC="`echo ${PV}|grep \_`" - -# Other working variables -S=${WORKDIR}/linux-${KV} -EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`" -BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`" - -# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently -# ourkernel is the stable kernel we'll be working with (previous or current) -if [ ${PRERC} ]; then - OURKERNEL="2.4.${OKVLASTPR}" - SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2" -else - OURKERNEL="2.4.${OKVLAST}" -##### Fix Me : grossness until these showstopper bugs are in a full -ck patch - SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2.4.22-ck2-fix.patch - http://ck.kolivas.org/patches/2.4/2.4.22/2.4.22-ck2/fixes/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 - http://ck.kolivas.org/patches/2.4/${BASE}/${KV/3/2}/patch-${KV/3/2}.bz2" - #http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2" -fi - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" - -KEYWORDS="x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OURKERNEL}.tar.bz2 - mv linux-${OURKERNEL} linux-${KV} || die - - cd linux-${KV} - - # if we need a pre/rc patch, then use it - if [ ${PRERC} ]; then - bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" - fi - - bzcat ${DISTDIR}/patch-${KV/3/2}.bz2|patch -p1 || die "-ck patch failed" - - epatch ${DISTDIR}/patch-2.4.22-ck2-fix.patch - epatch ${DISTDIR}/patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 - - epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!" - epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" - epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" - - kernel_universal_unpack -} - diff --git a/sys-kernel/ck-sources/ck-sources-2.4.23-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.23-r1.ebuild deleted file mode 100644 index 1613a42571b9..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.4.23-r1.ebuild +++ /dev/null @@ -1,67 +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/ck-sources/ck-sources-2.4.23-r1.ebuild,v 1.4 2004/04/27 21:57:29 agriffis Exp $ - -IUSE="build" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" - -inherit kernel eutils - -# CKV=con kolivas release version -CKV=ck${PR/r/} -# KV=patched kernel version -KV="${PV/_/-}-${CKV}" -# OKV=original kernel version as provided by ebuild -OKV="`echo ${KV} | cut -d- -f1`" -# OKVLAST=(working) last digit of OKV -OKVLAST="`echo ${OKV} | cut -d. -f3`" -# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release) -OKVLASTPR="`expr ${OKVLAST} - 1`" -# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac -PRERC="`echo ${PV}|grep \_`" - -# Other working variables -S=${WORKDIR}/linux-${KV} -EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`" -BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`" - -# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently -# ourkernel is the stable kernel we'll be working with (previous or current) -if [ ${PRERC} ]; then - OURKERNEL="2.4.${OKVLASTPR}" - SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://members.optusnet.com.au/ckolivas/kernel/patch-${KV}.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2" -else - OURKERNEL="2.4.${OKVLAST}" - SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://ck.kolivas.org/patches/2.4/${BASE}/${KV}/patch-${KV}.bz2" -fi - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" - -KEYWORDS="x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OURKERNEL}.tar.bz2 - mv linux-${OURKERNEL} linux-${KV} || die - cd linux-${KV} - - # if we need a pre/rc patch, then use it - if [ ${PRERC} ]; then - bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" - fi - - bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ck patch failed" - - epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" - epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" - - kernel_universal_unpack -} - diff --git a/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild deleted file mode 100644 index afae3a1de074..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.4.25-r1.ebuild +++ /dev/null @@ -1,66 +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/ck-sources/ck-sources-2.4.25-r1.ebuild,v 1.4 2004/04/17 19:03:26 aliz Exp $ - -IUSE="" - -# OKV=original kernel version, KV=patched kernel version. - -ETYPE="sources" - -inherit kernel eutils - -# CKV=con kolivas release version -CKV=lck${PR/r/} -# KV=patched kernel version -KV="${PV/_/-}-${CKV}" -# OKV=original kernel version as provided by ebuild -OKV="`echo ${KV} | cut -d- -f1`" -# OKVLAST=(working) last digit of OKV -OKVLAST="`echo ${OKV} | cut -d. -f3`" -# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release) -OKVLASTPR="`expr ${OKVLAST} - 1`" -# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac -PRERC="`echo ${PV}|grep \_`" - -# Other working variables -S=${WORKDIR}/linux-${KV} -EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`" -BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`" - -# If it's a last-stable+pre/rc+ac (marcelo), we need to handle it differently -# ourkernel is the stable kernel we'll be working with (previous or current) -if [ ${PRERC} ]; then - OURKERNEL="2.4.${OKVLASTPR}" - SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://www.plumlocosoft.com/kernel/patches/2.4/${PV}/${KV}/patch-${KV}.bz2 - mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2" -else - OURKERNEL="2.4.${OKVLAST}" - SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2 - http://www.plumlocosoft.com/kernel/patches/2.4/${PV}/${KV}/patch-${KV}.bz2" -fi - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" - -KEYWORDS="~x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OURKERNEL}.tar.bz2 - mv linux-${OURKERNEL} linux-${KV} || die - cd linux-${KV} - - # if we need a pre/rc patch, then use it - if [ ${PRERC} ]; then - bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" - fi - - bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-lck patch failed!" - epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!" - epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!" - epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!" - - kernel_universal_unpack -} diff --git a/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild index a3df0f958c0d..78532d5dd2d9 100644 --- a/sys-kernel/ck-sources/ck-sources-2.4.24-r1.ebuild +++ b/sys-kernel/ck-sources/ck-sources-2.4.26-r1.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/ck-sources/ck-sources-2.4.24-r1.ebuild,v 1.5 2004/04/17 19:03:26 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild,v 1.1 2004/05/28 22:20:39 plasmaroo Exp $ IUSE="" @@ -11,7 +11,7 @@ ETYPE="sources" inherit kernel eutils # CKV=con kolivas release version -CKV=ck${PR/r/} +CKV=lck${PR/r/} # KV=patched kernel version KV="${PV/_/-}-${CKV}" # OKV=original kernel version as provided by ebuild @@ -57,10 +57,7 @@ src_unpack() { bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed" fi - bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-ck patch failed" - epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!" - epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!" - + bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-lck patch failed!" + epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!" kernel_universal_unpack } - diff --git a/sys-kernel/ck-sources/ck-sources-2.6.2-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.2-r1.ebuild deleted file mode 100644 index f4be32018a86..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.6.2-r1.ebuild +++ /dev/null @@ -1,20 +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/ck-sources/ck-sources-2.6.2-r1.ebuild,v 1.3 2004/04/12 16:36:22 aliz Exp $ - -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.munmap.patch" -K_PREPATCHED="yes" -UNIPATCH_STRICTORDER="yes" - -K_NOUSENAME="yes" -ETYPE="sources" -inherit kernel-2 -detect_version -IUSE="" - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" -SRC_URI="${KERNEL_URI} http://ck.kolivas.org/patches/2.6/${KV/-ck*/}/${KV}/patch-${KV}.bz2" - -KEYWORDS="~x86" - diff --git a/sys-kernel/ck-sources/ck-sources-2.6.3-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.3-r1.ebuild deleted file mode 100644 index 476f323bb0f2..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.6.3-r1.ebuild +++ /dev/null @@ -1,20 +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/ck-sources/ck-sources-2.6.3-r1.ebuild,v 1.2 2004/04/12 16:36:22 aliz Exp $ - -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2" -K_PREPATCHED="yes" -UNIPATCH_STRICTORDER="yes" - -K_NOUSENAME="yes" -ETYPE="sources" -inherit kernel-2 -detect_version -IUSE="" - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" -SRC_URI="${KERNEL_URI} http://ck.kolivas.org/patches/2.6/${KV/-ck*/}/${KV}/patch-${KV}.bz2" - -KEYWORDS="~x86" - diff --git a/sys-kernel/ck-sources/ck-sources-2.6.3-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.3-r2.ebuild deleted file mode 100644 index 98f9bd0fc67f..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.6.3-r2.ebuild +++ /dev/null @@ -1,20 +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/ck-sources/ck-sources-2.6.3-r2.ebuild,v 1.2 2004/04/12 16:36:22 aliz Exp $ - -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2" -K_PREPATCHED="yes" -UNIPATCH_STRICTORDER="yes" - -K_NOUSENAME="yes" -ETYPE="sources" -inherit kernel-2 -detect_version -IUSE="" - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" -SRC_URI="${KERNEL_URI} http://ck.kolivas.org/patches/2.6/${KV/-ck*/}/${KV}/patch-${KV}.bz2" - -KEYWORDS="~x86" - diff --git a/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild deleted file mode 100644 index c640055ae7bc..000000000000 --- a/sys-kernel/ck-sources/ck-sources-2.6.4-r1.ebuild +++ /dev/null @@ -1,30 +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/ck-sources/ck-sources-2.6.4-r1.ebuild,v 1.2 2004/04/17 19:03:26 aliz Exp $ - -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2" -K_PREPATCHED="yes" -UNIPATCH_STRICTORDER="yes" -IUSE="" -K_NOUSENAME="yes" -ETYPE="sources" -inherit kernel-2 -detect_version - -DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset" -HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/" -SRC_URI="${KERNEL_URI} http://ck.kolivas.org/patches/2.6/${KV/-ck*/}/${KV}/patch-${KV}.bz2" - -KEYWORDS="~x86" - -pkg_postinst() { - postinst_sources - - ewarn "IMPORTANT:" - ewarn "ptyfs support has now been dropped from devfs and as a" - ewarn "result you are now required to compile this support into" - ewarn "the kernel. You can do so by enabling the following options" - ewarn " Device Drivers -> Character devices -> Unix98 PTY Support" - ewarn " File systems -> Pseudo filesystems -> /dev/pts filesystem." - echo -} diff --git a/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild index 9bace55906e7..ccc2ab56c220 100644 --- a/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild +++ b/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild,v 1.3 2004/04/15 08:09:07 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild,v 1.4 2004/05/28 22:20:39 plasmaroo Exp $ -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0109.patch" +UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0075.patch ${FILESDIR}/${P}.CAN-2004-0109.patch ${FILESDIR}/${P}.CAN-2004-0181.patch ${FILESDIR}/${P}.CAN-2004-0228.patch ${FILESDIR}/${P}.CAN-2004-0229.patch ${FILESDIR}/${P}.CAN-2004-0427.patch" K_PREPATCHED="yes" UNIPATCH_STRICTORDER="yes" diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.24.CAN-2004-0001.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.24.CAN-2004-0001.patch deleted file mode 100644 index bb51f9aa9a62..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.24.CAN-2004-0001.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -u linux/arch/x86_64/ia32/ptrace32.c-PTRACE linux/arch/x86_64/ia32/ptrace32.c ---- linux/arch/x86_64/ia32/ptrace32.c-PTRACE 2003-06-16 13:03:58.000000000 +0200 -+++ linux/arch/x86_64/ia32/ptrace32.c 2004-01-07 18:04:43.000000000 +0100 -@@ -25,6 +25,10 @@ - #include <asm/fpu32.h> - #include <linux/mm.h> - -+/* determines which flags the user has access to. */ -+/* 1 = access 0 = no access */ -+#define FLAG_MASK 0x44dd5UL -+ - #define R32(l,q) \ - case offsetof(struct user32, regs.l): stack[offsetof(struct pt_regs, q)/8] = val; break - -@@ -69,9 +73,12 @@ - R32(eip, rip); - R32(esp, rsp); - -- case offsetof(struct user32, regs.eflags): -- stack[offsetof(struct pt_regs, eflags)/8] = val & 0x44dd5; -+ case offsetof(struct user32, regs.eflags): { -+ __u64 *flags = &stack[offsetof(struct pt_regs, eflags)/8]; -+ val &= FLAG_MASK; -+ *flags = val | (*flags & ~FLAG_MASK); - break; -+ } - - case offsetof(struct user32, u_debugreg[4]): - case offsetof(struct user32, u_debugreg[5]): diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.24.munmap.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.24.munmap.patch deleted file mode 100644 index e120b35b7adb..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.24.munmap.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c ---- linux-2.4.25-rc3/mm/mremap.c 2004-02-18 13:56:01.000000000 +0000 -+++ linux-2.4.25-rc4/mm/mremap.c 2004-02-18 13:49:08.000000000 +0000 -@@ -258,16 +258,20 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret && new_len) -+ goto out; - } - - /* - * Always allow a shrinking remap: that just unmaps - * the unnecessary pages.. - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - } diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0109.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0109.patch deleted file mode 100644 index d02b51c57fc6..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0109.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- linux/fs/isofs/rock.c.orig -+++ linux/fs/isofs/rock.c -@@ -14,6 +14,7 @@ - #include <linux/slab.h> - #include <linux/pagemap.h> - #include <linux/smp_lock.h> -+#include <asm/page.h> - - #include "rock.h" - -@@ -419,7 +420,7 @@ - return 0; - } - --static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr) -+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit) - { - int slen; - int rootflag; -@@ -431,16 +432,25 @@ - rootflag = 0; - switch (slp->flags & ~1) { - case 0: -+ if (slp->len > plimit - rpnt) -+ return NULL; - memcpy(rpnt, slp->text, slp->len); - rpnt+=slp->len; - break; -+ case 2: -+ if (rpnt >= plimit) -+ return NULL; -+ *rpnt++='.'; -+ break; - case 4: -+ if (2 > plimit - rpnt) -+ return NULL; - *rpnt++='.'; -- /* fallthru */ -- case 2: - *rpnt++='.'; - break; - case 8: -+ if (rpnt >= plimit) -+ return NULL; - rootflag = 1; - *rpnt++='/'; - break; -@@ -457,17 +467,23 @@ - * If there is another SL record, and this component - * record isn't continued, then add a slash. - */ -- if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1)) -+ if ((!rootflag) && (rr->u.SL.flags & 1) && -+ !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -+ } - break; - } - - /* - * If this component record isn't continued, then append a '/'. - */ -- if (!rootflag && !(oldslp->flags & 1)) -+ if (!rootflag && !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -- -+ } - } - return rpnt; - } -@@ -548,7 +564,10 @@ - CHECK_SP(goto out); - break; - case SIG('S', 'L'): -- rpnt = get_symlink_chunk(rpnt, rr); -+ rpnt = get_symlink_chunk(rpnt, rr, -+ link + (PAGE_SIZE - 1)); -+ if (rpnt == NULL) -+ goto out; - break; - case SIG('C', 'E'): - /* This tells is if there is a continuation record */ - diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0177.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0177.patch deleted file mode 100644 index da6b7e190685..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0177.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.4.26-pre3/fs/jbd/journal.c 2004-02-18 05:36:31.000000000 -0800 -+++ linux-2.4.26-pre4/fs/jbd/journal.c 2004-03-16 09:59:36.000000000 -0800 -@@ -671,6 +671,7 @@ - - bh = getblk(journal->j_dev, blocknr, journal->j_blocksize); - lock_buffer(bh); -+ memset(bh->b_data, 0, journal->j_blocksize); - BUFFER_TRACE(bh, "return this buffer"); - return journal_add_journal_head(bh); - } diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0178.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0178.patch deleted file mode 100644 index 19e57268c2fa..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.25.CAN-2004-0178.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.4.26-pre2/drivers/sound/sb_audio.c 2002-02-25 11:38:06.000000000 -0800 -+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c 2004-03-13 07:43:23.000000000 -0800 -@@ -879,7 +879,7 @@ - c -= locallen; p += locallen; - } - /* used = ( samples * 16 bits size ) */ -- *used = len << 1; -+ *used = max_in > ( max_out << 1) ? (max_out << 1) : max_in; - /* returned = ( samples * 8 bits size ) */ - *returned = len; - } diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.26.CAN-2004-0394.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.26.CAN-2004-0394.patch new file mode 100644 index 000000000000..273f1a52046f --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.26.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/ck-sources/files/ck-sources-2.6.2.munmap.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.2.munmap.patch deleted file mode 100644 index 47a199c870db..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.2.munmap.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur 2.6.2/mm/mremap.c 2.6.3/mm/mremap.c ---- 2.6.2/mm/mremap.c 2004-02-18 03:29:48.000000000 +0100 -+++ 2.6.3/mm/mremap.c 2004-02-18 10:21:20.000000000 +0100 -@@ -135,15 +135,17 @@ - dst = alloc_one_pte_map(mm, new_addr); - if (src == NULL) - src = get_one_pte_map_nested(mm, old_addr); -- error = copy_one_pte(vma, old_addr, src, dst, &pte_chain); -- pte_unmap_nested(src); -- pte_unmap(dst); -- } else - /* -- * Why do we need this flush ? If there is no pte for -- * old_addr, then there must not be a pte for it as well. -+ * Since alloc_one_pte_map can drop and re-acquire -+ * page_table_lock, we should re-check the src entry... - */ -- flush_tlb_page(vma, old_addr); -+ if (src) { -+ error = copy_one_pte(vma, old_addr, src, -+ dst, &pte_chain); -+ pte_unmap_nested(src); -+ } -+ pte_unmap(dst); -+ } - spin_unlock(&mm->page_table_lock); - pte_chain_free(pte_chain); - out: -@@ -346,7 +348,9 @@ - if ((addr <= new_addr) && (addr+old_len) > new_addr) - goto out; - -- do_munmap(current->mm, new_addr, new_len); -+ ret = do_munmap(current->mm, new_addr, new_len); -+ if (ret) -+ goto out; - } - - /* -@@ -354,9 +358,11 @@ - * the unnecessary pages.. - * do_munmap does all the needed commit accounting - */ -- ret = addr; - if (old_len >= new_len) { -- do_munmap(current->mm, addr+new_len, old_len - new_len); -+ ret = do_munmap(current->mm, addr+new_len, old_len - new_len); -+ if (ret && old_len != new_len) -+ goto out; -+ ret = addr; - if (!(flags & MREMAP_FIXED) || (new_addr == addr)) - goto out; - old_len = new_len; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0075.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0075.patch new file mode 100644 index 000000000000..e131c957cb0a --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0075.patch @@ -0,0 +1,39 @@ +--- linux-2.6.6-rc1/drivers/usb/media/vicam.c 2004-04-15 11:18:18.000000000 +0200 ++++ linux-2.6.6-rc1-mich/drivers/usb/media/vicam.c 2004-04-15 11:50:02.791604312 +0200 +@@ -612,15 +612,20 @@ vicam_ioctl(struct inode *inode, struct + + case VIDIOCSPICT: + { +- struct video_picture *vp = (struct video_picture *) arg; +- +- DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp->depth, +- vp->palette); ++ struct video_picture vp; ++ ++ if (copy_from_user(&vp, arg, sizeof(vp))) { ++ retval = -EFAULT; ++ break; ++ } ++ ++ DBG("VIDIOCSPICT depth = %d, pal = %d\n", vp.depth, ++ vp.palette); + +- cam->gain = vp->brightness >> 8; ++ cam->gain = vp.brightness >> 8; + +- if (vp->depth != 24 +- || vp->palette != VIDEO_PALETTE_RGB24) ++ if (vp.depth != 24 ++ || vp.palette != VIDEO_PALETTE_RGB24) + retval = -EINVAL; + + break; +@@ -659,7 +659,7 @@ + { + + struct video_window *vw = (struct video_window *) arg; +- DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height); ++ DBG("VIDIOCSWIN %d x %d\n", vw.width, vw.height); + + if ( vw->width != 320 || vw->height != 240 ) + retval = -EFAULT; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0181.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0181.patch new file mode 100644 index 000000000000..4f4742b992f0 --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0181.patch @@ -0,0 +1,39 @@ +--- linux-2.6.3/fs/jfs/jfs_logmgr.c.zy62.orig 2004-02-17 20:57:59.000000000 -0700 ++++ linux-2.6.3/fs/jfs/jfs_logmgr.c 2004-04-02 16:57:38.000000000 -0700 +@@ -1702,7 +1702,7 @@ + lbuf = kmalloc(sizeof(struct lbuf), GFP_KERNEL); + if (lbuf == 0) + goto error; +- lbuf->l_ldata = (char *) __get_free_page(GFP_KERNEL); ++ lbuf->l_ldata = (char *) get_zeroed_page(GFP_KERNEL); + if (lbuf->l_ldata == 0) { + kfree(lbuf); + goto error; +--- linux-2.6.3/fs/jfs/jfs_metapage.c.zy62.orig 2004-02-17 20:57:20.000000000 -0700 ++++ linux-2.6.3/fs/jfs/jfs_metapage.c 2004-04-02 16:29:03.000000000 -0700 +@@ -341,6 +341,10 @@ + } + mp->data = kmap(mp->page) + page_offset; + } ++ ++ if (new) ++ memset(mp->data, 0, PSIZE); ++ + jfs_info("__get_metapage: returning = 0x%p", mp); + return mp; + +--- linux-2.6.3/fs/jfs/super.c.zy62.orig 2004-02-17 20:57:48.000000000 -0700 ++++ linux-2.6.3/fs/jfs/super.c 2004-04-02 17:57:02.903281078 -0700 +@@ -549,11 +549,11 @@ + + if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) == + SLAB_CTOR_CONSTRUCTOR) { ++ memset(jfs_ip, 0, sizeof(struct jfs_inode_info)); + INIT_LIST_HEAD(&jfs_ip->anon_inode_list); + init_rwsem(&jfs_ip->rdwrlock); + init_MUTEX(&jfs_ip->commit_sem); + init_rwsem(&jfs_ip->xattr_sem); +- jfs_ip->atlhead = 0; + jfs_ip->active_ag = -1; + #ifdef CONFIG_JFS_POSIX_ACL + jfs_ip->i_acl = JFS_ACL_NOT_CACHED; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0228.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0228.patch new file mode 100644 index 000000000000..746ade9ab1c0 --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0228.patch @@ -0,0 +1,11 @@ +--- linux-2.6.3/drivers/cpufreq/cpufreq_userspace.c.overflow 2004-02-18 04:57:16.000000000 +0100 ++++ linux-2.6.3/drivers/cpufreq/cpufreq_userspace.c 2004-05-14 11:40:37.000000000 +0200 +@@ -168,7 +168,7 @@ cpufreq_procctl(ctl_table *ctl, int writ + { + char buf[16], *p; + int cpu = (int) ctl->extra1; +- int len, left = *lenp; ++ unsigned int len, left = *lenp; + + if (!left || (filp->f_pos && !write) || !cpu_online(cpu)) { + *lenp = 0; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0229.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0229.patch new file mode 100644 index 000000000000..2b6dfff88e25 --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0229.patch @@ -0,0 +1,11 @@ +--- linux-2.6.3/drivers/video/fbmem.c.zy67 2004-04-23 07:32:22.000000000 -0400 ++++ linux-2.6.3/drivers/video/fbmem.c 2004-04-23 07:33:09.000000000 -0400 +@@ -1042,7 +1042,7 @@ + case FBIOGETCMAP: + if (copy_from_user(&cmap, (void *) arg, sizeof(cmap))) + return -EFAULT; +- return (fb_copy_cmap(&info->cmap, &cmap, 0)); ++ return (fb_copy_cmap(&info->cmap, &cmap, 2)); + case FBIOPAN_DISPLAY: + if (copy_from_user(&var, (void *) arg, sizeof(var))) + return -EFAULT; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0427.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0427.patch new file mode 100644 index 000000000000..adadefd53db2 --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.CAN-2004-0427.patch @@ -0,0 +1,11 @@ +--- linux-2.6.3/kernel/fork.c.zy64 2004-04-21 12:26:51.000000000 -0400 ++++ linux-2.6.3/kernel/fork.c 2004-04-21 12:29:34.000000000 -0400 +@@ -1073,6 +1073,8 @@ + exit_namespace(p); + bad_fork_cleanup_mm: + exit_mm(p); ++ if (p->active_mm) ++ mmdrop(p->active_mm); + bad_fork_cleanup_signal: + exit_signal(p); + bad_fork_cleanup_sighand: diff --git a/sys-kernel/ck-sources/files/ck-sources.CAN-2003-0985.patch b/sys-kernel/ck-sources/files/ck-sources.CAN-2003-0985.patch deleted file mode 100644 index dacf6ed810f9..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources.CAN-2003-0985.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- linux/mm/mremap.c.orig 2004-01-05 17:01:21.382104120 +0000 -+++ linux/mm/mremap.c 2004-01-05 17:15:25.689749848 +0000 -@@ -315,6 +315,10 @@ - old_len = PAGE_ALIGN(old_len); - new_len = PAGE_ALIGN(new_len); - -+ /* Don't allow the degenerate cases */ -+ if (!old_len || !new_len) -+ goto out; -+ - /* new_addr is only valid if MREMAP_FIXED is specified */ - if (flags & MREMAP_FIXED) { - if (new_addr & ~PAGE_MASK) diff --git a/sys-kernel/ck-sources/files/ck-sources.rtc_fix.patch b/sys-kernel/ck-sources/files/ck-sources.rtc_fix.patch deleted file mode 100644 index 76a663c6e89d..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources.rtc_fix.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -urN linux-2.4.23/arch/cris/drivers/ds1302.c linux-2.4.24/arch/cris/drivers/ds1302.c ---- linux-2.4.23/arch/cris/drivers/ds1302.c 2003-08-25 04:44:39.000000000 -0700 -+++ linux-2.4.24/arch/cris/drivers/ds1302.c 2004-01-05 05:53:56.000000000 -0800 -@@ -346,6 +346,7 @@ - { - struct rtc_time rtc_tm; - -+ memset(&rtc_tm, 0, sizeof (struct rtc_time)); - get_rtc_time(&rtc_tm); - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) - return -EFAULT; -diff -urN linux-2.4.23/arch/cris/drivers/pcf8563.c linux-2.4.24/arch/cris/drivers/pcf8563.c ---- linux-2.4.23/arch/cris/drivers/pcf8563.c 2003-08-25 04:44:39.000000000 -0700 -+++ linux-2.4.24/arch/cris/drivers/pcf8563.c 2004-01-05 05:53:56.000000000 -0800 -@@ -220,6 +220,7 @@ - { - struct rtc_time tm; - -+ memset(&tm, 0, sizeof (struct rtc_time)); - get_rtc_time(&tm); - - if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) { -diff -urN linux-2.4.23/arch/m68k/bvme6000/rtc.c linux-2.4.24/arch/m68k/bvme6000/rtc.c ---- linux-2.4.23/arch/m68k/bvme6000/rtc.c 2003-06-13 07:51:31.000000000 -0700 -+++ linux-2.4.24/arch/m68k/bvme6000/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -54,6 +54,7 @@ - /* Ensure clock and real-time-mode-register are accessible */ - msr = rtc->msr & 0xc0; - rtc->msr = 0x40; -+ memset(&wtime, 0, sizeof(struct rtc_time)); - do { - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); -diff -urN linux-2.4.23/arch/m68k/mvme16x/rtc.c linux-2.4.24/arch/m68k/mvme16x/rtc.c ---- linux-2.4.23/arch/m68k/mvme16x/rtc.c 2003-06-13 07:51:31.000000000 -0700 -+++ linux-2.4.24/arch/m68k/mvme16x/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -52,6 +52,7 @@ - cli(); - /* Ensure clock and real-time-mode-register are accessible */ - rtc->ctrl = RTC_READ; -+ memset(&wtime, 0, sizeof(struct rtc_time)); - wtime.tm_sec = BCD2BIN(rtc->bcd_sec); - wtime.tm_min = BCD2BIN(rtc->bcd_min); - wtime.tm_hour = BCD2BIN(rtc->bcd_hr); -diff -urN linux-2.4.23/arch/ppc64/kernel/rtc.c linux-2.4.24/arch/ppc64/kernel/rtc.c ---- linux-2.4.23/arch/ppc64/kernel/rtc.c 2003-06-13 07:51:32.000000000 -0700 -+++ linux-2.4.24/arch/ppc64/kernel/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -96,6 +96,7 @@ - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ppc_md.get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/acorn/char/i2c.c linux-2.4.24/drivers/acorn/char/i2c.c ---- linux-2.4.23/drivers/acorn/char/i2c.c 2003-08-25 04:44:40.000000000 -0700 -+++ linux-2.4.24/drivers/acorn/char/i2c.c 2004-01-05 05:53:56.000000000 -0800 -@@ -166,6 +166,7 @@ - break; - - case RTC_RD_TIME: -+ memset(&rtctm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_raw, &year); - rtctm.tm_sec = rtc_raw.secs; - rtctm.tm_min = rtc_raw.mins; -diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c ---- linux-2.4.23/drivers/char/ds1286.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/ds1286.c 2004-01-05 05:53:56.000000000 -0800 -@@ -173,7 +173,7 @@ - * means "don't care" or "match all". Only the tm_hour, - * tm_min, and tm_sec values are filled in. - */ -- -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_alm_time(&wtime); - break; - } -@@ -216,6 +216,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - ds1286_get_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/char/efirtc.c linux-2.4.24/drivers/char/efirtc.c ---- linux-2.4.23/drivers/char/efirtc.c 2003-06-13 07:51:32.000000000 -0700 -+++ linux-2.4.24/drivers/char/efirtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -118,6 +118,7 @@ - static void - convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) - { -+ memset(wtime, 0, sizeof(struct rtc_time)); - wtime->tm_sec = eft->second; - wtime->tm_min = eft->minute; - wtime->tm_hour = eft->hour; -diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c ---- linux-2.4.23/drivers/char/ip27-rtc.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/ip27-rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -83,6 +83,7 @@ - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c ---- linux-2.4.23/drivers/char/mips_rtc.c 2003-08-25 04:44:41.000000000 -0700 -+++ linux-2.4.24/drivers/char/mips_rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -82,6 +82,7 @@ - - switch (cmd) { - case RTC_RD_TIME: /* Read the time/date from RTC */ -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - curr_time = rtc_get_time(); - to_tm(curr_time, &rtc_tm); - rtc_tm.tm_year -= 1900; -diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c ---- linux-2.4.23/drivers/char/rtc.c 2003-11-28 10:26:20.000000000 -0800 -+++ linux-2.4.24/drivers/char/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -362,7 +362,7 @@ - * means "don't care" or "match all". Only the tm_hour, - * tm_min, and tm_sec values are filled in. - */ -- -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_alm_time(&wtime); - break; - } -@@ -406,6 +406,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - get_rtc_time(&wtime); - break; - } -diff -urN linux-2.4.23/drivers/hil/hp_sdc_rtc.c linux-2.4.24/drivers/hil/hp_sdc_rtc.c ---- linux-2.4.23/drivers/hil/hp_sdc_rtc.c 2003-06-13 07:51:33.000000000 -0700 -+++ linux-2.4.24/drivers/hil/hp_sdc_rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -561,6 +561,7 @@ - } - case RTC_ALM_READ: /* Read the present alarm time */ - { -+ memset(&ttime, 0, sizeof(struct timeval)); - if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT; - break; - } -@@ -609,6 +610,7 @@ - } - case RTC_RD_TIME: /* Read the time/date from RTC */ - { -+ memset(&wtime, 0, sizeof(struct rtc_time)); - if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT; - break; - } -diff -urN linux-2.4.23/drivers/macintosh/rtc.c linux-2.4.24/drivers/macintosh/rtc.c ---- linux-2.4.23/drivers/macintosh/rtc.c 2002-02-25 11:37:58.000000000 -0800 -+++ linux-2.4.24/drivers/macintosh/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -64,6 +64,7 @@ - case RTC_RD_TIME: - if (ppc_md.get_rtc_time) - { -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) -diff -urN linux-2.4.23/drivers/sbus/char/rtc.c linux-2.4.24/drivers/sbus/char/rtc.c ---- linux-2.4.23/drivers/sbus/char/rtc.c 2001-10-10 23:42:47.000000000 -0700 -+++ linux-2.4.24/drivers/sbus/char/rtc.c 2004-01-05 05:53:56.000000000 -0800 -@@ -89,6 +89,7 @@ - switch (cmd) - { - case RTCGET: -+ memset(&rtc_tm, 0, sizeof(struct rtc_time)); - get_rtc_time(&rtc_tm); - - if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time))) diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r1 deleted file mode 100644 index 3eafd0d42178..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612 -MD5 1ebb1fcfee94d184094dafcbdce096e3 patch-2.4.22-ck1.bz2 115638 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2 deleted file mode 100644 index 0fc27b988908..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r2 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612 -MD5 ca3a289c94b170aa0f559f18dffc00a8 patch-2.4.22-ck2-fix.patch 2267 -MD5 76983144a5d010166f6b1f5d18ec258e patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 4355 -MD5 3d67f41ed121ebb2a4f71945ae9cfd55 patch-2.4.22-ck2.bz2 813552 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r3 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r3 deleted file mode 100644 index 0fc27b988908..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.22-r3 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612 -MD5 ca3a289c94b170aa0f559f18dffc00a8 patch-2.4.22-ck2-fix.patch 2267 -MD5 76983144a5d010166f6b1f5d18ec258e patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 4355 -MD5 3d67f41ed121ebb2a4f71945ae9cfd55 patch-2.4.22-ck2.bz2 813552 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.23-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.23-r1 deleted file mode 100644 index 2515b5bfc4b2..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.23-r1 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609 -MD5 ca3a289c94b170aa0f559f18dffc00a8 patch-2.4.22-ck2-fix.patch 2267 -MD5 76983144a5d010166f6b1f5d18ec258e patch-2422-ck2-sm1.2.8-sm1.2.9-0309171736 4355 -MD5 6a8307d813dd9828af7639f0ba343422 patch-2.4.23-ck1.bz2 788506 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.24-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.24-r1 deleted file mode 100644 index 990fb735b065..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.24-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818 -MD5 f7d739bf567f5ee97ba9c471475951ba patch-2.4.24-ck1.bz2 853568 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.25-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.25-r1 deleted file mode 100644 index c6098c13eb45..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.25-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548 -MD5 54e5c367956dd68873d548f075f38db8 patch-2.4.25-lck1.bz2 404994 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.26-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.26-r1 new file mode 100644 index 000000000000..6e0bd89e1138 --- /dev/null +++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.26-r1 @@ -0,0 +1,2 @@ +MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 +MD5 111e4049a7e41a6993282a80d6db6371 patch-2.4.26-lck1.bz2 382582 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.2-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.2-r1 deleted file mode 100644 index d303dc5a47fb..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.2-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 2a745088acba366f22f8bd3e284a84d4 linux-2.6.2.tar.bz2 33899733 -MD5 ca825fca298b322b35a58ac5e1a41356 patch-2.6.2-ck1.bz2 48029 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r1 deleted file mode 100644 index 0f146405d453..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622 -MD5 d2b387e654adcc54cfb342c783b07926 patch-2.6.3-ck1.bz2 48250 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r2 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r2 deleted file mode 100644 index 9cf19dec9218..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.3-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622 -MD5 9f065fe3726c3f62e4fb1a33d3478454 patch-2.6.3-ck2.bz2 47969 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.4-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.4-r1 deleted file mode 100644 index 2836694e86eb..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.4-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912 -MD5 cc95f57ef5e58489c0d850b0809dd173 patch-2.6.4-ck1.bz2 678248 diff --git a/sys-kernel/ck-sources/files/do_brk_fix.patch b/sys-kernel/ck-sources/files/do_brk_fix.patch deleted file mode 100644 index fef1f1e981e2..000000000000 --- a/sys-kernel/ck-sources/files/do_brk_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/mm/mmap.c Fri Sep 12 06:44:06 2003 -+++ b/mm/mmap.c Thu Oct 2 01:18:19 2003 -@@ -1041,6 +1041,9 @@ - if (!len) - return addr; - -+ if ((addr + len) > TASK_SIZE || (addr + len) < addr) -+ return -EINVAL; -+ - /* - * mlock MCL_FUTURE? - */ |