summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-10-19 12:20:45 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-10-19 12:20:45 +0000
commit9b26b70de503ac4479bcb92bbfb6f1704d53b5a3 (patch)
tree716e795a565afcc80ab0ac238065188c193cd630 /sys-kernel
parentfixed dodoc's (diff)
downloadhistorical-9b26b70de503ac4479bcb92bbfb6f1704d53b5a3.tar.gz
historical-9b26b70de503ac4479bcb92bbfb6f1704d53b5a3.tar.bz2
historical-9b26b70de503ac4479bcb92bbfb6f1704d53b5a3.zip
Added patch to fix the ipt_realm.c problems: Bug #30031 et al.
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-sources/ChangeLog6
-rw-r--r--sys-kernel/gentoo-sources/Manifest5
-rw-r--r--sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-ipt-realm.patch31
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild3
4 files changed, 41 insertions, 4 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 87a6bcd5258a..69e27f1f2701 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/gentoo-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.35 2003/10/11 20:31:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.36 2003/10/19 12:20:38 plasmaroo Exp $
+
+ 19 Oct 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild,
+ files/gentoo-sources-2.4.20-ipt-realm.patch:
+ Added a patch to fix the ipt_realm.c bugs we have floating around...
11 Oct 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild,
files/gentoo-sources-2.4.20-cs46xx-gcc33.patch:
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 7f54c1c3c89e..5bdfcf8b58f2 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,11 +1,12 @@
-MD5 91c1eb8ed10e1d35458933e9746b0054 ChangeLog 10177
+MD5 29f116fb487eb2932ec66f88f6692eb4 ChangeLog 10367
MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113
-MD5 f3f76814a133a49c322f1481583e2348 gentoo-sources-2.4.20-r7.ebuild 5091
+MD5 401c0e324d9c0a514bf972a76db6b554 gentoo-sources-2.4.20-r7.ebuild 5149
MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571
MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725
MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
+MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-ipt-realm.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-ipt-realm.patch
new file mode 100644
index 000000000000..08cd56909e7c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-ipt-realm.patch
@@ -0,0 +1,31 @@
+--- linux-2.4.20-gentoo-r7/net/ipv4/netfilter/ipt_realm.c.old 2003-10-19 12:55:59.000000000 +0100
++++ linux-2.4.20-gentoo-r7/net/ipv4/netfilter/ipt_realm.c 2003-10-19 13:08:20.000000000 +0100
+@@ -26,6 +26,18 @@
+
+ if((dst = skb->dst) == NULL)
+ return 0;
++
++ #ifndef _NET_DST_H_have_tclassid
++ #warning Could not find _NET_DST_H_have_tclassid...
++ #warning
++ #warning Make sure you have enabled the following
++ #warning in your configuration:-
++ #warning
++ #warning Network Options >> QoS and/or fair queuing
++ #warning >> Packet Classifier API
++ #warning >> Routing table based classifier
++ #endif
++
+ id = dst->tclassid;
+
+ return (info->id == (id & info->mask)) ^ info->invert;
+--- linux-2.4.20-gentoo-r7/include/net/dst.h.old 2003-10-19 12:54:13.000000000 +0100
++++ linux-2.4.20-gentoo-r7/include/net/dst.h 2003-10-19 13:04:01.000000000 +0100
+@@ -58,6 +58,7 @@
+ int (*output)(struct sk_buff*);
+
+ #ifdef CONFIG_NET_CLS_ROUTE
++ #define _NET_DST_H_have_tclassid
+ __u32 tclassid;
+ #endif
+
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
index 4417af184b58..c50656545c1e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.6 2003/10/11 20:31:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.7 2003/10/19 12:20:38 plasmaroo Exp $
IUSE="build crypt evms2 aavm usagi"
@@ -121,6 +121,7 @@ src_unpack() {
epatch ${FILESDIR}/gentoo-sources-2.4.20-sched-interrupt.patch
epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
+ epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
}