Fix build with modern GCC

11 files changed, 132 insertions, 1 deletions

diff --git a/www/dansguardian/distinfo b/www/dansguardian/distinfo
index 60695fb490d..5ae9799c531 100644
--- a/www/dansguardian/distinfo
+++ b/www/dansguardian/distinfo
@@ -1,9 +1,19 @@
-$NetBSD: distinfo,v 1.3 2010/03/29 19:38:54 sborrill Exp $
+$NetBSD: distinfo,v 1.4 2011/11/25 22:24:39 joerg Exp $
 
 SHA1 (dansguardian-2.8.0.6.source.tar.gz) = 6d82eed13536a64a2f6711fa221756fa0bfe19f0
 RMD160 (dansguardian-2.8.0.6.source.tar.gz) = cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3
 Size (dansguardian-2.8.0.6.source.tar.gz) = 212737 bytes
+SHA1 (patch-DataBuffer.cpp) = 7447cb436dffdda90192c5ac731add5224c26898
+SHA1 (patch-DynamicURLList.cpp) = a4a4472a1e387d850c64d3cfb9f75091bb8c4df6
+SHA1 (patch-FOptionContainer.cpp) = b86ee1542d9aace89192c8c41399dd38b7972d0f
+SHA1 (patch-FatController.cpp) = 1e3eb5d866f5ec5edda9f3e6e8e7a2b107e99d04
+SHA1 (patch-ListContainer.cpp) = e38034615e831c9dd45eb861f97a6c2cf381e631
+SHA1 (patch-RegExp.cpp) = a1b56dedd627afaaf00aac8285874b508db348d4
+SHA1 (patch-Socket.cpp) = f8c6f13266f33bb03ffac57ca4734708640b1c77
+SHA1 (patch-SysV.cpp) = bc173150d4663d90672298361589bfd8919d519b
+SHA1 (patch-UDSocket.cpp) = d047b546a9bee74ff8dbccfe66bf75f2e61738a5
 SHA1 (patch-aa) = c4af2622ee48dedb15f5a22874c1c1bff5ea51ef
+SHA1 (patch-dansguardian.cpp) = 93b34d9ca5ce371c178e68f0054088f177843407
 SHA1 (patch-fbsd.in) = c030c845e66225212052012e09d81f3b8817d97c
 SHA1 (patch-linux.in) = 2ea47d4f5c5787302cc983939ea2454df29da5ef
 SHA1 (patch-nbsd.in) = e1d4fa9d7a839b1458c0bacdea30f70112c67a75
diff --git a/www/dansguardian/patches/patch-DataBuffer.cpp b/www/dansguardian/patches/patch-DataBuffer.cpp
new file mode 100644
index 00000000000..c30d8bc005a
--- /dev/null
+++ b/www/dansguardian/patches/patch-DataBuffer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-DataBuffer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- DataBuffer.cpp.orig	2011-11-25 17:12:27.000000000 +0000
++++ DataBuffer.cpp
+@@ -22,6 +22,7 @@
+ #include <algorithm>
+ #include "DataBuffer.hpp"
+ #include <cstdlib>
++#include <cstring>
+ #include <unistd.h>
+ #include <zlib.h>
+ #include <cerrno>
diff --git a/www/dansguardian/patches/patch-DynamicURLList.cpp b/www/dansguardian/patches/patch-DynamicURLList.cpp
new file mode 100644
index 00000000000..c463f48f18e
--- /dev/null
+++ b/www/dansguardian/patches/patch-DynamicURLList.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-DynamicURLList.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- DynamicURLList.cpp.orig	2011-11-25 17:14:23.000000000 +0000
++++ DynamicURLList.cpp
+@@ -23,6 +23,7 @@
+ #include "OptionContainer.hpp"
+ #include <sys/stat.h>
+ #include <sys/time.h>
++#include <cstring>
+ 
+ extern OptionContainer o;
+ extern bool isDaemonised;
diff --git a/www/dansguardian/patches/patch-FOptionContainer.cpp b/www/dansguardian/patches/patch-FOptionContainer.cpp
new file mode 100644
index 00000000000..77907db9022
--- /dev/null
+++ b/www/dansguardian/patches/patch-FOptionContainer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-FOptionContainer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- FOptionContainer.cpp.orig	2011-11-25 17:14:40.000000000 +0000
++++ FOptionContainer.cpp
+@@ -22,6 +22,7 @@
+ #include "FOptionContainer.hpp"
+ #include "OptionContainer.hpp"
+ #include "RegExp.hpp"
++#include <cstdlib>
+ #include <string>
+ #include <iostream>
+ #include <fstream>
diff --git a/www/dansguardian/patches/patch-FatController.cpp b/www/dansguardian/patches/patch-FatController.cpp
new file mode 100644
index 00000000000..e8c8505824b
--- /dev/null
+++ b/www/dansguardian/patches/patch-FatController.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-FatController.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- FatController.cpp.orig	2011-11-25 17:13:02.000000000 +0000
++++ FatController.cpp
+@@ -44,6 +44,8 @@
+ #include <fstream>
+ #include <sys/time.h>
+ #include <sys/poll.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ #ifdef __GCCVER3
+     #include <istream>
diff --git a/www/dansguardian/patches/patch-ListContainer.cpp b/www/dansguardian/patches/patch-ListContainer.cpp
new file mode 100644
index 00000000000..1de56e9e992
--- /dev/null
+++ b/www/dansguardian/patches/patch-ListContainer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-ListContainer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- ListContainer.cpp.orig	2011-11-25 17:14:09.000000000 +0000
++++ ListContainer.cpp
+@@ -24,6 +24,7 @@
+ #include "RegExp.hpp"
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ #include <unistd.h>
+ #include "String.hpp"
+ #include <iostream>
diff --git a/www/dansguardian/patches/patch-RegExp.cpp b/www/dansguardian/patches/patch-RegExp.cpp
new file mode 100644
index 00000000000..2ea0cb26979
--- /dev/null
+++ b/www/dansguardian/patches/patch-RegExp.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-RegExp.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- RegExp.cpp.orig	2011-11-25 17:13:26.000000000 +0000
++++ RegExp.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "RegExp.hpp"
+ #include <iostream>
++#include <cstring>
+ 
+ RegExp::RegExp()
+ :imatched(false),wascompiled(false) {}
diff --git a/www/dansguardian/patches/patch-Socket.cpp b/www/dansguardian/patches/patch-Socket.cpp
new file mode 100644
index 00000000000..57373f17d13
--- /dev/null
+++ b/www/dansguardian/patches/patch-Socket.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-Socket.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- Socket.cpp.orig	2011-11-25 17:12:45.000000000 +0000
++++ Socket.cpp
+@@ -34,6 +34,7 @@
+ #include <pwd.h>
+ #include <cerrno>
+ #include <unistd.h>
++#include <cstring>
+ #include <string>
+ #include <stdexcept>
+ 
diff --git a/www/dansguardian/patches/patch-SysV.cpp b/www/dansguardian/patches/patch-SysV.cpp
new file mode 100644
index 00000000000..d1f61cde8c5
--- /dev/null
+++ b/www/dansguardian/patches/patch-SysV.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-SysV.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- SysV.cpp.orig	2011-11-25 17:13:55.000000000 +0000
++++ SysV.cpp
+@@ -20,6 +20,7 @@
+ #include <cstdio>
+ #include <unistd.h>
+ #include <cstdlib>
++#include <cstring>
+ #include <fcntl.h>
+ #include <csignal>
+ #include "SysV.hpp"
diff --git a/www/dansguardian/patches/patch-UDSocket.cpp b/www/dansguardian/patches/patch-UDSocket.cpp
new file mode 100644
index 00000000000..07311a3b0db
--- /dev/null
+++ b/www/dansguardian/patches/patch-UDSocket.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-UDSocket.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- UDSocket.cpp.orig	2011-11-25 17:13:40.000000000 +0000
++++ UDSocket.cpp
+@@ -21,6 +21,7 @@
+ #include <syslog.h>
+ #include "UDSocket.hpp"
+ #include <csignal>
++#include <cstring>
+ #ifdef __BSD
+ 	#include <sys/wait.h>
+ #else
diff --git a/www/dansguardian/patches/patch-dansguardian.cpp b/www/dansguardian/patches/patch-dansguardian.cpp
new file mode 100644
index 00000000000..41d5fd614e6
--- /dev/null
+++ b/www/dansguardian/patches/patch-dansguardian.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-dansguardian.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $
+
+--- dansguardian.cpp.orig	2011-11-25 17:15:02.000000000 +0000
++++ dansguardian.cpp
+@@ -24,6 +24,7 @@
+ #include <iostream>
+ #include <arpa/inet.h>
+ #include <cstdio>
++#include <cstdlib>
+ #include <string>
+ #include <unistd.h>
+ #include <cerrno>