Update gcc-4.3 patches to really fix bug #225761

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

3 files changed, 55 insertions, 13 deletions

diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog
index 555893a6e8af..448b481499c5 100644
--- a/net-misc/l7-filter-userspace/ChangeLog
+++ b/net-misc/l7-filter-userspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/l7-filter-userspace
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.3 2008/06/13 12:50:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.4 2008/06/29 11:54:57 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/l7-filter-userspace-0.6-gcc4.3compat.patch:
+  Update gcc-4.3 patches to really fix bug #225761
 
   13 Jun 2008; Daniel Black <dragonheart@gentoo.org>
   +files/l7-filter-userspace-0.6-gcc4.3compat.patch,
diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest
index 6dd0a0fa49e5..f1b5fde7bee1 100644
--- a/net-misc/l7-filter-userspace/Manifest
+++ b/net-misc/l7-filter-userspace/Manifest
@@ -1,10 +1,10 @@
 AUX Makefile.am 366 RMD160 274b46980dab67ea209d06bf88dacf1163b4bcd3 SHA1 87d3d8d39e24b9f4650d5484cc13dcdea2a8e4da SHA256 10575dd5f18b8f8be39a33ed48ec89903eb435fb99de9e0f50a955c7caee2be1
 AUX configure.ac 407 RMD160 a6202ecd5a822db79bb1b432aa53c3bd44817000 SHA1 d4a483b222ef2b54b80842dbc7d8a51549f00923 SHA256 100c77fb73888ab5c03f6a70f0f7664a6605c3c693fed99b0512d7616c74842b
 AUX l7-filter-userspace-0.4-misc.patch 1061 RMD160 9894c357277d0fc7826f6d5ef8a74b3adbe3fb39 SHA1 ac13566a63d6cc4aa08f4a026cd279ce42a40c73 SHA256 ced7401737e4cfa2f595ec0b0a62589e14017b3a559afbd6a6bd9a36df8823cf
-AUX l7-filter-userspace-0.6-gcc4.3compat.patch 805 RMD160 c0c4f2b6feef43234685e6ac332fa4a980ee803f SHA1 a20f1e6a91d4820aca110a06f87b7cd7f4efda73 SHA256 fde0829a8d32cea051ac0d07c94b064a65199af42c0f259ebaba43e8e692e18b
+AUX l7-filter-userspace-0.6-gcc4.3compat.patch 1936 RMD160 f69536dbeaa7fe35e791a14ef8c1f8e578599e9d SHA1 0052895392b3f15d3008783cca5ec9c39154ea93 SHA256 7c9820f4fd0af35f809d77e046e481d474014206fb9a2dff95df1713f83de81d
 DIST l7-filter-userspace-0.6.tar.gz 128835 RMD160 5e29e2a79e0329f943bdb030319ed43a23f8163d SHA1 cceda1dfd7c566c6aace225ede3e75907605da7e SHA256 be8e1e1a64fb4f9366c0c9daed28aa0a2339f33886b84cede19e0b61a7a6d89f
 DIST l7-filter-userspace-v0.4.tar.gz 24042 RMD160 e680e45349581a3525ece481490c846abb5943a5 SHA1 1ce92160dc04cddad793e4e6a705c9e29bdf6d5e SHA256 0e3f550879df069f07fc23a5989d451fa7216bccaa5b20b0eb69f7de6f4cc9f9
 EBUILD l7-filter-userspace-0.4.ebuild 951 RMD160 c043c16ae5def50f02ee387d76e15391b1b54530 SHA1 b1d1800ceea35ccfddad803a6edf14bf4831d235 SHA256 067e840a36743e453c0ebe6516faf8a3592d63f0ec9b9e7bd176b271e769a8ca
 EBUILD l7-filter-userspace-0.6.ebuild 765 RMD160 c1de2ed080d8449736e045f048ec17a0f7b465df SHA1 66c5a9cb5e51142bb7ced45c13369b09c295275f SHA256 2dd525dbf61e3ae4cc08795b5abe5e13fd883a23c2d12e327de5fc3717bf31cd
-MISC ChangeLog 896 RMD160 bc3097b2b4f82141796e054ab51520f20540ef0a SHA1 99454f56c26af652128f705f04ae89bf5869360f SHA256 baa88dfd16b2624dbb3a6eed4d8a383cf170ec309e392f373b8b3a47b34039d5
+MISC ChangeLog 1050 RMD160 2538264c5697d8e1c866285d625a2ad746843111 SHA1 d9485af25116316e8d51c4868b9fd1769edf942b SHA256 6c267168626f8b71083abd390c15ee610e26aac9d1569e933a53283f928564d3
 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch
index 4928cbd462f5..0dec8573ac53 100644
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch
@@ -1,23 +1,61 @@
-diff -ru l7-filter-userspace-0.6.orig/l7-conntrack.cpp l7-filter-userspace-0.6/l7-conntrack.cpp
---- l7-filter-userspace-0.6.orig/l7-conntrack.cpp	2008-05-08 14:28:31.000000000 +1000
-+++ l7-filter-userspace-0.6/l7-conntrack.cpp	2008-06-13 22:48:04.000000000 +1000
-@@ -21,6 +21,7 @@
+diff -NrU5 l7-filter-userspace-0.6.orig/l7-classify.cpp l7-filter-userspace-0.6/l7-classify.cpp
+--- l7-filter-userspace-0.6.orig/l7-classify.cpp	2008-06-29 13:46:07.000000000 +0200
++++ l7-filter-userspace-0.6/l7-classify.cpp	2008-06-29 13:48:04.000000000 +0200
+@@ -15,10 +15,11 @@
+ 
+ using namespace std;
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+ 
+ #include <vector>
+ #include <string>
+ #include <sstream>
+ #include <stdio.h>
+diff -NrU5 l7-filter-userspace-0.6.orig/l7-conntrack.cpp l7-filter-userspace-0.6/l7-conntrack.cpp
+--- l7-filter-userspace-0.6.orig/l7-conntrack.cpp	2008-06-29 13:46:07.000000000 +0200
++++ l7-filter-userspace-0.6/l7-conntrack.cpp	2008-06-29 13:46:58.000000000 +0200
+@@ -19,10 +19,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
  #include <errno.h>
  #include <signal.h>
  #include <map>
-+#include <string.h>
++#include <cstring>
  
  extern "C" {
  #include <linux/netfilter.h>
-diff -ru l7-filter-userspace-0.6.orig/l7-queue.cpp l7-filter-userspace-0.6/l7-queue.cpp
---- l7-filter-userspace-0.6.orig/l7-queue.cpp	2007-05-14 12:47:09.000000000 +1000
-+++ l7-filter-userspace-0.6/l7-queue.cpp	2008-06-13 22:46:35.000000000 +1000
-@@ -35,6 +35,8 @@
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ }
+diff -NrU5 l7-filter-userspace-0.6.orig/l7-filter.cpp l7-filter-userspace-0.6/l7-filter.cpp
+--- l7-filter-userspace-0.6.orig/l7-filter.cpp	2008-06-29 13:46:07.000000000 +0200
++++ l7-filter-userspace-0.6/l7-filter.cpp	2008-06-29 13:50:37.000000000 +0200
+@@ -20,10 +20,11 @@
+ using namespace std;
+ #include <pthread.h>
+ 
+ #include <fstream>
+ #include <iostream>
++#include <climits>
+ 
+ #include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff -NrU5 l7-filter-userspace-0.6.orig/l7-queue.cpp l7-filter-userspace-0.6/l7-queue.cpp
+--- l7-filter-userspace-0.6.orig/l7-queue.cpp	2008-06-29 13:46:07.000000000 +0200
++++ l7-filter-userspace-0.6/l7-queue.cpp	2008-06-29 13:46:58.000000000 +0200
+@@ -33,10 +33,12 @@
+ #include <errno.h>
+ #include <signal.h>
  #include <map>
  #include <netinet/in.h>
  
-+#include <string.h>
++#include <cstring>
 +
  #include "l7-conntrack.h"
  #include "l7-queue.h"
  #include "util.h"
+ 
+ // Probably shouldn't really be global, but it's SO much easier