diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2003-09-21 12:06:54 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2003-09-21 12:06:54 +0000 |
| commit | a6b1639ed0c005ccc5a0d0dac19fe710c7ccf50b (patch) | |
| tree | 2a02c9337464c0fd7f3c6ca2ce25744aa214e9cd /sys-kernel | |
| parent | update openoffice mirrors (diff) | |
| download | gentoo-2-a6b1639ed0c005ccc5a0d0dac19fe710c7ccf50b.tar.gz gentoo-2-a6b1639ed0c005ccc5a0d0dac19fe710c7ccf50b.tar.bz2 gentoo-2-a6b1639ed0c005ccc5a0d0dac19fe710c7ccf50b.zip | |
Added GCC3.3 fix to netfilter code [Bug 28561]
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/gentoo-sources/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch | 14 |
3 files changed, 19 insertions, 4 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog index 521c8fa45f25..79a483c00aa0 100644 --- a/sys-kernel/gentoo-sources/ChangeLog +++ b/sys-kernel/gentoo-sources/ChangeLog @@ -1,6 +1,9 @@ # 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.30 2003/09/14 18:45:27 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.31 2003/09/21 12:06:47 plasmaroo Exp $ + + 21 Sep 2003; <plasmaroo@gentoo.org> files/gentoo-sources-2.4.20-gcc33.patch: + Added ip_nat_core.c GCC3.3 fix [Bug 28561 et al.] 14 Sep 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild, files/gentoo-sources-2.4.20-grsec-disabled.patch: diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 5d35de23608c..a87ec12c2b5c 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -1,10 +1,10 @@ -MD5 418967ee74197e3839bc9557aeeb0423 ChangeLog 9262 +MD5 37a32714c5940cc99ce8079921f0ae5c ChangeLog 9394 MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113 MD5 8dd57188ddd554f256c83c4ad058a0f6 gentoo-sources-2.4.20-r7.ebuild 4817 MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571 MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783 -MD5 936c72f5c9192448859a4cba8473c3ba files/gentoo-sources-2.4.20-gcc33.patch 12778 +MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014 MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145 diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch index f2d2abc56f54..826e9aa5716e 100644 --- a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-gcc33.patch @@ -259,5 +259,17 @@ diff -u -r linux-2.4.20-gentoo-r6/arch/i386/math-emu/poly.h linux-2.4.20-gentoo- + :"g" (dest), "g" (x2), "g" (exp) \ :"cx","si","ax"); } - +diff -u -r linux-2.4.20-gentoo-r6/net/ipv4/netfilter/ip_nat_core.c linux-2.4.20-gentoo-r7/net/ipv4/netfilter/ip_nat_core.c +--- linux-2.4.20-gentoo-r6/net/ipv4/netfilter/ip_nat_core.c 2003-09-10 23:36:03.000000000 +0100 ++++ linux-2.4.20-gentoo-r7/net/ipv4/netfilter/ip_nat_core.c 2003-09-21 12:36:47.000000000 +0100 +@@ -851,8 +851,7 @@ + if (exp_for_packet(exp, pskb)) { + /* FIXME: May be true multiple times in the + * case of UDP!! */ +- DEBUGP("calling nat helper (exp=%p) for +- packet\n", exp); ++ DEBUGP("calling nat helper (exp=%p) for packet\n", exp); + ret = helper->help(ct, exp, info, ctinfo, + hooknum, pskb); + if (ret != NF_ACCEPT) { |