Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Aug 2014 20:50:54 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366675 - in head/net/nepenthes: . files
Message-ID:  <201408302050.s7UKosBS052660@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Aug 30 20:50:54 2014
New Revision: 366675
URL: http://svnweb.freebsd.org/changeset/ports/366675
QAT: https://qat.redports.org/buildarchive/r366675/

Log:
  Stage net/nepenthese and unbreak on FreeBSD 10+
  
  PR:		193042
  Submitted by:	Ports Fury

Added:
  head/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-mssql__MSSQLDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-mydoom__vuln-mydoom.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-netbiosname__SMBNameDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-netdde__NETDDEDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-optix__vuln-optix.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-pnp__vuln-pnp.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-sasserftpd__SasserFTPDialogue.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-sub7__vuln-sub7.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__vuln-wins__vuln-wins.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__x-5__x-5.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__x-6__x-6.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-modules__x-9__x-9.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__include__Config.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__include__EventHandler.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__include__Nepenthes.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__include__SocketManager.hpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__DNSManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__DNSResult.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__Download.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__DownloadBuffer.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__DownloadManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__DownloadUrl.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__EventManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__FileLogger.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__LogManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__ModuleManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__Nepenthes.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__RingFileLogger.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__ShellcodeManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__Socket.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__SocketManager.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__TCPSocket.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__UDPSocket.cpp   (contents, props changed)
  head/net/nepenthes/files/patch-nepenthes-core__src__Utilities.cpp   (contents, props changed)
  head/net/nepenthes/pkg-deinstall   (contents, props changed)
  head/net/nepenthes/pkg-install   (contents, props changed)
Modified:
  head/net/nepenthes/Makefile
  head/net/nepenthes/files/patch-Makefile.in
  head/net/nepenthes/pkg-descr
  head/net/nepenthes/pkg-plist

Modified: head/net/nepenthes/Makefile
==============================================================================
--- head/net/nepenthes/Makefile	Sat Aug 30 20:42:53 2014	(r366674)
+++ head/net/nepenthes/Makefile	Sat Aug 30 20:50:54 2014	(r366675)
@@ -10,37 +10,44 @@ MASTER_SITES=	SF/${PORTNAME}/Nepenthes%2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Determine the malware activity on a network
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libmagic.so:${PORTSDIR}/sysutils/file \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libadns.so:${PORTSDIR}/dns/adns
-
-.if defined(WITH_PRELUDE)
-LIB_DEPENDS+=		libprelude.so:${PORTSDIR}/security/libprelude
-CONFIGURE_ARGS+=	--enable-prelude
-.endif
-
-.if defined(WITH_DEBUG_LOGGING)
-CONFIGURE_ARGS+=	--enable-debug-logging
-.endif
-
-USES=		perl5
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libadns.so:${PORTSDIR}/dns/adns \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libmagic.so:${PORTSDIR}/sysutils/file
+
+USES=		dos2unix libtool perl5
+DOS2UNIX_FILE=	modules/shellcode-generic/sch_generic_connect_trans.cpp
+USE_GCC=	any
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var
+INSTALL_TARGET=	install-strip
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFINE=		DEBUG_LOGGING PRELUDE 
 
-DOCS=	README README.VFS logo-shaded.svg
-MAN8=	nepenthes.8
+DEBUG_LOGGING_CONFIGURE_ENABLE=	debug-logging
+PRELUDE_LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
+PRELUDE_CONFIGURE_ENABLE=	prelude
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 \
-	${REINPLACE_CMD} -e 's,-Werror,,'
-	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' \
-		${WRKSRC}/modules/download-curl/download-curl.hpp \
-		${WRKSRC}/modules/submit-http/HTTPSession.hpp \
-		${WRKSRC}/modules/submit-http/HTTPSession.cpp \
-		${WRKSRC}/modules/submit-http/submit-http.hpp \
-		${WRKSRC}/modules/submit-mwserv/TransferSession.hpp \
-		${WRKSRC}/modules/submit-mwserv/submit-mwserv.hpp \
-		${WRKSRC}/modules/submit-norman/submit-norman.hpp
+		${REINPLACE_CMD} -e \
+		's|-Werror|| ; \
+		 s|-D.*_GNU_SOURCE||'
+	@${FIND} ${WRKSRC}/modules -name "*.[ch]pp" -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e \
+		'/<curl\/types.h>/d'
+	@${REINPLACE_CMD} -e \
+		's|-I/usr/local/include|| ; \
+		 s|-I/usr/src/contrib/file/|| ; \
+		 s|-L/usr/local/lib|| ; \
+		 s|-R/usr/local/lib||' ${WRKSRC}/configure
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/signatures
+	(cd ${WRKSRC}/modules/shellcode-signatures && ${INSTALL_DATA} \
+		shellcode-signatures.sc ${STAGEDIR}${DATADIR}/signatures)
 
 .include <bsd.port.mk>

Modified: head/net/nepenthes/files/patch-Makefile.in
==============================================================================
--- head/net/nepenthes/files/patch-Makefile.in	Sat Aug 30 20:42:53 2014	(r366674)
+++ head/net/nepenthes/files/patch-Makefile.in	Sat Aug 30 20:50:54 2014	(r366675)
@@ -1,6 +1,6 @@
 --- Makefile.in.orig    Sun Jan 14 13:34:14 2007
 +++ Makefile.in Sun Jan 14 13:34:40 2007
-@@ -188,7 +188,7 @@
+@@ -191,7 +191,7 @@
  build_vendor = @build_vendor@
  datadir = @datadir@
  datarootdir = @datarootdir@
@@ -9,13 +9,34 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -219,7 +219,7 @@
- SUBDIRS = nepenthes-core modules
+@@ -222,7 +222,7 @@
+ SUBDIRS = nepenthes-core modules 
  #tools
  EXTRA_DIST = configure.ac CHANGES doc/README.VFS doc/logo-shaded.svg doc/nepenthes.8 conf/nepenthes.conf.dist
 -doc_DATA = doc/README.VFS doc/logo-shaded.svg
 +doc_DATA = README doc/README.VFS doc/logo-shaded.svg
-
+ 
  #sysconf_DATA = conf/nepenthes.conf.dist
  AM_CXXFLAGS = ''
-
+@@ -714,21 +714,6 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL_DATA) $(srcdir)/doc/nepenthes.8 $(DESTDIR)$(mandir)/man8/nepenthes.8;
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/cache
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/cache/nepenthes
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/cache/nepenthes/pcap
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/cache/nepenthes/signatures
+-
+-	$(INSTALL_DATA) modules/shellcode-signatures/shellcode-signatures.sc $(DESTDIR)$(localstatedir)/cache/nepenthes/signatures
+-
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/spool
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/spool/nepenthes
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/spool/nepenthes/gotek
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/spool/nepenthes/submitpostgres
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/pcap
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/binaries
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/hexdumps
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Added: head/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/dnsresolve-adns/dnsresolve-adns.cpp.orig
++++ modules/dnsresolve-adns/dnsresolve-adns.cpp
+@@ -28,7 +28,8 @@
+  /* $Id: dnsresolve-adns.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
+ #include <sys/poll.h>
+-#include <errno.h>
++#include <cstdlib>
++#include <cerrno>
+ 
+ 
+ #include "dnsresolve-adns.hpp"

Added: head/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/download-creceive/CReceiveDialogue.cpp.orig
++++ modules/download-creceive/CReceiveDialogue.cpp
+@@ -27,6 +27,8 @@
+ 
+  /* $Id: CReceiveDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
++#include <cstdio>
++
+ #include "CReceiveDialogue.hpp"
+ 
+ #include "SocketManager.hpp"

Added: head/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,13 @@
+--- modules/download-csend/CSendDialogue.cpp.orig
++++ modules/download-csend/CSendDialogue.cpp
+@@ -27,7 +27,10 @@
+ 
+  /* $Id: CSendDialogue.cpp 2271 2006-01-14 20:31:52Z common $ */
+  
++#include <cstdlib>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ 
+ #include "CSendDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/download-ftp/download-ftp.cpp.orig
++++ modules/download-ftp/download-ftp.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: download-ftp.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cstdlib>
++#include <cctype>
+ 
+ #include "download-ftp.hpp"
+ #include "CTRLDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,13 @@
+--- modules/download-http/HTTPDialogue.cpp.orig
++++ modules/download-http/HTTPDialogue.cpp
+@@ -27,6 +27,10 @@
+ 
+  /* $Id: HTTPDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
++
+ #include "HTTPDialogue.hpp"
+ 
+ 

Added: head/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,17 @@
+--- modules/download-rcp/RCPDialogue.cpp.orig
++++ modules/download-rcp/RCPDialogue.cpp
+@@ -27,9 +27,13 @@
+ 
+  /* $Id: RCPDialogue.cpp 1410 2007-10-12 13:07:23Z common $ */
+  
++#include <cstdlib>
++#include <cstring>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+-#include <ctype.h>
++#include <cctype>
+ 
+ #include "RCPDialogue.hpp"
+ 

Added: head/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,13 @@
+--- modules/download-tftp/TFTPDialogue.cpp.orig
++++ modules/download-tftp/TFTPDialogue.cpp
+@@ -27,7 +27,10 @@
+ 
+  /* $Id: TFTPDialogue.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <arpa/tftp.h>
+ #include <netinet/in.h>
+ 

Added: head/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,14 @@
+--- modules/log-prelude/log-prelude.cpp.orig
++++ modules/log-prelude/log-prelude.cpp
+@@ -27,7 +27,11 @@
+ 
+  /* $Id: log-prelude.cpp 1278 2007-05-29 16:04:00Z yoann $ */
+ 
++#include <cstdlib>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #include "log-prelude.hpp"
+ #include "Nepenthes.hpp"
+ #include "LogManager.hpp"

Added: head/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/log-surfnet/log-surfnet.cpp.orig
++++ modules/log-surfnet/log-surfnet.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $Id: log-surfnet.cpp 932 2007-02-21 14:16:50Z common $ */
+ 
++#include <cstdlib>
+ #include <sstream>
+ #include <sys/types.h>
+ #include <sys/socket.h>

Added: head/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,19 @@
+--- modules/module-honeytrap/PCAPSocket.cpp.orig
++++ modules/module-honeytrap/PCAPSocket.cpp
+@@ -28,12 +28,14 @@
+ /* $Id: PCAPSocket.cpp 697 2006-11-11 09:17:19Z common $ */
+ 
+ #include <unistd.h>
+-#include <time.h>
++#include <cstdlib>
++#include <cstring>
++#include <ctime>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <errno.h>
++#include <cerrno>
+ 
+ #include "LogManager.hpp"
+ #include "PCAPSocket.hpp"

Added: head/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,14 @@
+--- modules/module-peiros/PeirosParser.cpp.orig
++++ modules/module-peiros/PeirosParser.cpp
+@@ -18,8 +18,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#include <ctype.h>
+-#include <stdio.h>
++#include <cctype>
++#include <cstdio>
++#include <cstdlib>
+ #include "PeirosParser.hpp"
+ #include "Nepenthes.hpp"
+ #include "LogManager.hpp"

Added: head/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/module-portwatch/module-portwatch.cpp.orig
++++ modules/module-portwatch/module-portwatch.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: module-portwatch.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "module-portwatch.hpp"
+ #include "WatchDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_cmd.cpp.orig
++++ modules/shellcode-generic/sch_generic_cmd.cpp
+@@ -30,6 +30,8 @@
+ 
+ 
+ 
++#include <cstring>
++
+ #include "sch_generic_cmd.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-generic/sch_generic_connect_trans.cpp.orig
++++ modules/shellcode-generic/sch_generic_connect_trans.cpp
+@@ -27,6 +27,7 @@
+ 
+  /* $Id: sch_generic_connect_trans.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/shellcode-generic/sch_generic_createprocess.cpp.orig
++++ modules/shellcode-generic/sch_generic_createprocess.cpp
+@@ -40,6 +40,9 @@
+ 
+ 
+ 
++#include <cstdio>
++#include <cstring>
++
+ #include "sch_generic_createprocess.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-generic/sch_generic_konstanz_xor.cpp.orig
++++ modules/shellcode-generic/sch_generic_konstanz_xor.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $Id: sch_generic_konstanz_xor.cpp 2215 2005-12-23 16:54:36Z common $ */ 
+ 
++#include <cstring>
+ #include "sch_generic_konstanz_xor.hpp"
+ #include "Nepenthes.hpp"
+ #include "Message.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_leimbach_url_xor.cpp.orig
++++ modules/shellcode-generic/sch_generic_leimbach_url_xor.cpp
+@@ -27,6 +27,8 @@
+ 
+  /* $Id: sch_generic_leimbach_url_xor.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
++#include <cstring>
++
+ #include "sch_generic_xor.hpp"
+ #include "sch_generic_leimbach_url_xor.hpp"
+ 

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_link_bind_trans.cpp.orig
++++ modules/shellcode-generic/sch_generic_link_bind_trans.cpp
+@@ -27,6 +27,8 @@
+ 
+  /* $Id: sch_generic_link_bind_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
+ 
++#include <cstdio>
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_link_trans.cpp.orig
++++ modules/shellcode-generic/sch_generic_link_trans.cpp
+@@ -28,6 +28,8 @@
+  /* $Id: sch_generic_link_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
+ 
+ 
++#include <cstdio>
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-generic/sch_generic_linkxor.cpp.orig
++++ modules/shellcode-generic/sch_generic_linkxor.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $Id: sch_generic_linkxor.cpp 2215 2005-12-23 16:54:36Z common $ */ 
+ 
++#include <cstring>
+ #include "sch_generic_linkxor.hpp"
+ #include "Nepenthes.hpp"
+ #include "Message.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_stuttgart.cpp.orig
++++ modules/shellcode-generic/sch_generic_stuttgart.cpp
+@@ -27,6 +27,8 @@
+ 
+  /* $Id: sch_generic_link_trans.cpp 1664 2005-07-15 03:33:39Z common $ */
+  
++#include <cstdio>
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/shellcode-generic/sch_generic_unicode.cpp.orig
++++ modules/shellcode-generic/sch_generic_unicode.cpp
+@@ -28,6 +28,9 @@
+ /* $Id: sch_generic_unicode.cpp 2245 2006-01-06 16:46:44Z common $ */
+ 
+ 
++#include <cstdlib>
++#include <cstring>
++
+ #include "sch_generic_unicode.hpp"
+ #include "LogManager.hpp"
+ #include "Message.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-generic/sch_generic_url.cpp.orig
++++ modules/shellcode-generic/sch_generic_url.cpp
+@@ -40,6 +40,7 @@
+ 
+ 
+  
++#include <cstdio>
+ #include "sch_generic_url.hpp"
+ #include "LogManager.hpp"
+ #include "Message.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_winexec.cpp.orig
++++ modules/shellcode-generic/sch_generic_winexec.cpp
+@@ -29,6 +29,8 @@
+ 
+ 
+ 
++#include <cstring>
++
+ #include "sch_generic_winexec.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_wuerzburg.cpp.orig
++++ modules/shellcode-generic/sch_generic_wuerzburg.cpp
+@@ -27,6 +27,8 @@
+ 
+  /* $Id: sch_generic_wuerzburg.cpp 2271 2006-01-14 20:31:52Z common $ */
+ 
++#include <cstdio>
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>

Added: head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-generic/sch_generic_xor.cpp.orig
++++ modules/shellcode-generic/sch_generic_xor.cpp
+@@ -40,6 +40,8 @@
+ 
+ 
+ 
++#include <cstdio>
++
+ #include "sch_generic_xor.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-signatures/sch_engine_unicode.cpp.orig
++++ modules/shellcode-signatures/sch_engine_unicode.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $Id: sch_engine_unicode.cpp 443 2006-03-27 19:55:16Z common $ */
+ 
++#include <cstring>
+ #include <stdint.h>
+ 
+ #include "sch_engine_unicode.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_alphanumericxor.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_alphanumericxor.cpp
+@@ -28,6 +28,8 @@
+ /* $Id: sch_namespace_alphanumericxor.cpp 520 2006-04-18 23:18:17Z common $ */
+ 
+ 
++#include <cstring>
++
+ #include "sch_namespace_alphanumericxor.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_base64.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_base64.cpp
+@@ -27,6 +27,8 @@
+ 
+ /* $Id: sch_namespace_base64.cpp 693 2006-11-02 19:35:43Z common $ */
+ 
++#include <cstring>
++
+ #include "sch_namespace_base64.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $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>

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
+@@ -27,6 +27,7 @@
+ 
+ /* $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>

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_execute.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_execute.cpp
+@@ -27,6 +27,8 @@
+ 
+ /* $Id: sch_namespace_execute.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
++#include <cstring>
++
+ #include "sch_namespace_execute.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_konstanzxor.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_konstanzxor.cpp
+@@ -27,6 +27,8 @@
+ 
+ /* $Id: sch_namespace_konstanzxor.cpp 499 2006-04-08 18:40:14Z common $ */
+ 
++#include <cstring>
++
+ #include "sch_namespace_konstanzxor.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_linkxor.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_linkxor.cpp
+@@ -28,6 +28,8 @@
+ /* $Id: sch_namespace_linkxor.cpp 654 2006-09-27 12:01:16Z common $ */
+ 
+ 
++#include <cstring>
++
+ #include "sch_namespace_linkxor.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellcode-signatures/sch_namespace_xor.cpp.orig
++++ modules/shellcode-signatures/sch_namespace_xor.cpp
+@@ -28,6 +28,8 @@
+ /* $Id: sch_namespace_xor.cpp 499 2006-04-08 18:40:14Z common $ */
+ 
+ 
++#include <cstring>
++
+ #include "sch_namespace_xor.hpp"
+ 
+ #include "Nepenthes.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,13 @@
+--- modules/shellemu-winnt/VFS.cpp.orig
++++ modules/shellemu-winnt/VFS.cpp
+@@ -21,7 +21,9 @@
+  *******************************************************************************/
+ 
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdio>
++#include <cstring>
+ 
+ #include "VFS.hpp"
+ #include "VFSNode.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/shellemu-winnt/VFSCommand.hpp.orig
++++ modules/shellemu-winnt/VFSCommand.hpp
+@@ -33,6 +33,7 @@
+ #include <list>
+ #include <string>
+ #include <vector>
++#include <inttypes.h>
+ 
+ #include "VFSNode.hpp"
+ 

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellemu-winnt/VFSCommandCMD.cpp.orig
++++ modules/shellemu-winnt/VFSCommandCMD.cpp
+@@ -27,6 +27,8 @@
+ 
+ /* $Id: VFSCommandCMD.cpp 1956 2005-09-10 15:32:08Z common $ */
+  
++#include <cstring>
++
+ #include "VFSCommandCMD.hpp"
+ #include "VFSNode.hpp"
+ #include "VFSDir.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/shellemu-winnt/VFSCommandFTP.cpp.orig
++++ modules/shellemu-winnt/VFSCommandFTP.cpp
+@@ -27,7 +27,8 @@
+ 
+ /* $Id: VFSCommandFTP.cpp 1410 2007-10-12 13:07:23Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+  
+ #include "VFSCommandFTP.hpp"
+ #include "VFSNode.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellemu-winnt/VFSCommandRCP.cpp.orig
++++ modules/shellemu-winnt/VFSCommandRCP.cpp
+@@ -27,6 +27,8 @@
+ 
+ /* $Id: VFSCommandRCP.cpp 550 2006-05-04 10:25:35Z common $ */
+  
++#include <cstdio>
++#include <cstring>
+ #include "VFSCommandRCP.hpp"
+ #include "VFSNode.hpp"
+ #include "VFSDir.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/shellemu-winnt/VFSDir.cpp.orig
++++ modules/shellemu-winnt/VFSDir.cpp
+@@ -28,6 +28,8 @@
+ /* $Id: VFSDir.cpp 1947 2005-09-08 17:30:06Z common $ */
+ 
+ 
++#include <cstring>
++
+ #include "VFSDir.hpp"
+ #include "VFSFile.hpp"
+ #include "LogManager.hpp"

Added: head/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/shellemu-winnt/WinNTShellDialogue.cpp.orig
++++ modules/shellemu-winnt/WinNTShellDialogue.cpp
+@@ -28,7 +28,8 @@
+ /* $Id: WinNTShellDialogue.cpp 2221 2005-12-23 17:01:33Z common $ */ 
+ 
+ //#include <arpa/inet.h>
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ #include <string>
+ 
+ #include "WinNTShellDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,15 @@
+--- modules/submit-file/submit-file.cpp.orig
++++ modules/submit-file/submit-file.cpp
+@@ -26,10 +26,11 @@
+  *******************************************************************************/
+ 
+  /* $Id: submit-file.cpp 550 2006-05-04 10:25:35Z common $ */
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <errno.h>
++#include <cerrno>
+ 
+ #include "submit-file.hpp"
+ #include "Download.hpp"

Added: head/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,26 @@
+--- modules/submit-gotek/submit-gotek.cpp.orig
++++ modules/submit-gotek/submit-gotek.cpp
+@@ -26,16 +26,18 @@
+  *******************************************************************************/
+ 
+  /* $Id: submit-gotek.cpp 550 2006-05-04 10:25:35Z common $ */
++#include <cstdlib>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <errno.h>
++#include <cerrno>
+ #include <arpa/inet.h>
+-#include <time.h>
++#include <netinet/in.h>
++#include <ctime>
+ #include <dirent.h>
+-#include <string.h>
+-#include <errno.h>
+-#include <assert.h>
++#include <cstring>
++#include <cerrno>
++#include <cassert>
+ 
+ #include "submit-gotek.hpp"
+ #include "gotekCTRLDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,13 @@
+--- modules/submit-http/HTTPSession.cpp.orig
++++ modules/submit-http/HTTPSession.cpp
+@@ -31,6 +31,10 @@
+ #include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */
+ #include <sstream>
++#include <cstring>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ 
+ #include "HTTPSession.hpp"

Added: head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/submit-norman/submit-norman.cpp.orig
++++ modules/submit-norman/submit-norman.cpp
+@@ -28,6 +28,8 @@
+  /* $Id: submit-norman.cpp 674 2006-10-23 01:31:53Z common $ */
+ 
+ 
++#include <cstdlib>
++
+ #include "submit-norman.hpp"
+ #include "Download.hpp"
+ #include "DownloadUrl.hpp"

Added: head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,11 @@
+--- modules/submit-norman/submit-norman.hpp.orig
++++ modules/submit-norman/submit-norman.hpp
+@@ -28,6 +28,8 @@
+  /* $Id: submit-norman.hpp 674 2006-10-23 01:31:53Z common $ */
+ 
+ 
++#include <cstring>
++
+ #include <curl/curl.h>
+ #include <curl/types.h> /* new for v7 */
+ #include <curl/easy.h> /* new for v7 */

Added: head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,17 @@
+--- modules/submit-postgres/PGDownloadContext.cpp.orig
++++ modules/submit-postgres/PGDownloadContext.cpp
+@@ -38,9 +38,11 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-#include <time.h>
+-#include <errno.h>
+-#include <string.h>
++#include <cstdio>
++#include <cstdlib>
++#include <ctime>
++#include <cerrno>
++#include <cstring>
+ 
+ #include <sstream>
+ #include <map>

Added: head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,10 @@
+--- modules/submit-postgres/PGDownloadContext.hpp.orig
++++ modules/submit-postgres/PGDownloadContext.hpp
+@@ -30,6 +30,7 @@
+ #ifndef HAVE_PGDOWNLOADCONTEXT_HPP
+ #define HAVE_PGDOWNLOADCONTEXT_HPP
+ 
++#include <cstring>
+ #include <string>
+ #include <stdint.h>
+ 

Added: head/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-asn1/IISDialogue.cpp.orig
++++ modules/vuln-asn1/IISDialogue.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: IISDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+ 
+ #include "IISDialogue.hpp"
+ 

Added: head/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-asn1/SMBDialogue.cpp.orig
++++ modules/vuln-asn1/SMBDialogue.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: SMBDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+ 
+ #include "SMBDialogue.hpp"
+ #include "asn1-shellcodes.h"

Added: head/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-bagle/vuln-bagle.cpp.orig
++++ modules/vuln-bagle/vuln-bagle.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-bagle.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-bagle.hpp"
+ #include "BagleDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-dameware/vuln-dameware.cpp.orig
++++ modules/vuln-dameware/vuln-dameware.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-dameware.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-dameware.hpp"
+ #include "DWDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-dcom/vuln-dcom.cpp.orig
++++ modules/vuln-dcom/vuln-dcom.cpp
+@@ -28,7 +28,8 @@
+  /* $Id: vuln-dcom.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-dcom.hpp"
+ 

Added: head/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-iis/vuln-iis.cpp.orig
++++ modules/vuln-iis/vuln-iis.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-iis.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-iis.hpp"
+ #include "IISDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-kuang2/vuln-kuang2.cpp.orig
++++ modules/vuln-kuang2/vuln-kuang2.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-kuang2.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-kuang2.hpp"
+ #include "Kuang2Dialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-lsass/vuln-lsass.cpp.orig
++++ modules/vuln-lsass/vuln-lsass.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-lsass.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-lsass.hpp"
+ #include "LSASSDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-msdtc/vuln-msdtc.cpp.orig
++++ modules/vuln-msdtc/vuln-msdtc.cpp
+@@ -27,7 +27,8 @@
+ 
+  /* $Id: vuln-msdtc.cpp 550 2006-05-04 10:25:35Z common $ */
+ 
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+ 
+ #include "vuln-msdtc.hpp"
+ #include "MSDTCDialogue.hpp"

Added: head/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp	Sat Aug 30 20:50:54 2014	(r366675)
@@ -0,0 +1,12 @@
+--- modules/vuln-msmq/vuln-msmq.cpp.orig

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408302050.s7UKosBS052660>