Fix build with newer GCC.

11 files changed, 160 insertions, 17 deletions

diff --git a/net/latd/distinfo b/net/latd/distinfo
index 6e185985215..80fd45f1e52 100644
--- a/net/latd/distinfo
+++ b/net/latd/distinfo
@@ -1,12 +1,18 @@
-$NetBSD: distinfo,v 1.6 2010/02/11 22:04:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/11/25 22:14:17 joerg Exp $
 
 SHA1 (latd-1.18.tar.gz) = a7cecdb97507f485e726ea4c2fef0a59ad3adbae
 RMD160 (latd-1.18.tar.gz) = a0be3bd71b76c6a07c47fc2ad863526303d365bf
 Size (latd-1.18.tar.gz) = 233882 bytes
-SHA1 (patch-aa) = 70e2a543f471c9a818bfbe138137920d605d5aa9
-SHA1 (patch-ab) = 8729c74907ac9ea077e9ddf1131cc4af6ecedcc7
+SHA1 (patch-aa) = 418d4ba46aab3259af771673ccfde08274bee8af
+SHA1 (patch-ab) = 2576c94b699f15690ffeb2596a1d7d9292c67f9d
 SHA1 (patch-ac) = c078151ba47ef878937e9cf818a3d0ad6dd3be7b
-SHA1 (patch-ad) = f606a87bf3dff0571db3ededc6889e31f2012397
+SHA1 (patch-ad) = d453bf076aa8368313530718095b77cafe1b554e
 SHA1 (patch-ae) = 931842733d2166c0fd29b5f0d0772c44f1d79fd3
 SHA1 (patch-af) = 3b2f723ec163d925dee42b7d6597f8219ebe22df
-SHA1 (patch-ag) = 41718557b941aa6aab761f495202ae6c14582c87
+SHA1 (patch-ag) = 46a4d98c15bfef8a1fa6dab04b23be3fa1f4b42c
+SHA1 (patch-circuit.cc) = 4f20d6247bcc450d6462554c01e09a2ffa989719
+SHA1 (patch-connection.h) = 2762cebe59c9e3af1fa1bd9d96cf923ad563c22d
+SHA1 (patch-llogin.cc) = 37e81f5df945c956169c70ce4f35b77734bce8a0
+SHA1 (patch-server.cc) = b87ec43ad8ab2e340e23c6addfd1dd2c2eab77f3
+SHA1 (patch-serversession.cc) = 0ee915108d8cc19f78bbd719d4e25d96d5f6376a
+SHA1 (patch-session.cc) = 6c8d148d6b3146ad9b5729c1e8aeb3fc131c0bfb
diff --git a/net/latd/patches/patch-aa b/net/latd/patches/patch-aa
index 63b9f565c8e..47cdc209b65 100644
--- a/net/latd/patches/patch-aa
+++ b/net/latd/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/10/21 20:55:42 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/25 22:14:17 joerg Exp $
 
---- clientsession.cc.orig	2003-10-20 19:12:16.000000000 +0200
-+++ clientsession.cc	2003-10-20 19:12:36.000000000 +0200
-@@ -23,6 +23,7 @@
+--- clientsession.cc.orig	2003-04-04 11:48:32.000000000 +0000
++++ clientsession.cc
+@@ -23,6 +23,8 @@
  #include <string>
  #include <map>
  #include <strstream>
 +#include <assert.h>
++#include <cstring>
  
  #include "lat.h"
  #include "utils.h"
diff --git a/net/latd/patches/patch-ab b/net/latd/patches/patch-ab
index 56daf1647db..39fe7dfadce 100644
--- a/net/latd/patches/patch-ab
+++ b/net/latd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2006/03/14 02:38:16 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2011/11/25 22:14:17 joerg Exp $
 
 --- interfaces-bpf.cc.orig	2003-03-17 09:32:30.000000000 +0000
 +++ interfaces-bpf.cc
@@ -10,7 +10,16 @@ $NetBSD: patch-ab,v 1.2 2006/03/14 02:38:16 joerg Exp $
  #include <unistd.h>
  #include <stdio.h>
  #include <fcntl.h>
-@@ -383,7 +384,11 @@ int BPFInterfaces::send_packet(int ifn, 
+@@ -25,6 +26,8 @@
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include <net/if.h>
+ #include <net/bpf.h>
+@@ -383,7 +386,11 @@ int BPFInterfaces::send_packet(int ifn, 
    /* write this packet: */
    iov[0].iov_base = (char* )&ether_packet;
    iov[0].iov_len = sizeof(ether_packet);
diff --git a/net/latd/patches/patch-ad b/net/latd/patches/patch-ad
index 38171587274..4bc73355e5b 100644
--- a/net/latd/patches/patch-ad
+++ b/net/latd/patches/patch-ad
@@ -1,8 +1,29 @@
-$NetBSD: patch-ad,v 1.1 2003/10/21 20:55:42 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2011/11/25 22:14:17 joerg Exp $
 
---- latcp.cc.orig	2003-10-20 19:32:10.000000000 +0200
-+++ latcp.cc	2003-10-20 19:32:39.000000000 +0200
-@@ -773,10 +773,10 @@
+--- latcp.cc.orig	2003-04-08 13:08:34.000000000 +0000
++++ latcp.cc
+@@ -44,9 +44,10 @@
+ #include <queue>
+ #include <map>
+ #include <string>
+-#include <algo.h>
++#include <algorithm>
+ #include <iterator>
+ #include <string>
++#include <iostream>
+ #include <strstream>
+ 
+ #include "lat.h"
+@@ -54,6 +55,8 @@
+ #include "utils.h"
+ #include "dn_endian.h"
+ 
++using std::cout;
++
+ static int latcp_socket;
+ 
+ static void make_upper(char *str);
+@@ -773,10 +776,10 @@ void start_latd(int argc, char *argv[])
  	latd_bin = "/usr/sbin/latd";
  	latd_path = "/usr/sbin";
      }
diff --git a/net/latd/patches/patch-ag b/net/latd/patches/patch-ag
index 8cd7b25bbaf..5d2befe5751 100644
--- a/net/latd/patches/patch-ag
+++ b/net/latd/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.1 2007/01/27 10:33:25 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2011/11/25 22:14:17 joerg Exp $
 
 --- services.h.orig	2002-10-14 14:33:46.000000000 +0000
 +++ services.h
-@@ -71,7 +71,7 @@ class LATServices
+@@ -12,6 +12,8 @@
+     GNU General Public License for more details.
+ ******************************************************************************/
+ 
++#include <cstring>
++
+ class LATServices
+ {
+  public:
+@@ -71,7 +73,7 @@ class LATServices
        const std::string get_ident() { return ident; }
        bool         is_available();
        bool         remove_node(const std::string &node);
diff --git a/net/latd/patches/patch-circuit.cc b/net/latd/patches/patch-circuit.cc
new file mode 100644
index 00000000000..753b7eca0d3
--- /dev/null
+++ b/net/latd/patches/patch-circuit.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-circuit.cc,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- circuit.cc.orig	2011-11-25 19:19:21.000000000 +0000
++++ circuit.cc
+@@ -22,6 +22,7 @@
+ #include <map>
+ #include <queue>
+ #include <iterator>
++#include <cstring>
+ 
+ #include "lat.h"
+ #include "latcp.h"
diff --git a/net/latd/patches/patch-connection.h b/net/latd/patches/patch-connection.h
new file mode 100644
index 00000000000..80569377135
--- /dev/null
+++ b/net/latd/patches/patch-connection.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-connection.h,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- connection.h.orig	2011-11-25 19:19:54.000000000 +0000
++++ connection.h
+@@ -12,6 +12,7 @@
+     GNU General Public License for more details.
+ ******************************************************************************/
+ 
++#include <cstring>
+ 
+ class LATConnection
+ {
diff --git a/net/latd/patches/patch-llogin.cc b/net/latd/patches/patch-llogin.cc
new file mode 100644
index 00000000000..ca0e55b9668
--- /dev/null
+++ b/net/latd/patches/patch-llogin.cc
@@ -0,0 +1,19 @@
+$NetBSD: patch-llogin.cc,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- llogin.cc.orig	2011-11-25 19:18:49.000000000 +0000
++++ llogin.cc
+@@ -46,10 +46,13 @@
+ #include <queue>
+ #include <map>
+ #include <string>
+-#include <algo.h>
++#include <algorithm>
+ #include <iterator>
+ #include <string>
+ #include <strstream>
++#include <iostream>
++
++using namespace std;
+ 
+ #include "lat.h"
+ #include "latcp.h"
diff --git a/net/latd/patches/patch-server.cc b/net/latd/patches/patch-server.cc
new file mode 100644
index 00000000000..d497bf8f52b
--- /dev/null
+++ b/net/latd/patches/patch-server.cc
@@ -0,0 +1,30 @@
+$NetBSD: patch-server.cc,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- server.cc.orig	2011-11-25 19:21:32.000000000 +0000
++++ server.cc
+@@ -34,6 +34,7 @@
+ #include <ctype.h>
+ #include <regex.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <utmp.h>
+ #include <grp.h>
+ #include <signal.h>
+@@ -44,7 +45,7 @@
+ #include <queue>
+ #include <map>
+ #include <string>
+-#include <algo.h>
++#include <algorithm>
+ #include <iterator>
+ #include <strstream>
+ #include <iomanip>
+@@ -1740,7 +1741,7 @@ bool LATServer::show_characteristics(boo
+     }
+ 
+     // NUL-terminate it.
+-    output << std::endl << ends;
++    output << std::endl << std::ends;
+ 
+     return true;
+ }
diff --git a/net/latd/patches/patch-serversession.cc b/net/latd/patches/patch-serversession.cc
new file mode 100644
index 00000000000..731e0de2398
--- /dev/null
+++ b/net/latd/patches/patch-serversession.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-serversession.cc,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- serversession.cc.orig	2011-11-25 19:21:11.000000000 +0000
++++ serversession.cc
+@@ -17,6 +17,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/latd/patches/patch-session.cc b/net/latd/patches/patch-session.cc
new file mode 100644
index 00000000000..d5a398b1fe2
--- /dev/null
+++ b/net/latd/patches/patch-session.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-session.cc,v 1.1 2011/11/25 22:14:17 joerg Exp $
+
+--- session.cc.orig	2011-11-25 19:22:24.000000000 +0000
++++ session.cc
+@@ -32,6 +32,7 @@
+ #include <pwd.h>
+ #include <assert.h>
+ #include <termios.h>
++#include <limits.h>
+ 
+ #include <list>
+ #include <string>