[patch] Patch allowing net-analyzer/nepenthes to build against gcc 4.4

nepenthes-0.2.2-gcc44.patch (text/plain), 13.28 KB, created by Víctor Ostorga (RETIRED) on 2009-06-13 18:09:52 UTC

diff -NrU5 nepenthes-0.2.2.orig/modules/download-creceive/CReceiveDialogue.cpp nepenthes-0.2.2/modules/download-creceive/CReceiveDialogue.cpp
--- nepenthes-0.2.2.orig/modules/download-creceive/CReceiveDialogue.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/download-creceive/CReceiveDialogue.cpp	2009-06-13 15:44:07.000000000 -0600
@@ -51,10 +51,12 @@
 #include "DownloadUrl.cpp"
 #include "DownloadBuffer.cpp"
 
 #include "SubmitManager.hpp"
 
+#include <cstdio>
+
 #ifdef STDTAGS 
 #undef STDTAGS 
 #endif
 #define STDTAGS l_dl | l_dia | l_hlr
 
diff -NrU5 nepenthes-0.2.2.orig/modules/download-http/HTTPDialogue.cpp nepenthes-0.2.2/modules/download-http/HTTPDialogue.cpp
--- nepenthes-0.2.2.orig/modules/download-http/HTTPDialogue.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/download-http/HTTPDialogue.cpp	2009-06-13 15:44:52.000000000 -0600
@@ -27,10 +27,11 @@
 
  /* $Id: HTTPDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
 
 #include "HTTPDialogue.hpp"
 
+#include <cstdio>
 
 #include "Message.hpp"
 #include "Nepenthes.hpp"
 #include "LogManager.hpp"
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_connect_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_connect_trans.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_connect_trans.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_connect_trans.cpp	2009-06-13 15:34:15.000000000 -0600
@@ -29,10 +29,11 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <cstdio>
 
 #include "LogManager.hpp"
 #include "Message.hpp"
 #include "sch_generic_connect_trans.hpp"
 #include "Socket.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_createprocess.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_createprocess.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_createprocess.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_createprocess.cpp	2009-06-13 15:36:08.000000000 -0600
@@ -36,11 +36,11 @@
  *
  */
 
 /* $Id: sch_generic_createprocess.cpp 550 2006-05-04 10:25:35Z common $ */
 
-
+#include <cstdio>
 
 #include "sch_generic_createprocess.hpp"
 
 #include "Nepenthes.hpp"
 #include "Message.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_bind_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_bind_trans.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_bind_trans.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_bind_trans.cpp	2009-06-13 15:37:03.000000000 -0600
@@ -25,10 +25,12 @@
  *
  *******************************************************************************/
 
  /* $Id: sch_generic_link_bind_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
 
+#include <cstdio>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_trans.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_trans.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_trans.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_link_trans.cpp	2009-06-13 15:37:47.000000000 -0600
@@ -25,10 +25,11 @@
  *
  *******************************************************************************/
 
  /* $Id: sch_generic_link_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
 
+#include <cstdio>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_stuttgart.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_stuttgart.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_stuttgart.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_stuttgart.cpp	2009-06-13 15:39:10.000000000 -0600
@@ -24,11 +24,13 @@
  *             contact [e-mail]  
  *
  *******************************************************************************/
 
  /* $Id: sch_generic_link_trans.cpp 1664 2005-07-15 03:33:39Z common $ */
- 
+
+#include <cstdio>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_url.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_url.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_url.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_url.cpp	2009-06-13 15:40:23.000000000 -0600
@@ -36,11 +36,11 @@
  * wikipedia states bsd code can be relicensed on to gpl, but we got no information what has to be done
  * 
  *
  */
 
-
+#include <cstdio>
  
 #include "sch_generic_url.hpp"
 #include "LogManager.hpp"
 #include "Message.hpp"
 #include "DownloadManager.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_wuerzburg.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_wuerzburg.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_wuerzburg.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_wuerzburg.cpp	2009-06-13 15:41:02.000000000 -0600
@@ -25,10 +25,12 @@
  *
  *******************************************************************************/
 
  /* $Id: sch_generic_wuerzburg.cpp 2271 2006-01-14 20:31:52Z common $ */
 
+#include <cstdio>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_xor.cpp nepenthes-0.2.2/modules/shellcode-generic/sch_generic_xor.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_xor.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-generic/sch_generic_xor.cpp	2009-06-13 15:41:47.000000000 -0600
@@ -40,10 +40,12 @@
 
 
 
 #include "sch_generic_xor.hpp"
 
+#include <cstdio>
+
 #include "Nepenthes.hpp"
 #include "Message.hpp"
 #include "Message.cpp"
 #include "LogManager.hpp"
 #include "Utilities.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp	2009-06-13 15:42:56.000000000 -0600
@@ -25,10 +25,12 @@
  *
  *******************************************************************************/
 
 /* $Id: sch_namespace_bindfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */
 
+#include <cstdio>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
--- nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp	2009-06-13 15:42:24.000000000 -0600
@@ -25,10 +25,12 @@
  *
  *******************************************************************************/
 
 /* $Id: sch_namespace_connectbackfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */
 
+#include <cstdio>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFS.cpp nepenthes-0.2.2/modules/shellemu-winnt/VFS.cpp
--- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFS.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellemu-winnt/VFS.cpp	2009-06-13 15:45:28.000000000 -0600
@@ -20,10 +20,11 @@
  *
  *******************************************************************************/
 
 
 #include <ctype.h>
+#include <cstdio>
 
 #include "VFS.hpp"
 #include "VFSNode.hpp"
 #include "VFSDir.hpp"
 #include "VFSFile.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommand.hpp nepenthes-0.2.2/modules/shellemu-winnt/VFSCommand.hpp
--- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommand.hpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellemu-winnt/VFSCommand.hpp	2009-06-13 15:46:21.000000000 -0600
@@ -28,10 +28,11 @@
  /* $Id: VFSCommand.hpp 1927 2005-08-27 21:56:59Z dp $ */
 
 #ifndef HAVE_VFSCOMMANDECHO
 #define HAVE_VFSCOMMANDECHO
 
+#include <stdint.h>
 #include <list>
 #include <string>
 #include <vector>
 
 #include "VFSNode.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommandRCP.cpp nepenthes-0.2.2/modules/shellemu-winnt/VFSCommandRCP.cpp
--- nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommandRCP.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/shellemu-winnt/VFSCommandRCP.cpp	2009-06-13 15:46:53.000000000 -0600
@@ -24,11 +24,13 @@
  *             contact [e-mail]  
  *
  *******************************************************************************/
 
 /* $Id: VFSCommandRCP.cpp 550 2006-05-04 10:25:35Z common $ */
- 
+
+#include <cstdio>
+
 #include "VFSCommandRCP.hpp"
 #include "VFSNode.hpp"
 #include "VFSDir.hpp"
 #include "VFSFile.hpp"
 #include "Nepenthes.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/submit-file/submit-file.cpp nepenthes-0.2.2/modules/submit-file/submit-file.cpp
--- nepenthes-0.2.2.orig/modules/submit-file/submit-file.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/submit-file/submit-file.cpp	2009-06-13 15:43:26.000000000 -0600
@@ -28,10 +28,11 @@
  /* $Id: submit-file.cpp 550 2006-05-04 10:25:35Z common $ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include <cstdio>
 
 #include "submit-file.hpp"
 #include "Download.hpp"
 #include "DownloadBuffer.hpp"
 #include "Utilities.hpp"
diff -NrU5 nepenthes-0.2.2.orig/modules/submit-postgres/PGDownloadContext.cpp nepenthes-0.2.2/modules/submit-postgres/PGDownloadContext.cpp
--- nepenthes-0.2.2.orig/modules/submit-postgres/PGDownloadContext.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/modules/submit-postgres/PGDownloadContext.cpp	2009-06-13 16:33:01.000000000 -0600
@@ -25,10 +25,11 @@
  *
  *******************************************************************************/
 
 /* $Id: PGDownloadContext.cpp 688 2006-10-29 20:08:41Z common $ */
 
+#include <cstdio> 
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/DownloadManager.cpp nepenthes-0.2.2/nepenthes-core/src/DownloadManager.cpp
--- nepenthes-0.2.2.orig/nepenthes-core/src/DownloadManager.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/nepenthes-core/src/DownloadManager.cpp	2009-06-13 15:47:38.000000000 -0600
@@ -40,10 +40,12 @@
 #include "Config.hpp"
 
 #include "SubmitEvent.hpp"
 #include "EventManager.hpp"
 
+#include <cstdio>
+
 using namespace std;
 using namespace nepenthes;
 
 #ifdef STDTAGS 
 #undef STDTAGS 
diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/ModuleManager.cpp nepenthes-0.2.2/nepenthes-core/src/ModuleManager.cpp
--- nepenthes-0.2.2.orig/nepenthes-core/src/ModuleManager.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/nepenthes-core/src/ModuleManager.cpp	2009-06-13 15:48:19.000000000 -0600
@@ -33,10 +33,12 @@
 #include "Module.hpp"
 #include "Config.hpp"
 #include "Nepenthes.hpp"
 #include "LogManager.hpp"
 
+#include <cstdio>
+
 using namespace nepenthes;
 using namespace std;
 
 #ifdef STDTAGS 
 #undef STDTAGS 
diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/ShellcodeManager.cpp nepenthes-0.2.2/nepenthes-core/src/ShellcodeManager.cpp
--- nepenthes-0.2.2.orig/nepenthes-core/src/ShellcodeManager.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/nepenthes-core/src/ShellcodeManager.cpp	2009-06-13 16:00:35.000000000 -0600
@@ -33,10 +33,12 @@
 #include "LogManager.hpp"
 #include "Message.hpp"
 #include "SocketEvent.hpp"
 #include "EventManager.hpp"
 
+#include <cstdio>
+
 using namespace nepenthes;
 
 #ifdef STDTAGS 
 #undef STDTAGS 
 #endif
diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/Socket.cpp nepenthes-0.2.2/nepenthes-core/src/Socket.cpp
--- nepenthes-0.2.2.orig/nepenthes-core/src/Socket.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/nepenthes-core/src/Socket.cpp	2009-06-13 15:49:04.000000000 -0600
@@ -27,10 +27,11 @@
 
 /* $Id: Socket.cpp 699 2006-11-11 09:20:15Z common $ */
 
 #include <string>
 #include <sstream>
+#include <cstdio>
 
 #include <time.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff -NrU5 nepenthes-0.2.2.orig/nepenthes-core/src/Utilities.cpp nepenthes-0.2.2/nepenthes-core/src/Utilities.cpp
--- nepenthes-0.2.2.orig/nepenthes-core/src/Utilities.cpp	2009-06-13 15:32:10.000000000 -0600
+++ nepenthes-0.2.2/nepenthes-core/src/Utilities.cpp	2009-06-13 16:01:09.000000000 -0600
@@ -36,10 +36,12 @@
 #include <string.h>
 #include <sys/types.h>
 #include <inttypes.h>
 #include <ctype.h>
 
+#include <cstdio>
+
 #include "Utilities.hpp"
 #include "LogManager.hpp"
 #include "Config.hpp"
 
 using namespace nepenthes;