From 9cef1cc417ef3abc3e9ef309edd92d4bdc8e36b3 Mon Sep 17 00:00:00 2001 From: "Konstantin V. Arkhipov" Date: Mon, 27 Dec 2004 16:49:40 +0000 Subject: closing bug #74384 --- sys-kernel/openmosix-sources/ChangeLog | 10 +++- sys-kernel/openmosix-sources/Manifest | 7 +-- .../files/digest-openmosix-sources-2.4.28-r3 | 4 -- .../files/digest-openmosix-sources-2.4.28-r4 | 4 ++ .../files/openmosix-sources.CAN-2004-1137.patch | 59 ++++++++++++++++++++++ .../openmosix-sources-2.4.28-r3.ebuild | 50 ------------------ .../openmosix-sources-2.4.28-r4.ebuild | 51 +++++++++++++++++++ 7 files changed, 127 insertions(+), 58 deletions(-) delete mode 100644 sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r3 create mode 100644 sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r4 create mode 100644 sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1137.patch delete mode 100644 sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r3.ebuild create mode 100644 sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog index acc12c6f6691..bc3b00eae6ca 100644 --- a/sys-kernel/openmosix-sources/ChangeLog +++ b/sys-kernel/openmosix-sources/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-kernel/openmosix-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.78 2004/12/27 09:20:38 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.79 2004/12/27 16:49:40 voxus Exp $ + +*openmosix-sources-2.4.28-r4 (27 Dec 2004) + + 27 Dec 2004; Konstantin Arkhipov : + +files/openmosix-sources.CAN-2004-1137.patch, + -openmosix-sources-2.4.28-r3.ebuild, + +openmosix-sources-2.4.28-r4.ebuild: + Yet another security patch, closing bug #74384. *openmosix-sources-2.4.28-r3 (27 Dec 2004) diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest index 709515757f84..d1e798b2b6b8 100644 --- a/sys-kernel/openmosix-sources/Manifest +++ b/sys-kernel/openmosix-sources/Manifest @@ -1,11 +1,12 @@ -MD5 36097b2e6fc93298315a5ae7fa475a9a openmosix-sources-2.4.28-r3.ebuild 1882 MD5 0d2ed6c9db12f5a1088afa199f413565 openmosix-sources-2.4.28-r2.ebuild 1615 -MD5 5dff3cab5be6aed29268a9e1f88cc095 ChangeLog 16638 +MD5 007c40346626138d3a62a62aa91df3b0 openmosix-sources-2.4.28-r4.ebuild 1969 +MD5 1dff448b38a24b40349763adc6a21a73 ChangeLog 16914 MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312 MD5 eb003205dcff506c0ddfd4783862889a files/openmosix-sources-binfmt_aout.patch 1960 MD5 97d5fad4a9d39486b7da19adeada5d6d files/openmosix-sources-dn_neigh.patch 310 +MD5 04be98c8627ae3649c27ca03d4f2e26c files/openmosix-sources.CAN-2004-1137.patch 1845 MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/openmosix-sources.CAN-2004-1016.patch 2835 MD5 e680b98c71a099e1dd8098b513c93068 files/digest-openmosix-sources-2.4.28-r2 296 -MD5 e680b98c71a099e1dd8098b513c93068 files/digest-openmosix-sources-2.4.28-r3 296 +MD5 e680b98c71a099e1dd8098b513c93068 files/digest-openmosix-sources-2.4.28-r4 296 MD5 757ee1239c3f14645ccea3640d551e11 files/openmosix-sources.CAN-2004-1056.patch 11249 MD5 c27699e9d62f7d46213bd51f87636163 files/openmosix-sources-vma.patch 8143 diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r3 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r3 deleted file mode 100644 index 555b76a5d690..000000000000 --- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r3 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046 -MD5 492b747a78cc16287c8214f6bd79a951 patch-2.4.28-om-migshm-20041206.bz2 249086 -MD5 4b99df79dcc18b17eb41489b96ff9689 linux-2.4.27-CAN-2004-0814.patch 81529 -MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746 diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r4 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r4 new file mode 100644 index 000000000000..555b76a5d690 --- /dev/null +++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r4 @@ -0,0 +1,4 @@ +MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046 +MD5 492b747a78cc16287c8214f6bd79a951 patch-2.4.28-om-migshm-20041206.bz2 249086 +MD5 4b99df79dcc18b17eb41489b96ff9689 linux-2.4.27-CAN-2004-0814.patch 81529 +MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746 diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1137.patch b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1137.patch new file mode 100644 index 000000000000..f64ebb005962 --- /dev/null +++ b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1137.patch @@ -0,0 +1,59 @@ +--- 1.58/net/ipv4/igmp.c 2004-11-09 16:44:25 -08:00 ++++ edited/net/ipv4/igmp.c 2004-12-10 15:16:17 -08:00 +@@ -1778,12 +1778,12 @@ int ip_mc_source(int add, int omode, str + goto done; + rv = !0; + for (i=0; isl_count; i++) { +- rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr, ++ rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr, + sizeof(__u32)); +- if (rv >= 0) ++ if (rv == 0) + break; + } +- if (!rv) /* source not found */ ++ if (rv) /* source not found */ + goto done; + + /* update the interface filter */ +@@ -1825,9 +1825,9 @@ int ip_mc_source(int add, int omode, str + } + rv = 1; /* > 0 for insert logic below if sl_count is 0 */ + for (i=0; isl_count; i++) { +- rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr, ++ rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr, + sizeof(__u32)); +- if (rv >= 0) ++ if (rv == 0) + break; + } + if (rv == 0) /* address already there is an error */ +--- 1.71/net/ipv6/mcast.c 2004-11-11 15:07:25 -08:00 ++++ edited/net/ipv6/mcast.c 2004-12-10 17:20:46 -08:00 +@@ -391,12 +391,12 @@ int ip6_mc_source(int add, int omode, st + goto done; + rv = !0; + for (i=0; isl_count; i++) { +- rv = memcmp(&psl->sl_addr, group, ++ rv = memcmp(&psl->sl_addr[i], source, + sizeof(struct in6_addr)); +- if (rv >= 0) ++ if (rv == 0) + break; + } +- if (!rv) /* source not found */ ++ if (rv) /* source not found */ + goto done; + + /* update the interface filter */ +@@ -437,8 +437,8 @@ int ip6_mc_source(int add, int omode, st + } + rv = 1; /* > 0 for insert logic below if sl_count is 0 */ + for (i=0; isl_count; i++) { +- rv = memcmp(&psl->sl_addr, group, sizeof(struct in6_addr)); +- if (rv >= 0) ++ rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr)); ++ if (rv == 0) + break; + } + if (rv == 0) /* address already there is an error */ diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r3.ebuild deleted file mode 100644 index 887186737fc9..000000000000 --- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r3.ebuild +++ /dev/null @@ -1,50 +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/openmosix-sources/openmosix-sources-2.4.28-r3.ebuild,v 1.1 2004/12/27 09:20:38 voxus Exp $ -#OKV=original kernel version, KV=patched kernel version. They can be the same. - -ETYPE="sources" -inherit kernel eutils - -OKV="2.4.28" -TIMESTAMP="20041206" -[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR} -S=${WORKDIR}/linux-${KV} - -# What's in this kernel? - -# INCLUDED: -# ${OKV}, plus: -# ${OKV} openmosix-migshm-${OKV}-${TIMESTAMP} by voxus - -DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel, including shared memory migration patch (migshm)" -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - http://dev.gentoo.org/~voxus/om/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.27-CAN-2004-0814.patch - mirror://gentoo/linux-2.4.27-nfs3-xdr.patch.bz2" -PROVIDE="virtual/linux-sources" -HOMEPAGE="http://www.kernel.org/ - http://www.openmosix.org/ - http://openmosix.snarc.org/ - http://dev.gentoo.org/~voxus/om/" -LICENSE="GPL-2" -SLOT="${KV}" -KEYWORDS="-* ~x86" -IUSE="" - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - mv linux-${OKV} linux-${KV} || die - cd linux-${KV} - epatch ${DISTDIR}/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 || die "openMosix patch failed." - epatch ${FILESDIR}/${PN}-binfmt_aout.patch || die "Security patch for binfmt_aout failed." - epatch ${FILESDIR}/${PN}-dn_neigh.patch || ewarn "dn_neigh patch failed." - - # CAN's - epatch ${FILESDIR}/${PN}.CAN-2004-1016.patch || die "Patch for CAN-2004-1016 failed." - epatch ${FILESDIR}/${PN}.CAN-2004-1056.patch || die "Patch for CAN-2004-1056 failed." - - epatch ${FILESDIR}/${PN}-vma.patch || "Second patch for CAN-2004-1074 failed." - - kernel_universal_unpack -} diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild new file mode 100644 index 000000000000..d5f272025a48 --- /dev/null +++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild,v 1.1 2004/12/27 16:49:40 voxus Exp $ +#OKV=original kernel version, KV=patched kernel version. They can be the same. + +ETYPE="sources" +inherit kernel eutils + +OKV="2.4.28" +TIMESTAMP="20041206" +[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR} +S=${WORKDIR}/linux-${KV} + +# What's in this kernel? + +# INCLUDED: +# ${OKV}, plus: +# ${OKV} openmosix-migshm-${OKV}-${TIMESTAMP} by voxus + +DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel, including shared memory migration patch (migshm)" +SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 + http://dev.gentoo.org/~voxus/om/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.27-CAN-2004-0814.patch + mirror://gentoo/linux-2.4.27-nfs3-xdr.patch.bz2" +PROVIDE="virtual/linux-sources" +HOMEPAGE="http://www.kernel.org/ + http://www.openmosix.org/ + http://openmosix.snarc.org/ + http://dev.gentoo.org/~voxus/om/" +LICENSE="GPL-2" +SLOT="${KV}" +KEYWORDS="-* ~x86" +IUSE="" + +src_unpack() { + unpack linux-${OKV}.tar.bz2 + mv linux-${OKV} linux-${KV} || die + cd linux-${KV} + epatch ${DISTDIR}/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 || die "openMosix patch failed." + epatch ${FILESDIR}/${PN}-binfmt_aout.patch || die "Security patch for binfmt_aout failed." + epatch ${FILESDIR}/${PN}-dn_neigh.patch || ewarn "dn_neigh patch failed." + + # CAN's + epatch ${FILESDIR}/${PN}.CAN-2004-1016.patch || die "Patch for CAN-2004-1016 failed." + epatch ${FILESDIR}/${PN}.CAN-2004-1056.patch || die "Patch for CAN-2004-1056 failed." + epatch ${FILESDIR}/${PN}.CAN-2004-1137.patch || die "Patch for CAN-2004-1137 failed." + + epatch ${FILESDIR}/${PN}-vma.patch || "Second patch for CAN-2004-1074 failed." + + kernel_universal_unpack +} -- cgit v1.2.3-65-gdbad