From 374995fc9d6856ec1347467fae819725f3cf2347 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Thu, 15 Apr 2004 15:25:04 +0000 Subject: Version bump for the CAN-2004-0109 issue; bug #47881. --- sys-kernel/wolk-sources/ChangeLog | 8 +- .../wolk-sources/files/digest-wolk-sources-4.11-r1 | 3 - .../wolk-sources/files/digest-wolk-sources-4.11-r2 | 3 + .../wolk-sources/files/digest-wolk-sources-4.9-r4 | 16 ---- .../wolk-sources/files/digest-wolk-sources-4.9-r5 | 16 ++++ .../files/wolk-sources.CAN-2004-0109.patch | 87 +++++++++++++++++++ .../wolk-sources/wolk-sources-4.11-r2.ebuild | 46 ++++++++++ sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild | 98 ++++++++++++++++++++++ 8 files changed, 257 insertions(+), 20 deletions(-) delete mode 100644 sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r1 create mode 100644 sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r2 delete mode 100644 sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r4 create mode 100644 sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r5 create mode 100644 sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0109.patch create mode 100644 sys-kernel/wolk-sources/wolk-sources-4.11-r2.ebuild create mode 100644 sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog index 2e19a8f8fdb9..c1e32d1748d2 100644 --- a/sys-kernel/wolk-sources/ChangeLog +++ b/sys-kernel/wolk-sources/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-kernel/wolk-sources # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.38 2004/04/12 16:36:23 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.39 2004/04/15 15:25:04 plasmaroo Exp $ + +*wolk-sources-4.9-r5 (15 Apr 2004) + + 15 Apr 2004; wolk-sources-4.11-r2.ebuild, + wolk-sources-4.9-r5.ebuild, files/wolk-sources.CAN-2004-0109.patch: + Version bump for the CAN-2004-0109 issue; bug #47881. 12 Apr 2004; Daniel Ahlberg wolk-sources-4.11-r1.ebuild, wolk-sources-4.9-r4.ebuild: diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r1 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r1 deleted file mode 100644 index c8b173eb8305..000000000000 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 -MD5 7ab3d945def110a2ee78ce88175c7abe linux-2.4.20-wolk4.10s.patch.bz2 12773140 -MD5 befb7511aa4075255bb7755fb961c0e5 linux-2.4.20-wolk4.10s-to-4.11s.patch.bz2 88660 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r2 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r2 new file mode 100644 index 000000000000..c8b173eb8305 --- /dev/null +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r2 @@ -0,0 +1,3 @@ +MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 +MD5 7ab3d945def110a2ee78ce88175c7abe linux-2.4.20-wolk4.10s.patch.bz2 12773140 +MD5 befb7511aa4075255bb7755fb961c0e5 linux-2.4.20-wolk4.10s-to-4.11s.patch.bz2 88660 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r4 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r4 deleted file mode 100644 index 1a638cec623d..000000000000 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r4 +++ /dev/null @@ -1,16 +0,0 @@ -MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 -MD5 1a2631214a59d8cd1baadc709917518b linux-2.4.20-wolk4.0s.patch.bz2 8987097 -MD5 3695872e7123b1f8a0cbf1791755ba9a linux-2.4.20-wolk4.0s-to-4.1s.patch.bz2 38586 -MD5 2e43277e89e06604c6b2f824c1c5bf44 linux-2.4.20-wolk4.1s-to-4.2s.patch.bz2 204629 -MD5 a84b52c73a66d9daf5462cf4aa39311c linux-2.4.20-wolk4.2s-to-4.3s.patch.bz2 38388 -MD5 6fbff6c3c6c0e298eb203d6c2af36772 linux-2.4.20-wolk4.3s-to-4.4s.patch.bz2 634399 -MD5 022f242d488e6def5e23791787491e6e linux-2.4.20-wolk4.4s-to-4.5s.patch.bz2 35905 -MD5 0b758dcfc015034f80b10f8bba194d58 linux-2.4.20-wolk4.5s-to-4.6s.patch.bz2 89749 -MD5 51412491c4aed5b328f7dc68085b865d linux-2.4.20-wolk4.6s-to-4.7s.patch.bz2 726436 -MD5 992ecfbd8c227938ebe395e1b5682bcb linux-2.4.20-wolk4.7s-to-4.8s.patch.bz2 41114 -MD5 06d2f90afaa7438f56653611a7a00cce linux-2.4.20-wolk4.8s-to-4.9s.patch.bz2 400853 -MD5 3495fc5d08cd1c45c3252d438dddd2e9 1007_bootsplash-v3.0.7-2.4.20-0.patch 83101 -MD5 164b794eb5eb3321ee24c6f63734aee9 1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch 1163 -MD5 87bdd189276be8de8c9f8177855e7f27 1007_bootsplash-v3.0.8-2.4.20-update.patch 4402 -MD5 48110e2e60a28e6a433bbb24f0bd93a9 1008_supermount-1.2.9-2.4.20-OLDIDE.patch 169980 -MD5 4c94545d63a35b216c7a9c5c3e10b223 1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch 586142 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r5 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r5 new file mode 100644 index 000000000000..1a638cec623d --- /dev/null +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r5 @@ -0,0 +1,16 @@ +MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 +MD5 1a2631214a59d8cd1baadc709917518b linux-2.4.20-wolk4.0s.patch.bz2 8987097 +MD5 3695872e7123b1f8a0cbf1791755ba9a linux-2.4.20-wolk4.0s-to-4.1s.patch.bz2 38586 +MD5 2e43277e89e06604c6b2f824c1c5bf44 linux-2.4.20-wolk4.1s-to-4.2s.patch.bz2 204629 +MD5 a84b52c73a66d9daf5462cf4aa39311c linux-2.4.20-wolk4.2s-to-4.3s.patch.bz2 38388 +MD5 6fbff6c3c6c0e298eb203d6c2af36772 linux-2.4.20-wolk4.3s-to-4.4s.patch.bz2 634399 +MD5 022f242d488e6def5e23791787491e6e linux-2.4.20-wolk4.4s-to-4.5s.patch.bz2 35905 +MD5 0b758dcfc015034f80b10f8bba194d58 linux-2.4.20-wolk4.5s-to-4.6s.patch.bz2 89749 +MD5 51412491c4aed5b328f7dc68085b865d linux-2.4.20-wolk4.6s-to-4.7s.patch.bz2 726436 +MD5 992ecfbd8c227938ebe395e1b5682bcb linux-2.4.20-wolk4.7s-to-4.8s.patch.bz2 41114 +MD5 06d2f90afaa7438f56653611a7a00cce linux-2.4.20-wolk4.8s-to-4.9s.patch.bz2 400853 +MD5 3495fc5d08cd1c45c3252d438dddd2e9 1007_bootsplash-v3.0.7-2.4.20-0.patch 83101 +MD5 164b794eb5eb3321ee24c6f63734aee9 1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch 1163 +MD5 87bdd189276be8de8c9f8177855e7f27 1007_bootsplash-v3.0.8-2.4.20-update.patch 4402 +MD5 48110e2e60a28e6a433bbb24f0bd93a9 1008_supermount-1.2.9-2.4.20-OLDIDE.patch 169980 +MD5 4c94545d63a35b216c7a9c5c3e10b223 1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch 586142 diff --git a/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0109.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0109.patch new file mode 100644 index 000000000000..d02b51c57fc6 --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0109.patch @@ -0,0 +1,87 @@ +--- linux/fs/isofs/rock.c.orig ++++ linux/fs/isofs/rock.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #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/wolk-sources/wolk-sources-4.11-r2.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r2.ebuild new file mode 100644 index 000000000000..3006de50d5f1 --- /dev/null +++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r2.ebuild,v 1.1 2004/04/15 15:25:04 plasmaroo Exp $ + +# OKV=original kernel version, KV=patched kernel version. They can be the same. + +ETYPE="sources" + +inherit kernel eutils +IUSE="" +OKV=2.4.20 +KV=${OKV}-wolk4.11s-${PR} +EXTRAVERSION=-wolk4.11s-${PR} + +S=${WORKDIR}/linux-${KV} +DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)" + +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips" + +SRC_PATH="mirror://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" +SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.10s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.10s-to-4.11s.patch.bz2" + +SLOT="${KV}" +HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org" + +src_unpack() { + unpack linux-${OKV}.tar.bz2 || die + mv linux-${OKV} linux-${KV} || die + cd ${WORKDIR}/linux-${KV} || die + epatch ${DISTDIR}/linux-${OKV}-wolk4.10s.patch.bz2 || die + epatch ${DISTDIR}/linux-${OKV}-wolk4.10s-to-4.11s.patch.bz2 || die + + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" + epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!" + + kernel_universal_unpack +} + +pkg_postinst() { + einfo + einfo "This is the base WOLK 4.11 Server Edition with all" + einfo "recent security fixes, but no workstation patches." + einfo +} diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild new file mode 100644 index 000000000000..167530bfc673 --- /dev/null +++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r5.ebuild,v 1.1 2004/04/15 15:25:04 plasmaroo Exp $ + +# OKV=original kernel version, KV=patched kernel version. They can be the same. + +IUSE="build wolk-bootsplash wolk-supermount ipv6" +ETYPE="sources" + +inherit kernel eutils + +OKV=2.4.20 +EXTRAVERSION="-${PN/-*/}4.9s-${PR}" +KV="${OKV}${EXTRAVERSION}" + +S=${WORKDIR}/linux-${KV} +DESCRIPTION="Working Overloaded Linux Kernel (Server-Edition)" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips" +SRC_PATH="mirror://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" + +SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.0s-to-4.1s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.1s-to-4.2s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.2s-to-4.3s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.3s-to-4.4s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.4s-to-4.5s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.5s-to-4.6s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.6s-to-4.7s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.7s-to-4.8s.patch.bz2 + mirror://sourceforge/wolk/linux-${OKV}-wolk4.8s-to-4.9s.patch.bz2 + wolk-bootsplash? ( http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-0.patch + http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch + http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.8-2.4.20-update.patch) + wolk-supermount? ( http://wolk.sourceforge.net/Workstation-Edition/1008_supermount-1.2.9-2.4.20-OLDIDE.patch) + ipv6? ( http://wolk.sourceforge.net/Workstation-Edition/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch )" + +SLOT="${KV}" +HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org" + +src_unpack() { + local PATCHFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.3s -wolk4.3s-to-4.4s -wolk4.4s-to-4.5s -wolk4.5s-to-4.6s -wolk4.6s-to-4.7s -wolk4.7s-to-4.8s -wolk4.8s-to-4.9s" + unpack linux-${OKV}.tar.bz2 || die + + mv linux-${OKV} linux-${KV} || die + cd ${WORKDIR}/linux-${KV} || die + for PATCHES in ${PATCHFILES} + do + epatch ${DISTDIR}/linux-${OKV}${PATCHES}.patch.bz2 || die + done + + einfo "Applying NVIDIA patches..." + epatch ${FILESDIR}/wolk-4.9s-page.h.patch || die + epatch ${FILESDIR}/wolk-4.9s-setup.c.patch || die + + einfo "Applying other needed patches..." + epatch ${FILESDIR}/wolk-4.9s-speedstep.c.patch || die + + if [ "`use wolk-supermount`" ]; then + ewinfo "Applying Supermount patch..." + epatch ${DISTDIR}/1008_supermount-1.2.9-2.4.20-OLDIDE.patch || die + fi + if [ "`use ipv6`" ]; then + einfo "Applying MIPv6 patch..." + epatch ${DISTDIR}/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch || die + fi + + if [ "`use wolk-bootsplash`" ]; then + einfo "Applying Bootsplash patches..." + epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-0.patch || die + epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch || die + epatch ${DISTDIR}/1007_bootsplash-v3.0.8-2.4.20-update.patch || die + fi + + epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch for do_brk() vulnerability!" + epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!" + epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!" + epatch ${FILESDIR}/${PN}-4.9s.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!" + epatch ${FILESDIR}/${PN}-4.9s.munmap.patch || die "Failed to apply munmap patch!" + + kernel_universal_unpack +} + +pkg_postinst() { + einfo + einfo "Since wolk-sources-4.6s the 3com 3c59x v0.99Za drivers are excluded." + einfo "For many people they may work, but too many people expecting problems" + einfo "with this drivers. They will be reintroduced when they are fixed." + einfo "You have to fall back to an earlier release of the wolk kernel when you want" + einfo "to use one of this drivers." + einfo + einfo "This new ebuild has support for the workstation patches." + einfo "With the wolk-bootsplash, wolk-supermount, and" + einfo "ipv6 use flags you can take advantage of the" + einfo "Bootsplash, Supermount, and MIPv6 patches." + ewarn "Patches not guaranteed; YMMV..." + einfo +} -- cgit v1.2.3-65-gdbad