[gentoo-commits] gentoo-x86 commit in net-misc/l7-filter-userspace/files: l7-filter-userspace-0.6-gcc4.3compat.patch

[Peter Alfredsen (loki_val)]

loki_val    08/06/29 11:54:58

  Modified:             l7-filter-userspace-0.6-gcc4.3compat.patch
  Log:
  Update gcc-4.3 patches to really fix bug #225761
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

Revision  Changes    Path
1.2                  net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch?r1=1.1&r2=1.2

Index: l7-filter-userspace-0.6-gcc4.3compat.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.6-gcc4.3compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- l7-filter-userspace-0.6-gcc4.3compat.patch	13 Jun 2008 12:50:37 -0000	1.1
+++ l7-filter-userspace-0.6-gcc4.3compat.patch	29 Jun 2008 11:54:58 -0000	1.2
@@ -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



-- 
gentoo-commits@l.g.o mailing list