patches and update for gcc 4.4.0 allmodconfig

* update gcc to 4.4.0
* update gnutls and ruby
* fix c++ issues for some packages

7 files changed, 135 insertions, 13 deletions

diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 3ee0796a8..10d90f097 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -21,7 +21,7 @@ do-build:
 		${TARGET_CONFIGURE_OPTS} \
 		CFLAGS="${TARGET_CFLAGS}" \
 		DEBUG="" \
-		INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include -I${STAGING_DIR}/include" \
+		INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include" \
 		LDOPTS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib" \
 		PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \
 		TARGET="/usr/bin" \
diff --git a/package/iptraf/patches/patch-src_landesc_c b/package/iptraf/patches/patch-src_landesc_c
index 8cbdd6be0..3af440685 100644
--- a/package/iptraf/patches/patch-src_landesc_c
+++ b/package/iptraf/patches/patch-src_landesc_c
@@ -1,7 +1,12 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/landesc.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/landesc.c	2008-10-09 17:34:11.000000000 +0200
-@@ -83,8 +83,6 @@ void loaddesclist(struct desclist *list,
++++ iptraf-3.0.0/src/landesc.c	2009-05-21 23:01:53.000000000 +0200
+@@ -79,12 +79,10 @@ void loaddesclist(struct desclist *list,
+     char etherline[140];
+     int i, j;                   /* counters used when parsing /etc/ethers */
+ 
+-    bzero(list, sizeof(struct desclist));
++    memset(list, 0, sizeof(struct desclist));
  
      if (linktype == LINK_ETHERNET)
          fd = fopen(ETHFILE, "r");
@@ -10,6 +15,30 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
      if (fd == NULL) {
          return;
+@@ -95,8 +93,8 @@ void loaddesclist(struct desclist *list,
+             printnomem();
+             return;
+         }
+-        bzero(ptmp, sizeof(struct desclistent));
+-        bzero(descline, 140);
++        memset(ptmp, 0, sizeof(struct desclistent));
++        memset(descline, 0, 140);
+         fgets(descline, 140, fd);
+ 
+         if (strcmp(descline, "") == 0) {
+@@ -145,9 +143,9 @@ void loaddesclist(struct desclist *list,
+             printnomem();
+             return;
+         }
+-        bzero(ptmp, sizeof(struct desclistent));
+-        bzero(descline, 140);
+-        bzero(etherline, 140);
++        memset(ptmp, 0, sizeof(struct desclistent));
++        memset(descline, 0, 140);
++        memset(etherline, 0, 140);
+         fgets(etherline, 140, fd);
+ 
+         /* 
 @@ -205,8 +203,6 @@ void savedesclist(struct desclist *list,
  
      if (linktype == LINK_ETHERNET)
diff --git a/package/iptraf/patches/patch-src_log_c b/package/iptraf/patches/patch-src_log_c
index 59786fcee..87e454f07 100644
--- a/package/iptraf/patches/patch-src_log_c
+++ b/package/iptraf/patches/patch-src_log_c
@@ -1,6 +1,24 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/log.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/log.c	2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/log.c	2009-05-21 23:02:34.000000000 +0200
+@@ -125,7 +125,7 @@ void opentlog(FILE ** fd, char *logfilen
+ 
+ void genatime(time_t now, char *atime)
+ {
+-    bzero(atime, TIME_TARGET_MAX);
++    memset(atime, 0, TIME_TARGET_MAX);
+     strncpy(atime, ctime(&now), 26);
+     atime[strlen(atime) - 1] = '\0';
+ }
+@@ -204,7 +204,7 @@ void writeothplog(int logging, FILE * fd
+     char scratchpad[MSGSTRING_MAX];
+ 
+     if (logging) {
+-        bzero(msgbuffer, MSGSTRING_MAX);
++        memset(msgbuffer, 0, MSGSTRING_MAX);
+ 
+         strcpy(msgbuffer, protname);
+         strcat(msgbuffer, "; ");
 @@ -491,8 +491,6 @@ void writeethlog(struct ethtabent *list,
                          ptmp->un.desc.ascaddr);
              else if (ptmp->un.desc.linktype == LINK_PLIP)
diff --git a/package/iptraf/patches/patch-src_othptab_c b/package/iptraf/patches/patch-src_othptab_c
index 5474c21c1..e6b0a9829 100644
--- a/package/iptraf/patches/patch-src_othptab_c
+++ b/package/iptraf/patches/patch-src_othptab_c
@@ -1,14 +1,31 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/othptab.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/othptab.c	2008-10-09 17:34:11.000000000 +0200
-@@ -19,7 +19,6 @@ details.
++++ iptraf-3.0.0/src/othptab.c	2009-05-21 23:02:50.000000000 +0200
+@@ -17,13 +17,12 @@ details.
+ ***/
+ 
  #include <asm/types.h>
++#include "options.h"
++#include "tcptable.h"
  #include <linux/if_ether.h>
  #include <linux/if_tr.h>
 -#include <linux/if_fddi.h>
  #include <winops.h>
  #include "arphdr.h"
- #include "options.h"
+-#include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"
+@@ -128,7 +127,7 @@ struct othptabent *add_othp_entry(struct
+         *nomem = 1;
+         return NULL;
+     }
+-    bzero(new_entry, sizeof(struct othptabent));
++    memset(new_entry, 0, sizeof(struct othptabent));
+ 
+     new_entry->is_ip = is_ip;
+     new_entry->fragment = fragment;
 @@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct
                          new_entry->smacaddr);
              convmacaddr(((struct ethhdr *) packet)->h_dest,
diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c
index c5669deca..1bc9b5964 100644
--- a/package/iptraf/patches/patch-src_packet_c
+++ b/package/iptraf/patches/patch-src_packet_c
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/packet.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/packet.c	2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/packet.c	2009-05-21 23:03:57.000000000 +0200
 @@ -35,7 +35,6 @@ details.
  #include <sys/ioctl.h>
  #include <linux/if_packet.h>
@@ -48,3 +48,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
      case LINK_TR:
          /*
           * Token Ring patch supplied by Tomas Dvorak 
+@@ -337,7 +318,7 @@ int processpacket(char *tpacket, char **
+      * Prepare ISDN reference descriptor and table.
+      */
+ 
+-    bzero(&isdntable, sizeof(struct isdntab));
++    memset(&isdntable, 0, sizeof(struct isdntab));
+     isdn_iface_check(&isdnfd, ifname);
+ 
+     /*
diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c
index 83ba44ff3..6ac96e6d1 100644
--- a/package/iptraf/patches/patch-src_tcptable_c
+++ b/package/iptraf/patches/patch-src_tcptable_c
@@ -1,7 +1,40 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/tcptable.c	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.c	2008-10-09 17:34:11.000000000 +0200
-@@ -600,8 +600,6 @@ void updateentry(struct tcptable *table,
++++ iptraf-3.0.0/src/tcptable.c	2009-05-21 23:07:02.000000000 +0200
+@@ -17,6 +17,7 @@ details.
+    
+ ***/
+ 
++#include <stdlib.h>
+ #include <winops.h>
+ #include "options.h"
+ #include "tcptable.h"
+@@ -143,7 +144,7 @@ int add_tcp_hash_entry(struct tcptable *
+                   entry->daddr.s_addr, entry->dport, entry->ifname);
+ 
+     ptmp = malloc(sizeof(struct tcp_hashentry));
+-    bzero(ptmp, sizeof(struct tcp_hashentry));
++    memset(ptmp, 0, sizeof(struct tcp_hashentry));
+ 
+     if (ptmp == NULL)
+         return 1;
+@@ -337,8 +338,8 @@ struct tcptableent *addentry(struct tcpt
+      * Zero out MAC address fields
+      */
+ 
+-    bzero(new_entry->smacaddr, 15);
+-    bzero(new_entry->oth_connection->smacaddr, 15);
++    memset(new_entry->smacaddr, 0, 15);
++    memset(new_entry->oth_connection->smacaddr, 0, 15);
+ 
+     /*
+      * Set raw port numbers
+@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table,
+     tableentry->spanbr += bcount;
+ 
+     if (opts->mac) {
+-        bzero(newmacaddr, 15);
++        memset(newmacaddr, 0, 15);
  
          if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) {
              convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr);
diff --git a/package/iptraf/patches/patch-src_tcptable_h b/package/iptraf/patches/patch-src_tcptable_h
index fa3d66618..a20d69969 100644
--- a/package/iptraf/patches/patch-src_tcptable_h
+++ b/package/iptraf/patches/patch-src_tcptable_h
@@ -1,8 +1,24 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- iptraf-3.0.0.orig/src/tcptable.h	2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.h	2008-10-09 17:34:11.000000000 +0200
-@@ -22,7 +22,6 @@
- #include <asm/types.h>
++++ iptraf-3.0.0/src/tcptable.h	2009-05-21 22:49:05.000000000 +0200
+@@ -6,7 +6,6 @@
+    
+ ***/
+ 
+-#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -14,15 +13,12 @@
+ #include <panel.h>
+ #include <netdb.h>
+ #include <time.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+-#include <asm/types.h>
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
 -#include <linux/if_fddi.h>