From 63b3a5b5495b186d065d39a75dd20eeb39b538ff Mon Sep 17 00:00:00 2001 From: David Holm Date: Mon, 15 Nov 2004 12:11:43 +0000 Subject: [PATCH] Added security fix from bug #70681. Removed old kernels. --- sys-kernel/pegasos-dev-sources/ChangeLog | 9 +++- sys-kernel/pegasos-dev-sources/Manifest | 9 ++-- .../files/digest-pegasos-dev-sources-2.6.7-r5 | 2 - .../files/digest-pegasos-dev-sources-2.6.7-r7 | 2 - .../files/digest-pegasos-dev-sources-2.6.9-r2 | 2 + ...asos-dev-sources-2.6.7.CAN-2004-0596.patch | 46 ------------------- .../pegasos-dev-sources-2.6.9-r2.ebuild | 35 ++++++++++++++ 7 files changed, 48 insertions(+), 57 deletions(-) delete mode 100644 sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r5 delete mode 100644 sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r7 create mode 100644 sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.9-r2 delete mode 100644 sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch create mode 100644 sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.9-r2.ebuild diff --git a/sys-kernel/pegasos-dev-sources/ChangeLog b/sys-kernel/pegasos-dev-sources/ChangeLog index c31b00825569..168dad8fa1f1 100644 --- a/sys-kernel/pegasos-dev-sources/ChangeLog +++ b/sys-kernel/pegasos-dev-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/pegasos-dev-sources # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/ChangeLog,v 1.17 2004/10/24 21:40:08 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/ChangeLog,v 1.18 2004/11/15 12:11:43 dholm Exp $ + +*pegasos-dev-sources-2.6.9-r2 (15 Nov 2004) + + 15 Nov 2004; David Holm + +pegasos-dev-sources-2.6.9-r2.ebuild: + Added security fix from bug #70681. + Removed old kernels. *pegasos-dev-sources-2.6.9-r1 (24 Oct 2004) diff --git a/sys-kernel/pegasos-dev-sources/Manifest b/sys-kernel/pegasos-dev-sources/Manifest index c852b088828b..839264537cec 100644 --- a/sys-kernel/pegasos-dev-sources/Manifest +++ b/sys-kernel/pegasos-dev-sources/Manifest @@ -1,13 +1,10 @@ MD5 a768f20366d412feaf748b4ac46b046e metadata.xml 350 -MD5 6fe7526855f2485ba619689379ab6a79 ChangeLog 3501 -MD5 ef7c7cc92279282c2d80cd81628f8c3a pegasos-dev-sources-2.6.7-r5.ebuild 1331 -MD5 28648c5a3dad2cc64db2f25fb11683df pegasos-dev-sources-2.6.7-r7.ebuild 1331 +MD5 c2e9703b486c278973adf40a4010b177 ChangeLog 3693 MD5 c4af53afb1e4a56f663898b77a6e4d84 pegasos-dev-sources-2.6.8.1-r2.ebuild 1182 MD5 c81de8f3205bd0a7fe1a30f0fec9bf56 pegasos-dev-sources-2.6.9.ebuild 1281 MD5 a9fd28b48564ad4781cd273ed4681c33 pegasos-dev-sources-2.6.9-r1.ebuild 1284 -MD5 8204afea1d572b49a4a80d8da4eef0c9 files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch 1033 -MD5 9cdca35deb24cc0379966d380bd636d2 files/digest-pegasos-dev-sources-2.6.7-r5 137 -MD5 9768ec9a88882e1310e2f17a4cd13d43 files/digest-pegasos-dev-sources-2.6.7-r7 137 +MD5 940c368d56a99fa42f7aba48e9186736 pegasos-dev-sources-2.6.9-r2.ebuild 1284 MD5 b03f2054a7c8d904d9f7d2a10867aa09 files/digest-pegasos-dev-sources-2.6.8.1-r2 141 MD5 ea89058171bb35f89fdee1b00665f62a files/digest-pegasos-dev-sources-2.6.9 137 MD5 ef4ae77a9f63f9ff56c5774f808dda65 files/digest-pegasos-dev-sources-2.6.9-r1 137 +MD5 11513cb7bf54e0401e56ca39a41d5368 files/digest-pegasos-dev-sources-2.6.9-r2 137 diff --git a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r5 b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r5 deleted file mode 100644 index e080c278772d..000000000000 --- a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228 -MD5 503caf48dbc513ab04cd8102788c07d5 pegpatches-2.6-7.6.tar.bz2 338469 diff --git a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r7 b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r7 deleted file mode 100644 index f5561a5aec64..000000000000 --- a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r7 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228 -MD5 b54f7c17987cb4c7a99297250a082589 pegpatches-2.6-7.7.tar.bz2 268939 diff --git a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.9-r2 b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.9-r2 new file mode 100644 index 000000000000..b6e0f65d5792 --- /dev/null +++ b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.9-r2 @@ -0,0 +1,2 @@ +MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440 +MD5 0e3c0b5939321ff6f85a0d86cdf84810 pegpatches-2.6-9.2.tar.bz2 284649 diff --git a/sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch b/sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch deleted file mode 100644 index 3e20a2e41372..000000000000 --- a/sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- 1.13/drivers/net/eql.c 2004-07-21 03:13:40 -07:00 -+++ 1.14/drivers/net/eql.c 2004-07-21 03:13:40 -07:00 -@@ -495,6 +495,8 @@ - return -EFAULT; - - slave_dev = dev_get_by_name(sc.slave_name); -+ if (!slave_dev) -+ return -ENODEV; - - ret = -EINVAL; - -@@ -527,11 +529,13 @@ - if (copy_from_user(&sc, scp, sizeof (slave_config_t))) - return -EFAULT; - -- eql = dev->priv; - slave_dev = dev_get_by_name(sc.slave_name); -+ if (!slave_dev) -+ return -ENODEV; - - ret = -EINVAL; - -+ eql = dev->priv; - spin_lock_bh(&eql->queue.lock); - if (eql_is_slave(slave_dev)) { - slave = __eql_find_slave_dev(&eql->queue, slave_dev); ---- 1.14/drivers/net/eql.c 2004-07-21 03:13:33 -07:00 -+++ 1.15/drivers/net/eql.c 2004-07-21 03:13:33 -07:00 -@@ -499,6 +499,8 @@ - return -ENODEV; - - ret = -EINVAL; -+ if (!slave_dev) -+ return ret; - - spin_lock_bh(&eql->queue.lock); - if (eql_is_slave(slave_dev)) { -@@ -534,6 +536,8 @@ - return -ENODEV; - - ret = -EINVAL; -+ if (!slave_dev) -+ return ret; - - eql = dev->priv; - spin_lock_bh(&eql->queue.lock); diff --git a/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.9-r2.ebuild b/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.9-r2.ebuild new file mode 100644 index 000000000000..5fec04e221eb --- /dev/null +++ b/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.9-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.9-r2.ebuild,v 1.1 2004/11/15 12:11:43 dholm Exp $ + +ETYPE="sources" +inherit kernel-2 +detect_version + +# Version of gentoo patchset +GPV=9.2 +GPV_SRC="mirror://gentoo/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}.tar.bz2" + +KEYWORDS="ppc" +IUSE="" + +UNIPATCH_LIST="${DISTDIR}/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}.tar.bz2" +UNIPATCH_DOCS="${WORKDIR}/patches/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README + ${WORKDIR}/patches/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/pegasos-config" + +DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree on Pegasos computers" +SRC_URI="${KERNEL_URI} ${GPV_SRC}" + +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 option:" + ewarn " Device Drivers -> Character devices -> Legacy (BSD) PTY Support." + echo + ewarn "Do not enable preemption. It does not work well on Linux/PowerPC" + ewarn "desktop systems." + echo +} -- 2.26.2