Fixes CAN 0596 and #57826

5 files changed, 35 insertions, 14 deletions

diff --git a/sys-kernel/rsbac-dev-sources/ChangeLog b/sys-kernel/rsbac-dev-sources/ChangeLog
index dcf0b513e54a..d7fa7e3bfe50 100644
--- a/sys-kernel/rsbac-dev-sources/ChangeLog
+++ b/sys-kernel/rsbac-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2004/07/16 17:20:25 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.7 2004/07/22 10:55:44 kang Exp $
+
+*rsbac-dev-sources-2.6.7-r3 (22 Jul 2004)
+
+  22 Jul 2004; Guillaume Destuynder <kang@gentoo.org>
+  +files/rsbac-dev-sources-CAN-2004-0596.patch,
+  +rsbac-dev-sources-2.6.7-r3,
+  -rsbac-dev-sources-2.6.7-r2
+  Fixes CAN 0596 and #57826.
 
 *rsbac-dev-sources-2.6.7-r2 (16 Jul 2004)
 
diff --git a/sys-kernel/rsbac-dev-sources/Manifest b/sys-kernel/rsbac-dev-sources/Manifest
index faf9cea27dbc..c6b64450dc6c 100644
--- a/sys-kernel/rsbac-dev-sources/Manifest
+++ b/sys-kernel/rsbac-dev-sources/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fee9abc7797fef753c42454679bae9a7 metadata.xml 456
-MD5 e0f62b3cac1ebab8163e2078cbf5711e rsbac-dev-sources-2.6.7-r2.ebuild 1357
-MD5 5f4134939982c2d7f52b6c4c78661a81 ChangeLog 2058
+MD5 f429df968d9b1d577f86fda436dcd60f rsbac-dev-sources-2.6.7-r3.ebuild 1396
+MD5 b7fc8d81606c32aa8d42c390e05c66b8 ChangeLog 2294
 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 ff6ffe7543ce01c98eb4ca1c8d9ca1c3 files/digest-rsbac-dev-sources-2.6.7-r2 205
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+A7DJUNS2Y9cV5ERAglvAJ9BbSGR+zzzykO/EjSK810MqUPPEwCfeeO6
-prrtFZEwfFjFc6UeId7YtoU=
-=pg/v
------END PGP SIGNATURE-----
+MD5 f0e12ba218f53c2694a91259bdc2fdc7 files/rsbac-dev-sources-CAN-2004-0596.patch 494
+MD5 ff6ffe7543ce01c98eb4ca1c8d9ca1c3 files/digest-rsbac-dev-sources-2.6.7-r3 205
diff --git a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r2 b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r3
index 89b064e672f0..89b064e672f0 100644
--- a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r2
+++ b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r3
diff --git a/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-0596.patch b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-0596.patch
new file mode 100644
index 000000000000..8ea0f0488310
--- /dev/null
+++ b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-0596.patch
@@ -0,0 +1,20 @@
+--- drivers/net/eql.c.ori	2004-07-22 12:46:56.103576048 +0200
++++ drivers/net/eql.c	2004-07-22 12:46:59.068125368 +0200
+@@ -497,6 +497,8 @@
+ 	slave_dev = dev_get_by_name(sc.slave_name);
+ 
+ 	ret = -EINVAL;
++	if (!slave_dev)
++		return ret;
+ 
+ 	spin_lock_bh(&eql->queue.lock);
+ 	if (eql_is_slave(slave_dev)) {
+@@ -531,6 +533,8 @@
+ 	slave_dev = dev_get_by_name(sc.slave_name);
+ 
+ 	ret = -EINVAL;
++	if (!slave_dev)
++		return ret;
+ 
+ 	spin_lock_bh(&eql->queue.lock);
+ 	if (eql_is_slave(slave_dev)) {
diff --git a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r2.ebuild b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.ebuild
index 511fa74f6665..bf4d6341841c 100644
--- a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r2.ebuild
+++ b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.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-r2.ebuild,v 1.1 2004/07/16 17:20:25 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r3.ebuild,v 1.1 2004/07/22 10:55:44 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -18,6 +18,7 @@ RGPV_SRC="mirror://rsbac-patches-${KV_MAJOR}.${KV_MINOR}-${RGPV}.tar.bz2"
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="${FILESDIR}/${PN}-iptables-dos.patch
 	${FILESDIR}/${PN}-CAN-2004-0497.patch
+	${FILESDIR}/${PN}-CAN-2004-0596.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"