Fixes CAN 0415 and #59378 (file offset pointer handling vulnerability)

4 files changed, 16 insertions, 6 deletions

diff --git a/sys-kernel/rsbac-dev-sources/ChangeLog b/sys-kernel/rsbac-dev-sources/ChangeLog
index 570ec049d5e9..62b0ac42b902 100644
--- a/sys-kernel/rsbac-dev-sources/ChangeLog
+++ b/sys-kernel/rsbac-dev-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/rsbac-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.8 2004/07/26 09:33:57 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.9 2004/08/05 01:44:37 kang Exp $
+
+*rsbac-dev-sources-2.6.7-r4 (05 Aug 2004)
+
+  05 Aug 2004; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-dev-sources-2.6.7-r3.ebuild,
+  +rsbac-dev-sources-2.6.7-r4.ebuild:
+  Fixes CAN 0415 and #59378 (file offset pointer handling vulnerability)
 
 *rsbac-dev-sources-2.6.7-r3 (22 Jul 2004)
 
diff --git a/sys-kernel/rsbac-dev-sources/Manifest b/sys-kernel/rsbac-dev-sources/Manifest
index c408f0fe7adb..87ec45193041 100644
--- a/sys-kernel/rsbac-dev-sources/Manifest
+++ b/sys-kernel/rsbac-dev-sources/Manifest
@@ -1,8 +1,8 @@
 MD5 fee9abc7797fef753c42454679bae9a7 metadata.xml 456
-MD5 5a1ad072a8b14887dc35bab5e4af60eb rsbac-dev-sources-2.6.7-r3.ebuild 1395
-MD5 7f7f0903eb4e16a4b034d661fd0986ed ChangeLog 2410
+MD5 26dcc385a147182bccc4b9215cd07f8c rsbac-dev-sources-2.6.7-r4.ebuild 1554
+MD5 d5d26591a5ec7223a12f97fa2b7ebaf3 ChangeLog 2657
 MD5 a869ab037c7e264df5f8e899864f08e9 files/rsbac-dev-sources-v1.2.3-3.patch 557
 MD5 6451bd210935a3978fd3a3edac673591 files/rsbac-dev-sources-iptables-dos.patch 389
 MD5 b6e38b41c8a79943df2ab2642149d06f files/rsbac-dev-sources-CAN-2004-0497.patch 2214
 MD5 f0e12ba218f53c2694a91259bdc2fdc7 files/rsbac-dev-sources-CAN-2004-0596.patch 494
-MD5 ff6ffe7543ce01c98eb4ca1c8d9ca1c3 files/digest-rsbac-dev-sources-2.6.7-r3 205
+MD5 fd024d5229ee08ef90d6a532bdf99977 files/digest-rsbac-dev-sources-2.6.7-r4 281
diff --git a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r3 b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r4
index 89b064e672f0..354ef30ca678 100644
--- a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r3
+++ b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r4
@@ -1,3 +1,4 @@
 MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 f3759250e9c4bb5ccb773174fafe0ba7 rsbac-v1.2.3.tar.bz2 489127
 MD5 60fb38c61d8d8cc913d81ab93ff74972 rsbac-patches-2.6-7.1.tar.bz2 107363
+MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
diff --git a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.ebuild b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild
index f92f682e99ed..e5331acbef3e 100644
--- a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.ebuild
+++ b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.ebuild,v 1.2 2004/07/26 09:33:57 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r4.ebuild,v 1.1 2004/08/05 01:44:37 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -10,6 +10,7 @@ detect_version
 # rsbac 
 RSBACV=1.2.3
 RSBAC_SRC="http://rsbac.org/download/code/v${RSBACV}/rsbac-v${RSBACV}.tar.bz2"
+CAN_SRC="http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.6.7-CAN-2004-0415.patch"
 
 # rsbac kernel patches
 RGPV=7.1
@@ -19,6 +20,7 @@ UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="${FILESDIR}/${PN}-iptables-dos.patch
 	${FILESDIR}/${PN}-CAN-2004-0497.patch
 	${FILESDIR}/${PN}-CAN-2004-0596.patch
+	${DISTDIR}/linux-2.6.7-CAN-2004-0415.patch
 	${DISTDIR}/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2
 	${FILESDIR}/${PN}-v1.2.3-3.patch"
 UNIPATCH_DOCS="${WORKDIR}/patches/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}/0000_README"
@@ -26,7 +28,7 @@ UNIPATCH_DOCS="${WORKDIR}/patches/rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}/
 HOMEPAGE="http://hardened.gentoo.org/rsbac/"
 DESCRIPTION="RSBAC hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
-SRC_URI="${KERNEL_URI} ${RSBAC_SRC} ${RGPV_SRC}"
+SRC_URI="${KERNEL_URI} ${RSBAC_SRC} ${RGPV_SRC} ${CAN_SRC}"
 KEYWORDS="x86"