diff options
author | Christian Birchinger <joker@gentoo.org> | 2004-11-27 15:34:58 +0000 |
---|---|---|
committer | Christian Birchinger <joker@gentoo.org> | 2004-11-27 15:34:58 +0000 |
commit | be1bd00cd31166b0a04677549aac1a3c488ce91b (patch) | |
tree | 02f7af4c109126d4b4d4d86165e232e168dc0514 /sys-kernel/sparc-sources | |
parent | Fixed DoS by smbfs remote overflows (CAN-2004-0883) (Manifest recommit) (diff) | |
download | gentoo-2-be1bd00cd31166b0a04677549aac1a3c488ce91b.tar.gz gentoo-2-be1bd00cd31166b0a04677549aac1a3c488ce91b.tar.bz2 gentoo-2-be1bd00cd31166b0a04677549aac1a3c488ce91b.zip |
Removed old version
Diffstat (limited to 'sys-kernel/sparc-sources')
11 files changed, 8 insertions, 379 deletions
diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog index 90372acd8a49..0c7dcaa758e8 100644 --- a/sys-kernel/sparc-sources/ChangeLog +++ b/sys-kernel/sparc-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/sparc-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.68 2004/11/25 16:55:02 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.69 2004/11/27 15:34:58 joker Exp $ + + 27 Nov 2004; Christian Birchinger <joker@gentoo.org> + -files/gentoo-sources-2.4.27-binfmt_elf.patch, + -files/use-pte_alloc_one_fast-r1.patch, -sparc-sources-2.4.27-r1.ebuild, + -sparc-sources-2.4.27-r2.ebuild, -sparc-sources-2.4.27-r3.ebuild, + -sparc-sources-2.4.27.ebuild: + Removed old version 25 Nov 2004; Christian Birchinger <joker@gentoo.org> sparc-sources-2.4.28.ebuild: diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27 deleted file mode 100644 index 9867f8a08441..000000000000 --- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453 -MD5 3a89b9131f7bef39735143233db0bef2 patches-2.4.27-sparc.tar.bz2 162890 diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r1 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r1 deleted file mode 100644 index 9882e799b6cd..000000000000 --- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453 -MD5 d746a0c8ffcea0d3dfb5c3ac1522ef47 patches-2.4.27-sparc-r1.tar.bz2 163046 diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r2 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r2 deleted file mode 100644 index 662b3b82757a..000000000000 --- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453 -MD5 4aa6453113601fbd6d134dad8aef21e7 patches-2.4.27-sparc-r2.tar.bz2 181499 diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r3 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r3 deleted file mode 100644 index 662b3b82757a..000000000000 --- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.27-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453 -MD5 4aa6453113601fbd6d134dad8aef21e7 patches-2.4.27-sparc-r2.tar.bz2 181499 diff --git a/sys-kernel/sparc-sources/files/gentoo-sources-2.4.27-binfmt_elf.patch b/sys-kernel/sparc-sources/files/gentoo-sources-2.4.27-binfmt_elf.patch deleted file mode 100644 index bce026adf312..000000000000 --- a/sys-kernel/sparc-sources/files/gentoo-sources-2.4.27-binfmt_elf.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt_elf.c ---- linux-2.4.27-gentoo-r2/fs/binfmt_elf.c 2004-11-10 20:43:18.000000000 +0000 -+++ linux-2.4.27-gentoo-r3/fs/binfmt_elf.c 2004-11-10 20:33:40.000000000 +0000 -@@ -308,9 +308,12 @@ - goto out; - - retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size); -- error = retval; -- if (retval < 0) -+ error = -EIO; -+ if (retval != size) { -+ if (retval < 0) -+ error = retval; - goto out_close; -+ } - - eppnt = elf_phdata; - for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) { -@@ -686,8 +689,11 @@ - goto out; - - retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size); -- if (retval < 0) -+ if (retval != size) { -+ if (retval >= 0) -+ retval = -EIO; - goto out_free_ph; -+ } - - files = current->files; /* Refcounted so ok */ - retval = unshare_files(); -@@ -734,8 +740,14 @@ - retval = kernel_read(bprm->file, elf_ppnt->p_offset, - elf_interpreter, - elf_ppnt->p_filesz); -- if (retval < 0) -+ if (retval != elf_ppnt->p_filesz) { -+ if (retval >= 0) -+ retval = -EIO; - goto out_free_interp; -+ } -+ /* make sure path is NULL terminated */ -+ elf_interpreter[elf_ppnt->p_filesz - 1] = '\0'; -+ - /* If the program interpreter is one of these two, - * then assume an iBCS2 image. Otherwise assume - * a native linux image. -@@ -754,8 +766,11 @@ - if (IS_ERR(interpreter)) - goto out_free_interp; - retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE); -- if (retval < 0) -+ if (retval != BINPRM_BUF_SIZE) { -+ if (retval >= 0) -+ retval = -EIO; - goto out_free_dentry; -+ } - - /* Get the exec headers */ - interp_ex = *((struct exec *) bprm->buf); -@@ -967,7 +982,10 @@ - #endif - - if (BAD_ADDR(error)) -- continue; -+ { -+ send_sig(SIGKILL, current, 0); -+ goto out_free_dentry; -+ } - - /* PaX: mirror at a randomized base */ - down_write(¤t->mm->mmap_sem); -@@ -1008,7 +1026,10 @@ - { - error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags); - if (BAD_ADDR(error)) -- continue; -+ { -+ send_sig(SIGKILL, current, 0); -+ goto out_free_dentry; -+ } - } - - if (!load_addr_set) { diff --git a/sys-kernel/sparc-sources/files/use-pte_alloc_one_fast-r1.patch b/sys-kernel/sparc-sources/files/use-pte_alloc_one_fast-r1.patch deleted file mode 100644 index 6b8a115f3235..000000000000 --- a/sys-kernel/sparc-sources/files/use-pte_alloc_one_fast-r1.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- linux-2.4.26-sparc-r3/mm/memory.c.orig 2004-08-11 23:02:49.000000000 +0200 -+++ linux-2.4.26-sparc-r3/mm/memory.c 2004-08-11 23:05:05.000000000 +0200 -@@ -1594,11 +1594,14 @@ - if (pmd_none(*pmd)) { - pte_t *new; - -- spin_unlock(&mm->page_table_lock); -- new = pte_alloc_one(mm, address); -- spin_lock(&mm->page_table_lock); -- if (!new) -- return NULL; -+ new = pte_alloc_one_fast(mm, address); -+ if (!new) { -+ spin_unlock(&mm->page_table_lock); -+ new = pte_alloc_one(mm, address); -+ spin_lock(&mm->page_table_lock); -+ if (!new) -+ return NULL; -+ } - - /* - * Because we dropped the lock, we should re-check the diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.27-r1.ebuild deleted file mode 100644 index 2492913611a9..000000000000 --- a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r1.ebuild +++ /dev/null @@ -1,66 +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/sparc-sources/sparc-sources-2.4.27-r1.ebuild,v 1.2 2004/08/11 21:44:45 joker Exp $ - -IUSE="ultra1" - -# Kernel ebuilds using the kernel.eclass can remove any patch that you -# do not want to apply by simply setting the KERNEL_EXCLUDE shell -# variable to the string you want to exclude (for instance -# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match -# *grsecurity*). Kernels are only tested in the default configuration, but -# this may be useful if you know that a particular patch is causing a -# conflict with a patch you personally want to apply, or some other -# similar situation. - -ETYPE="sources" -inherit kernel eutils - -# OKV=original kernel version, KV=patched kernel version. They can be the same. -[ "$OKV" == "" ] && OKV="${PV}" - -EXTRAVERSION="-${PN/-*/}" -[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_VERSION="${KV}" - -# Documentation on the patches contained in this kernel will be installed -# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz - -DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel" -SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2" - -S=${WORKDIR}/linux-${KV} -KEYWORDS="~x86 -ppc ~sparc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}" - cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}" - - kernel_src_unpack - - # Fix a grsecurity problem on sparc32 - [ "${PROFILE_ARCH}" = "sparc64" ] || epatch ${FILESDIR}/use-pte_alloc_one_fast-r1.patch - - # Patch the HME driver only on Ultra1 machines. - use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch -} - -pkg_postinst() { - - kernel_pkg_postinst - - # Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown. - if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then - einfo - einfo "For users with an Enterprise model Ultra 1 using the HME network interface," - einfo "please emerge the kernel using the following command:" - einfo - einfo "USE=ultra1 emerge sparc-sources" - einfo - fi -} diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r2.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.27-r2.ebuild deleted file mode 100644 index d7c102f37b00..000000000000 --- a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r2.ebuild +++ /dev/null @@ -1,66 +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/sparc-sources/sparc-sources-2.4.27-r2.ebuild,v 1.1 2004/11/10 16:49:32 joker Exp $ - -IUSE="ultra1" - -# Kernel ebuilds using the kernel.eclass can remove any patch that you -# do not want to apply by simply setting the KERNEL_EXCLUDE shell -# variable to the string you want to exclude (for instance -# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match -# *grsecurity*). Kernels are only tested in the default configuration, but -# this may be useful if you know that a particular patch is causing a -# conflict with a patch you personally want to apply, or some other -# similar situation. - -ETYPE="sources" -inherit kernel eutils - -# OKV=original kernel version, KV=patched kernel version. They can be the same. -[ "$OKV" == "" ] && OKV="${PV}" - -EXTRAVERSION="-${PN/-*/}" -[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_VERSION="${KV}" - -# Documentation on the patches contained in this kernel will be installed -# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz - -DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel" -SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2" - -S=${WORKDIR}/linux-${KV} -KEYWORDS="~x86 -ppc sparc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}" - cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}" - - kernel_src_unpack - - # Fix a grsecurity problem on sparc32 - [ "${PROFILE_ARCH}" = "sparc64" ] || epatch ${FILESDIR}/use-pte_alloc_one_fast-r1.patch - - # Patch the HME driver only on Ultra1 machines. - use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch -} - -pkg_postinst() { - - kernel_pkg_postinst - - # Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown. - if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then - einfo - einfo "For users with an Enterprise model Ultra 1 using the HME network interface," - einfo "please emerge the kernel using the following command:" - einfo - einfo "USE=ultra1 emerge sparc-sources" - einfo - fi -} diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r3.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.27-r3.ebuild deleted file mode 100644 index efd7f6480272..000000000000 --- a/sys-kernel/sparc-sources/sparc-sources-2.4.27-r3.ebuild +++ /dev/null @@ -1,69 +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/sparc-sources/sparc-sources-2.4.27-r3.ebuild,v 1.1 2004/11/12 22:20:22 joker Exp $ - -IUSE="ultra1" - -# Kernel ebuilds using the kernel.eclass can remove any patch that you -# do not want to apply by simply setting the KERNEL_EXCLUDE shell -# variable to the string you want to exclude (for instance -# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match -# *grsecurity*). Kernels are only tested in the default configuration, but -# this may be useful if you know that a particular patch is causing a -# conflict with a patch you personally want to apply, or some other -# similar situation. - -ETYPE="sources" -inherit kernel eutils - -# OKV=original kernel version, KV=patched kernel version. They can be the same. -[ "$OKV" == "" ] && OKV="${PV}" - -EXTRAVERSION="-${PN/-*/}" -[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_VERSION="2.4.27-sparc-r2" - -# Documentation on the patches contained in this kernel will be installed -# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz - -DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel" -SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2" - -S=${WORKDIR}/linux-${KV} -KEYWORDS="~x86 -ppc sparc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}" - cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}" - - kernel_src_unpack - - # Fix a grsecurity problem on sparc32 - [ "${PROFILE_ARCH}" = "sparc64" ] || epatch ${FILESDIR}/use-pte_alloc_one_fast-r1.patch - - # Security fix Linux kernel binfmt_elf loader vulnerabilities - epatch ${FILESDIR}/gentoo-sources-2.4.27-binfmt_elf.patch - - # Patch the HME driver only on Ultra1 machines. - use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch -} - -pkg_postinst() { - - kernel_pkg_postinst - - # Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown. - if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then - einfo - einfo "For users with an Enterprise model Ultra 1 using the HME network interface," - einfo "please emerge the kernel using the following command:" - einfo - einfo "USE=ultra1 emerge sparc-sources" - einfo - fi -} diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.27.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.27.ebuild deleted file mode 100644 index 3a13ca095213..000000000000 --- a/sys-kernel/sparc-sources/sparc-sources-2.4.27.ebuild +++ /dev/null @@ -1,63 +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/sparc-sources/sparc-sources-2.4.27.ebuild,v 1.2 2004/08/11 20:09:49 joker Exp $ - -IUSE="ultra1" - -# Kernel ebuilds using the kernel.eclass can remove any patch that you -# do not want to apply by simply setting the KERNEL_EXCLUDE shell -# variable to the string you want to exclude (for instance -# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match -# *grsecurity*). Kernels are only tested in the default configuration, but -# this may be useful if you know that a particular patch is causing a -# conflict with a patch you personally want to apply, or some other -# similar situation. - -ETYPE="sources" -inherit kernel eutils - -# OKV=original kernel version, KV=patched kernel version. They can be the same. -[ "$OKV" == "" ] && OKV="${PV}" - -EXTRAVERSION="-${PN/-*/}" -[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_VERSION="${KV}" - -# Documentation on the patches contained in this kernel will be installed -# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz - -DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel" -SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2" - -S=${WORKDIR}/linux-${KV} -KEYWORDS="~x86 -ppc sparc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}" - cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}" - - kernel_src_unpack - - # Patch the HME driver only on Ultra1 machines. - use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch -} - -pkg_postinst() { - - kernel_pkg_postinst - - # Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown. - if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then - einfo - einfo "For users with an Enterprise model Ultra 1 using the HME network interface," - einfo "please emerge the kernel using the following command:" - einfo - einfo "USE=ultra1 emerge sparc-sources" - einfo - fi -} |