From ca7f44788a847e66ef727712021a5e9edb7dad8d Mon Sep 17 00:00:00 2001 From: John Mylchreest Date: Thu, 19 Feb 2004 19:17:45 +0000 Subject: fix for do_munmap bug to up all soon to be dropped sources --- sys-kernel/gentoo-dev-sources/ChangeLog | 7 ++- sys-kernel/gentoo-dev-sources/Manifest | 11 ++--- .../gentoo-dev-sources/files/2.6-do_munmap.patch | 27 ++++++++++++ .../files/digest-gentoo-dev-sources-2.6.1-r1 | 2 - .../files/digest-gentoo-dev-sources-2.6.1-r2 | 2 + .../files/digest-gentoo-dev-sources-2.6.2-r1 | 2 - .../files/digest-gentoo-dev-sources-2.6.2-r2 | 2 + .../gentoo-dev-sources-2.6.1-r1.ebuild | 51 ---------------------- .../gentoo-dev-sources-2.6.1-r2.ebuild | 51 ++++++++++++++++++++++ .../gentoo-dev-sources-2.6.2-r1.ebuild | 37 ---------------- .../gentoo-dev-sources-2.6.2-r2.ebuild | 37 ++++++++++++++++ 11 files changed, 131 insertions(+), 98 deletions(-) create mode 100644 sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch delete mode 100644 sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 create mode 100644 sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2 delete mode 100644 sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1 create mode 100644 sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2 delete mode 100644 sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild create mode 100644 sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild delete mode 100644 sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild create mode 100644 sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild (limited to 'sys-kernel/gentoo-dev-sources') diff --git a/sys-kernel/gentoo-dev-sources/ChangeLog b/sys-kernel/gentoo-dev-sources/ChangeLog index fe02ebf37200..2acc14c5bfbf 100644 --- a/sys-kernel/gentoo-dev-sources/ChangeLog +++ b/sys-kernel/gentoo-dev-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/gentoo-dev-sources # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.43 2004/02/18 18:09:35 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/ChangeLog,v 1.44 2004/02/19 19:17:45 johnm Exp $ + + 19 Feb 2004; John Mylchreest + gentoo-dev-sources-2.6.1-r1.ebuild, gentoo-dev-sources-2.6.2-r1.ebuild, + files/2.6-do_munmap.patch: + security bump for soon to be dropped sources. *gentoo-dev-sources-2.6.3 (18 Feb 2004) diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest index ec05b7bb03bb..3752edb0d36a 100644 --- a/sys-kernel/gentoo-dev-sources/Manifest +++ b/sys-kernel/gentoo-dev-sources/Manifest @@ -1,8 +1,9 @@ -MD5 38e9dda07012a3c1c768a0bf72916966 gentoo-dev-sources-2.6.2-r1.ebuild 1352 -MD5 a1962ceb66a56f4c373e1470843d7492 gentoo-dev-sources-2.6.1-r1.ebuild 2213 +MD5 840196a1389d4fb848297d17fc7c3642 gentoo-dev-sources-2.6.1-r2.ebuild 2245 MD5 a58fa89253a4e1466acfc38031d8374a gentoo-dev-sources-2.6.3.ebuild 1299 -MD5 6dde19e8b8519e2dfb79c995aa4627d5 ChangeLog 8897 +MD5 4d7ab9645def0c3aafd8a90ebe5789ed gentoo-dev-sources-2.6.2-r2.ebuild 1385 +MD5 e6d8ad99b87f1ba42e5e156a561024bc ChangeLog 9099 MD5 67f88855f6ec6da22268bad74aa10597 metadata.xml 636 MD5 6b9c1af35601dbf5977952f6d11748d6 files/digest-gentoo-dev-sources-2.6.3 138 -MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r1 138 -MD5 209cbc1ec89b12bcf89b2e48ef8219a7 files/digest-gentoo-dev-sources-2.6.2-r1 139 +MD5 150fc6d514e8cb2b07a3a7b14b8d92ef files/digest-gentoo-dev-sources-2.6.1-r2 138 +MD5 209cbc1ec89b12bcf89b2e48ef8219a7 files/digest-gentoo-dev-sources-2.6.2-r2 139 +MD5 980949de52189c7d9c1d791b7f5cc27e files/2.6-do_munmap.patch 743 diff --git a/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch b/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch new file mode 100644 index 000000000000..ea54965b0d43 --- /dev/null +++ b/sys-kernel/gentoo-dev-sources/files/2.6-do_munmap.patch @@ -0,0 +1,27 @@ +--- a/mm/mremap.c Thu Feb 19 11:04:41 2004 ++++ b/mm/mremap.c Thu Feb 19 11:04:41 2004 +@@ -346,7 +346,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 +356,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/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 deleted file mode 100644 index 278e229f9d2c..000000000000 --- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033 -MD5 bed91d4da1a7225e01da3a36ef5def05 genpatches-2.6-1.16.tar.bz2 539827 diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2 new file mode 100644 index 000000000000..278e229f9d2c --- /dev/null +++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.1-r2 @@ -0,0 +1,2 @@ +MD5 fa82d1e4be518261b2eeb78eabf9cca7 linux-2.6.1.tar.bz2 33240033 +MD5 bed91d4da1a7225e01da3a36ef5def05 genpatches-2.6-1.16.tar.bz2 539827 diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1 deleted file mode 100644 index c5855e596d75..000000000000 --- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 2a745088acba366f22f8bd3e284a84d4 linux-2.6.2.tar.bz2 33899733 -MD5 9093f99bebe79ff00161de01081cd255 genpatches-2.6-2.21.tar.bz2 1045608 diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2 new file mode 100644 index 000000000000..c5855e596d75 --- /dev/null +++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.2-r2 @@ -0,0 +1,2 @@ +MD5 2a745088acba366f22f8bd3e284a84d4 linux-2.6.2.tar.bz2 33899733 +MD5 9093f99bebe79ff00161de01081cd255 genpatches-2.6-2.21.tar.bz2 1045608 diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild deleted file mode 100644 index e4bb7e0f3d5e..000000000000 --- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild +++ /dev/null @@ -1,51 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r1.ebuild,v 1.4 2004/02/05 13:32:47 johnm Exp $ - -# As this is the example source to use kernel-2.eclass then a very brief explanation is to go here -# -# any logic required for K_NOSETEXTRAVERSION, K_NOUSENAME UNIPATCH_LIST, or UNIPATCH_DOCS should -# go BEFORE the inherit. -# if you choose to not use detect_version then you should set EXTRAVERSION, KV, OKV and possibly S -# BEFORE the inherit also. -# If you wish to display additional postinst messages it is desired to pass it within K_EXTRAEINFO -# This isnt always suitable if you required it to keep original formatting. -# -# patches should be passed as a list in UNIPATCH_LIST, this can contain tarballs, individual files or -# patch numbers which you wish to be excluded from patching. -# -# any documentation which comes distributed with the patches should be added into UNIPATCH_DOCS and will -# therefore be merged into /usr/share/doc -# all patches passed are extracted or moved to ${WORKDIR}/patches - -#version of gentoo patchset -GPV=1.16 -GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2" -UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${GPV}/README" - -ETYPE="sources" -inherit kernel-2 -detect_version - -DESCRIPTION="Full sources including the gentoo patchset for the 2.6 kernel tree" -SRC_URI="${KERNEL_URI} ${GPV_SRC}" - -KEYWORDS="x86 amd64 ~mips ~hppa ~sparc ~alpha" - -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 - ewarn "If you choose to use UCL/gcloop please ensure you also" - ewarn "emerge ucl as well as it currently depends on this library." - ewarn "Also please ensure that you compile gcloop without -fstack-protector." - echo -} diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild new file mode 100644 index 000000000000..c7c53c536b66 --- /dev/null +++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.1-r2.ebuild,v 1.1 2004/02/19 19:17:45 johnm Exp $ + +# As this is the example source to use kernel-2.eclass then a very brief explanation is to go here +# +# any logic required for K_NOSETEXTRAVERSION, K_NOUSENAME UNIPATCH_LIST, or UNIPATCH_DOCS should +# go BEFORE the inherit. +# if you choose to not use detect_version then you should set EXTRAVERSION, KV, OKV and possibly S +# BEFORE the inherit also. +# If you wish to display additional postinst messages it is desired to pass it within K_EXTRAEINFO +# This isnt always suitable if you required it to keep original formatting. +# +# patches should be passed as a list in UNIPATCH_LIST, this can contain tarballs, individual files or +# patch numbers which you wish to be excluded from patching. +# +# any documentation which comes distributed with the patches should be added into UNIPATCH_DOCS and will +# therefore be merged into /usr/share/doc +# all patches passed are extracted or moved to ${WORKDIR}/patches + +#version of gentoo patchset +GPV=1.16 +GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2" + +UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2 ${FILESDIR}/2.6-do_munmap.patch" +UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${GPV}/README" + +ETYPE="sources" +inherit kernel-2 +detect_version + +DESCRIPTION="Full sources including the gentoo patchset for the 2.6 kernel tree" +SRC_URI="${KERNEL_URI} ${GPV_SRC}" + +KEYWORDS="x86 amd64 ~mips ~hppa ~sparc ~alpha" + +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 + ewarn "If you choose to use UCL/gcloop please ensure you also" + ewarn "emerge ucl as well as it currently depends on this library." + ewarn "Also please ensure that you compile gcloop without -fstack-protector." + echo +} diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild deleted file mode 100644 index e25563f11265..000000000000 --- a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild +++ /dev/null @@ -1,37 +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/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r1.ebuild,v 1.1 2004/02/15 18:12:49 johnm Exp $ - -#version of gentoo patchset -GPV=2.21 -#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2" -GPV_SRC="http://dev.gentoo.org/~johnm/files/genpatches-2.6-${GPV}.tar.bz2" - -RESTRICT="nomirror" -KEYWORDS="amd64 x86" - -UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2" -UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/README" - -ETYPE="sources" -inherit kernel-2 -detect_version - -DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} ${GPV_SRC}" -DEPEND="${DEPEND} dev-libs/ucl" - -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 - ewarn "If you choose to use UCL/gcloop please ensure you compile gcloop" - ewarn "without -fstack-protector." - echo -} diff --git a/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild new file mode 100644 index 000000000000..278efd8274c9 --- /dev/null +++ b/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-dev-sources/gentoo-dev-sources-2.6.2-r2.ebuild,v 1.1 2004/02/19 19:17:45 johnm Exp $ + +#version of gentoo patchset +GPV=2.21 +#GPV_SRC="mirror://gentoo/genpatches-2.6-${GPV}.tar.bz2" +GPV_SRC="http://dev.gentoo.org/~johnm/files/genpatches-2.6-${GPV}.tar.bz2" + +RESTRICT="nomirror" +KEYWORDS="amd64 x86" + +UNIPATCH_LIST="${DISTDIR}/genpatches-2.6-${GPV}.tar.bz2 ${FILESDIR}/2.6-do_munmap.patch" +UNIPATCH_DOCS="${WORKDIR}/patches/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/README" + +ETYPE="sources" +inherit kernel-2 +detect_version + +DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GPV_SRC}" +DEPEND="${DEPEND} dev-libs/ucl" + +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 + ewarn "If you choose to use UCL/gcloop please ensure you compile gcloop" + ewarn "without -fstack-protector." + echo +} -- cgit v1.2.3-65-gdbad