Added patches to address the security vulnerabilities in bugs #37292 and #37317.

4 files changed, 15 insertions, 7 deletions

diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index 33d081102b69..effc1b90fe1d 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/rsbac-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.4 2003/12/05 17:25:46 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.5 2004/01/07 00:41:57 plasmaroo Exp $
+
+*rsbac-sources-2.4.20-r1 (07 Jan 2004)
+
+  07 Jan 2004; <plasmaroo@gentoo.org> rsbac-sources-2.4.20-r1.ebuild:
+  Added patches to address the security vulnerabilities in bugs #37292 and
+  #37317. Old revision removed.
 
   01 Dec 2003; Brian Jackson <iggy@gentoo.org> rsbac-sources-2.4.20.ebuild,
   files/do_brk_fix.patch: Fix the 'do_brk' vulnerability.
diff --git a/sys-kernel/rsbac-sources/Manifest b/sys-kernel/rsbac-sources/Manifest
index 5b8e6b9c7c93..1b2b4781c926 100644
--- a/sys-kernel/rsbac-sources/Manifest
+++ b/sys-kernel/rsbac-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 b5ad9e774d7901e93f61336dcc7a3d3a ChangeLog 508
-MD5 d3af31420ef5d60389143c9043b6d4f1 rsbac-sources-2.4.20.ebuild 3177
-MD5 79053afe39299a3f4c205204dd0b5e49 files/digest-rsbac-sources-2.4.20 403
+MD5 8fc2eb922451377d9da87f7b9d565df8 ChangeLog 726
+MD5 0d8d8f0ee61b8c7df2eaa462ba1bf310 rsbac-sources-2.4.20-r1.ebuild 3376
 MD5 e7532d3b86be69c91d6530663358559c files/nr_rsbac_patch.diff 295
+MD5 79053afe39299a3f4c205204dd0b5e49 files/digest-rsbac-sources-2.4.20-r1 403
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.20 b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.20-r1
index ca08deeb6f94..ca08deeb6f94 100644
--- a/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.20
+++ b/sys-kernel/rsbac-sources/files/digest-rsbac-sources-2.4.20-r1
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20-r1.ebuild
index 101450472328..ca2e65d82482 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild,v 1.7 2003/12/02 04:11:38 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.20-r1.ebuild,v 1.1 2004/01/07 00:41:57 plasmaroo Exp $
 
 ETYPE="sources"
 
@@ -60,7 +60,9 @@ src_unpack() {
 		patch -p1 < ${BUGFIX}-3.diff || die "cannot apply fix patch 1"
 		echo "-> Fix patch 3 applied"
 
-		epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+		epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
+		epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+		epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 
 		# We need to have our kernel in /boot
 		mv Makefile Makefile.orig