From 33d6a4250c4a54528d64f23960d97bed704fe0f1 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Wed, 30 Jun 2004 17:51:14 +0000 Subject: Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694. --- sys-kernel/uclinux-sources/ChangeLog | 9 +++- .../files/digest-uclinux-sources-2.6.7_p0 | 2 - .../files/digest-uclinux-sources-2.6.7_p0-r1 | 2 + .../files/uclinux-sources-2.6.IPTables-RDoS.patch | 11 +++++ .../uclinux-sources-2.6.7_p0-r1.ebuild | 50 ++++++++++++++++++++++ .../uclinux-sources-2.6.7_p0.ebuild | 49 --------------------- 6 files changed, 71 insertions(+), 52 deletions(-) delete mode 100644 sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0 create mode 100644 sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1 create mode 100644 sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch create mode 100644 sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild delete mode 100644 sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog index 3bea5b10a312..3cd8ae979f23 100644 --- a/sys-kernel/uclinux-sources/ChangeLog +++ b/sys-kernel/uclinux-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/uclinux-sources # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.11 2004/06/25 20:15:29 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.12 2004/06/30 17:51:14 plasmaroo Exp $ + +*uclinux-sources-2.6.7_p0-r1 (30 Jun 2004) + + 30 Jun 2004; +uclinux-sources-2.6.7_p0-r1.ebuild, + -uclinux-sources-2.6.7_p0.ebuild, + +files/uclinux-sources-2.6.IPTables-RDoS.patch: + Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694. *uclinux-sources-2.4.26_p0-r2 (25 Jun 2004) diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0 deleted file mode 100644 index a0d14dcb41a9..000000000000 --- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228 -MD5 9f8265eee2179199a81e0a00268eb1a6 linux-2.6.7-uc0.patch.gz 184811 diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1 new file mode 100644 index 000000000000..a0d14dcb41a9 --- /dev/null +++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r1 @@ -0,0 +1,2 @@ +MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228 +MD5 9f8265eee2179199a81e0a00268eb1a6 linux-2.6.7-uc0.patch.gz 184811 diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch new file mode 100644 index 000000000000..8f89d1605c9a --- /dev/null +++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.IPTables-RDoS.patch @@ -0,0 +1,11 @@ +--- net/ipv4/netfilter/ip_tables.c.orig 2004-04-04 05:36:47.000000000 +0200 ++++ net/ipv4/netfilter/ip_tables.c 2004-06-24 21:24:26.000000000 +0200 +@@ -1461,7 +1461,7 @@ + int *hotdrop) + { + /* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */ +- char opt[60 - sizeof(struct tcphdr)]; ++ u_int8_t opt[60 - sizeof(struct tcphdr)]; + unsigned int i; + + duprintf("tcp_match: finding option\n"); diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild new file mode 100644 index 000000000000..10c3dca64c44 --- /dev/null +++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r1.ebuild,v 1.1 2004/06/30 17:51:14 plasmaroo Exp $ + +IUSE="" + +ETYPE="sources" +inherit kernel eutils +OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`" + +EXTRAVERSION="uc${PV/*_p/}" +[ "${PR}" != "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" +KV="${OKV}-${EXTRAVERSION}" + +# Get the major & minor kernel version +MMV=`echo $PV | awk -F. '{print $1"."$2}'` + +patch="diff" +base="uClinux" +if [ ${MMV} == "2.6" ]; then + patch="patch" + base="linux" +fi + +MY_P=linux-${PV/_p/-uc} + +S=${WORKDIR}/linux-${KV} +DESCRIPTION="uCLinux kernel patches for CPUs without MMUs" +SRC_URI="mirror://kernel/v${MMV}/linux-${OKV}.tar.bz2 + http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz" + +HOMEPAGE="http://www.uclinux.org/" +KEYWORDS="~x86 -ppc" +SLOT="${KV}" + +src_unpack() { + unpack ${A} + mv linux-${OKV} linux-${KV} || die + + cd linux-${KV} + epatch ../${MY_P/linux/${base}}.${patch} || die "Failed to apply uClinux patch!" + epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!" + + set MY_ARCH=${ARCH} + unset ARCH + rm ../${MY_P/linux/${base}}.${patch} + + kernel_universal_unpack + set ARCH=${MY_ARCH} +} diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild deleted file mode 100644 index e2e433728ef2..000000000000 --- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild +++ /dev/null @@ -1,49 +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/uclinux-sources/uclinux-sources-2.6.7_p0.ebuild,v 1.1 2004/06/25 20:15:29 plasmaroo Exp $ - -IUSE="" - -ETYPE="sources" -inherit kernel eutils -OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`" - -EXTRAVERSION="uc${PV/*_p/}" -[ "${PR}" != "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}" -KV="${OKV}-${EXTRAVERSION}" - -# Get the major & minor kernel version -MMV=`echo $PV | awk -F. '{print $1"."$2}'` - -patch="diff" -base="uClinux" -if [ ${MMV} == "2.6" ]; then - patch="patch" - base="linux" -fi - -MY_P=linux-${PV/_p/-uc} - -S=${WORKDIR}/linux-${KV} -DESCRIPTION="uCLinux kernel patches for CPUs without MMUs" -SRC_URI="mirror://kernel/v${MMV}/linux-${OKV}.tar.bz2 - http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz" - -HOMEPAGE="http://www.uclinux.org/" -KEYWORDS="~x86 -ppc" -SLOT="${KV}" - -src_unpack() { - unpack ${A} - mv linux-${OKV} linux-${KV} || die - - cd linux-${KV} - epatch ../${MY_P/linux/${base}}.${patch} || die "Failed to apply uClinux patch!" - - set MY_ARCH=${ARCH} - unset ARCH - rm ../${MY_P/linux/${base}}.${patch} - - kernel_universal_unpack - set ARCH=${MY_ARCH} -} -- cgit v1.2.3-65-gdbad