aboutsummaryrefslogtreecommitdiff
path: root/net/nepenthes
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-08-30 20:50:54 +0000
committerJohn Marino <marino@FreeBSD.org>2014-08-30 20:50:54 +0000
commit6a49fa15faf4b5dd4ac2b774dc22c7cf11a025e5 (patch)
tree6b4625d794440c4ed65a5648a91d4c227e0c30bf /net/nepenthes
parent888c623201c643c2d2eda79e01e9b1eee72975cc (diff)
downloadports-6a49fa15faf4b5dd4ac2b774dc22c7cf11a025e5.tar.gz
ports-6a49fa15faf4b5dd4ac2b774dc22c7cf11a025e5.zip
Stage net/nepenthese and unbreak on FreeBSD 10+
PR: 193042 Submitted by: Ports Fury
Notes
Notes: svn path=/head/; revision=366675
Diffstat (limited to 'net/nepenthes')
-rw-r--r--net/nepenthes/Makefile59
-rw-r--r--net/nepenthes/files/patch-Makefile.in31
-rw-r--r--net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp17
-rw-r--r--net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp14
-rw-r--r--net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp19
-rw-r--r--net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp14
-rw-r--r--net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp10
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__submit-file__submit-file.cpp15
-rw-r--r--net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp26
-rw-r--r--net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp11
-rw-r--r--net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp11
-rw-r--r--net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp17
-rw-r--r--net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp10
-rw-r--r--net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-mssql__MSSQLDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-mydoom__vuln-mydoom.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-netbiosname__SMBNameDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-netdde__NETDDEDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-optix__vuln-optix.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-pnp__vuln-pnp.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-sasserftpd__SasserFTPDialogue.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-sub7__vuln-sub7.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__vuln-wins__vuln-wins.cpp12
-rw-r--r--net/nepenthes/files/patch-modules__x-5__x-5.cpp10
-rw-r--r--net/nepenthes/files/patch-modules__x-6__x-6.cpp13
-rw-r--r--net/nepenthes/files/patch-modules__x-9__x-9.cpp12
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__include__Config.hpp18
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__include__EventHandler.hpp11
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__include__Nepenthes.hpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__include__SocketManager.hpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__DNSManager.cpp12
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__DNSResult.cpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__Download.cpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__DownloadBuffer.cpp14
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__DownloadManager.cpp12
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__DownloadUrl.cpp11
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__EventManager.cpp11
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__FileLogger.cpp23
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__LogManager.cpp17
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__ModuleManager.cpp11
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__Nepenthes.cpp25
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__RingFileLogger.cpp26
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__ShellcodeManager.cpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__Socket.cpp17
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__SocketManager.cpp12
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__TCPSocket.cpp10
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__UDPSocket.cpp12
-rw-r--r--net/nepenthes/files/patch-nepenthes-core__src__Utilities.cpp17
-rw-r--r--net/nepenthes/pkg-deinstall46
-rw-r--r--net/nepenthes/pkg-descr10
-rw-r--r--net/nepenthes/pkg-install46
-rw-r--r--net/nepenthes/pkg-plist150
99 files changed, 1366 insertions, 139 deletions
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 105e1c88d1f7..ecd458d12b6c 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -10,37 +10,44 @@ MASTER_SITES= SF/${PORTNAME}/Nepenthes%20development/${PORTVERSION}
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
+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
-.if defined(WITH_DEBUG_LOGGING)
-CONFIGURE_ARGS+= --enable-debug-logging
-.endif
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-USES= perl5
-GNU_CONFIGURE= yes
+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>
diff --git a/net/nepenthes/files/patch-Makefile.in b/net/nepenthes/files/patch-Makefile.in
index 5447a6fff143..4e582c1124de 100644
--- a/net/nepenthes/files/patch-Makefile.in
+++ b/net/nepenthes/files/patch-Makefile.in
@@ -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:
diff --git a/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp b/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp
new file mode 100644
index 000000000000..89dde0d44a1d
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__dnsresolve-adns__dnsresolve-adns.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp b/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp
new file mode 100644
index 000000000000..37e1fe57bad8
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-creceive__CReceiveDialogue.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp b/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp
new file mode 100644
index 000000000000..2c3d2fd825a0
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-csend__CSendDialogue.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp b/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp
new file mode 100644
index 000000000000..c7833ab63012
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-ftp__download-ftp.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp b/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp
new file mode 100644
index 000000000000..78b298b8ada7
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-http__HTTPDialogue.cpp
@@ -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"
+
+
diff --git a/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp b/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp
new file mode 100644
index 000000000000..5d28e72f9e93
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-rcp__RCPDialogue.cpp
@@ -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"
+
diff --git a/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp b/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp
new file mode 100644
index 000000000000..db973183c01d
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__download-tftp__TFTPDialogue.cpp
@@ -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>
+
diff --git a/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp b/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp
new file mode 100644
index 000000000000..626545edd2e4
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__log-prelude__log-prelude.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp b/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp
new file mode 100644
index 000000000000..f77ca82de5e5
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__log-surfnet__log-surfnet.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp b/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp
new file mode 100644
index 000000000000..88e6ccba9723
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__module-honeytrap__PCAPSocket.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp b/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp
new file mode 100644
index 000000000000..3b00a8f98485
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__module-perios__PeirosParser.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp b/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp
new file mode 100644
index 000000000000..65e08a2b4402
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__module-portwatch__module-portwatch.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp
new file mode 100644
index 000000000000..537671383dd9
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_cmd.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp
new file mode 100644
index 000000000000..d98255cb5d6c
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_connect_trans.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp
new file mode 100644
index 000000000000..78cb288357cd
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_createprocess.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp
new file mode 100644
index 000000000000..7a0c7c958cc5
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_konstanz_xor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp
new file mode 100644
index 000000000000..c54f71d5fecc
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_leimbach_url_xor.cpp
@@ -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"
+
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp
new file mode 100644
index 000000000000..43cc1e887726
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_bind_trans.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp
new file mode 100644
index 000000000000..1969d2cd9f32
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_link_trans.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp
new file mode 100644
index 000000000000..c9d7c84b1026
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_linkxor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp
new file mode 100644
index 000000000000..82ff23de5598
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_stuttgart.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp
new file mode 100644
index 000000000000..e0466a1dca8b
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_unicode.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp
new file mode 100644
index 000000000000..1349dd084821
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_url.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp
new file mode 100644
index 000000000000..1da95dab12d5
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_winexec.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp
new file mode 100644
index 000000000000..f003afabcd5e
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_wuerzburg.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp
new file mode 100644
index 000000000000..f7b927899197
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-generic__sch_generic_xor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp
new file mode 100644
index 000000000000..fef92d0f65ff
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_engine_unicode.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp
new file mode 100644
index 000000000000..3c9c825f1b7e
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_alphanumericxor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp
new file mode 100644
index 000000000000..3b89e902db5d
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_base64.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp
new file mode 100644
index 000000000000..aaf151c15f59
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_bindfiletransfer.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp
new file mode 100644
index 000000000000..6894a5f37ad2
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_connectbackfiletransfer.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp
new file mode 100644
index 000000000000..28b331c3a25e
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_execute.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp
new file mode 100644
index 000000000000..63a381af33e1
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_konstanzxor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp
new file mode 100644
index 000000000000..3cbbfcba6f74
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_linkxor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp
new file mode 100644
index 000000000000..60a10a9d8812
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellcode-signatures__sch_namespace_xor.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp
new file mode 100644
index 000000000000..519b41bcc726
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFS.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp
new file mode 100644
index 000000000000..d4c3a05aeea2
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommand.hpp
@@ -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"
+
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp
new file mode 100644
index 000000000000..72eeb52c2673
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandCMD.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp
new file mode 100644
index 000000000000..8ab27fe09431
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandFTP.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp
new file mode 100644
index 000000000000..0826a82adbad
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSCommandRCP.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp
new file mode 100644
index 000000000000..a020a8dfe01d
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__VFSDir.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp b/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp
new file mode 100644
index 000000000000..96f072298f8c
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__shellemu-winnt__WinNTShellDialogue.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp b/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp
new file mode 100644
index 000000000000..e1a45c4d476f
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-file__submit-file.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp b/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp
new file mode 100644
index 000000000000..3fd6819e072f
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-gotek__submit-gotek.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp b/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp
new file mode 100644
index 000000000000..ef8546b13eb5
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-http__HTTPSession.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp b/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp
new file mode 100644
index 000000000000..cbda16384ef9
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-norman__submit-norman.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp b/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp
new file mode 100644
index 000000000000..c20dd07991f4
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-norman__submit-norman.hpp
@@ -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 */
diff --git a/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp b/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp
new file mode 100644
index 000000000000..66e4ac1f94b8
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.cpp
@@ -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>
diff --git a/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp b/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp
new file mode 100644
index 000000000000..db6806e8b75e
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__submit-postgres__PGDownloadContext.hpp
@@ -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>
+
diff --git a/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp
new file mode 100644
index 000000000000..a23f4c6f4376
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-asn1__IISDialogue.cpp
@@ -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"
+
diff --git a/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp
new file mode 100644
index 000000000000..dfd990e116fb
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-asn1__SMBDialogue.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp b/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp
new file mode 100644
index 000000000000..13f2add914f8
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-bagle__vuln-bagle.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp b/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp
new file mode 100644
index 000000000000..9093e1e573d2
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-dameware__vuln-dameware.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp b/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp
new file mode 100644
index 000000000000..1b618495caba
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-dcom__vuln-dcom.cpp
@@ -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"
+
diff --git a/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp b/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp
new file mode 100644
index 000000000000..9facd3f4d3f0
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-iis__vuln-iis.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp b/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp
new file mode 100644
index 000000000000..8bc201e9e2e5
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-kuang2__vuln-kuang2.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp b/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp
new file mode 100644
index 000000000000..98448da1b3de
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-lsass__vuln-lsass.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp b/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp
new file mode 100644
index 000000000000..e08dfb762d83
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-msdtc__vuln-msdtc.cpp
@@ -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"
diff --git a/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp b/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp
new file mode 100644
index 000000000000..37be805e93cf
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-msmq__vuln-msmq.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-msmq/vuln-msmq.cpp.orig
++++ modules/vuln-msmq/vuln-msmq.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: vuln-msmq.cpp 550 2006-05-04 10:25:35Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-msmq.hpp"
+ #include "MSMQDialogue.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-mssql__MSSQLDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-mssql__MSSQLDialogue.cpp
new file mode 100644
index 000000000000..82993389c4ef
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-mssql__MSSQLDialogue.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-mssql/MSSQLDialogue.cpp.orig
++++ modules/vuln-mssql/MSSQLDialogue.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: MSSQLDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ #include "MSSQLDialogue.hpp"
+ #include "vuln-mssql.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-mydoom__vuln-mydoom.cpp b/net/nepenthes/files/patch-modules__vuln-mydoom__vuln-mydoom.cpp
new file mode 100644
index 000000000000..92bc2d3c94c0
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-mydoom__vuln-mydoom.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-mydoom/vuln-mydoom.cpp.orig
++++ modules/vuln-mydoom/vuln-mydoom.cpp
+@@ -29,7 +29,8 @@
+
+
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-mydoom.hpp"
+ #include "MydoomDialogue.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-netbiosname__SMBNameDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-netbiosname__SMBNameDialogue.cpp
new file mode 100644
index 000000000000..4491cd297fb6
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-netbiosname__SMBNameDialogue.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-netbiosname/SMBNameDialogue.cpp.orig
++++ modules/vuln-netbiosname/SMBNameDialogue.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: SMBNameDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ #include "SMBNameDialogue.hpp"
+ #include "vuln-netbiosname.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-netdde__NETDDEDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-netdde__NETDDEDialogue.cpp
new file mode 100644
index 000000000000..7ca029a47cc0
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-netdde__NETDDEDialogue.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-netdde/NETDDEDialogue.cpp.orig
++++ modules/vuln-netdde/NETDDEDialogue.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: NETDDEDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ #include "NETDDEDialogue.hpp"
+ #include "vuln-netdde.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-optix__vuln-optix.cpp b/net/nepenthes/files/patch-modules__vuln-optix__vuln-optix.cpp
new file mode 100644
index 000000000000..6ac4a437c54a
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-optix__vuln-optix.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-optix/vuln-optix.cpp.orig
++++ modules/vuln-optix/vuln-optix.cpp
+@@ -29,7 +29,8 @@
+
+
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-optix.hpp"
+ #include "OPTIXShellDialogue.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-pnp__vuln-pnp.cpp b/net/nepenthes/files/patch-modules__vuln-pnp__vuln-pnp.cpp
new file mode 100644
index 000000000000..1583a2c6c5c7
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-pnp__vuln-pnp.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-pnp/vuln-pnp.cpp.orig
++++ modules/vuln-pnp/vuln-pnp.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: vuln-pnp.cpp 550 2006-05-04 10:25:35Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-pnp.hpp"
+ #include "PNPDialogue.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-sasserftpd__SasserFTPDialogue.cpp b/net/nepenthes/files/patch-modules__vuln-sasserftpd__SasserFTPDialogue.cpp
new file mode 100644
index 000000000000..e02f0e29b412
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-sasserftpd__SasserFTPDialogue.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-sasserftpd/SasserFTPDDialogue.cpp.orig
++++ modules/vuln-sasserftpd/SasserFTPDDialogue.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: SasserFTPDDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ #include "SasserFTPDDialogue.hpp"
+ #include "vuln-sasserftpd.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-sub7__vuln-sub7.cpp b/net/nepenthes/files/patch-modules__vuln-sub7__vuln-sub7.cpp
new file mode 100644
index 000000000000..59c6c128c443
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-sub7__vuln-sub7.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-sub7/vuln-sub7.cpp.orig
++++ modules/vuln-sub7/vuln-sub7.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: vuln-sub7.cpp 550 2006-05-04 10:25:35Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-sub7.hpp"
+ #include "SUB7Dialogue.hpp"
diff --git a/net/nepenthes/files/patch-modules__vuln-wins__vuln-wins.cpp b/net/nepenthes/files/patch-modules__vuln-wins__vuln-wins.cpp
new file mode 100644
index 000000000000..74a5788fff31
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__vuln-wins__vuln-wins.cpp
@@ -0,0 +1,12 @@
+--- modules/vuln-wins/vuln-wins.cpp.orig
++++ modules/vuln-wins/vuln-wins.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: vuln-wins.cpp 550 2006-05-04 10:25:35Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
+
+ #include "vuln-wins.hpp"
+
diff --git a/net/nepenthes/files/patch-modules__x-5__x-5.cpp b/net/nepenthes/files/patch-modules__x-5__x-5.cpp
new file mode 100644
index 000000000000..e737a5ac161e
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__x-5__x-5.cpp
@@ -0,0 +1,10 @@
+--- modules/x-5/x-5.cpp.orig
++++ modules/x-5/x-5.cpp
+@@ -27,6 +27,7 @@
+
+ /* $Id: x-5.cpp 1410 2007-10-12 13:07:23Z common $ */
+
++#include <cstdlib>
+ #include "x-5.hpp"
+ #include "LogManager.hpp"
+ #include "EventManager.hpp"
diff --git a/net/nepenthes/files/patch-modules__x-6__x-6.cpp b/net/nepenthes/files/patch-modules__x-6__x-6.cpp
new file mode 100644
index 000000000000..673a785b8d1c
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__x-6__x-6.cpp
@@ -0,0 +1,13 @@
+--- modules/x-6/x-6.cpp.orig
++++ modules/x-6/x-6.cpp
+@@ -27,7 +27,9 @@
+
+ /* $Id: x-6.cpp 343 2006-02-20 17:11:57Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstdlib>
++#include <cstring>
+
+ #include "x-6.hpp"
+
diff --git a/net/nepenthes/files/patch-modules__x-9__x-9.cpp b/net/nepenthes/files/patch-modules__x-9__x-9.cpp
new file mode 100644
index 000000000000..2a9f6f04dbb4
--- /dev/null
+++ b/net/nepenthes/files/patch-modules__x-9__x-9.cpp
@@ -0,0 +1,12 @@
+--- modules/x-9/x-9.cpp.orig
++++ modules/x-9/x-9.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: x-9.cpp 658 2006-10-08 15:04:17Z common $ */
+
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ #include "x-9.hpp"
+
diff --git a/net/nepenthes/files/patch-nepenthes-core__include__Config.hpp b/net/nepenthes/files/patch-nepenthes-core__include__Config.hpp
new file mode 100644
index 000000000000..b9953b85f5eb
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__include__Config.hpp
@@ -0,0 +1,18 @@
+--- nepenthes-core/include/Config.hpp.orig
++++ nepenthes-core/include/Config.hpp
+@@ -44,12 +44,14 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ // errno()
+-#include <errno.h>
++#include <cerrno>
+ // open()
+ #include <fcntl.h>
+
+ #include <stdint.h>
+
++#include <cstring>
++
+ #endif
+
+ using namespace std;
diff --git a/net/nepenthes/files/patch-nepenthes-core__include__EventHandler.hpp b/net/nepenthes/files/patch-nepenthes-core__include__EventHandler.hpp
new file mode 100644
index 000000000000..ddb973837431
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__include__EventHandler.hpp
@@ -0,0 +1,11 @@
+--- nepenthes-core/include/EventHandler.hpp.orig
++++ nepenthes-core/include/EventHandler.hpp
+@@ -44,6 +44,8 @@
+ #ifdef WIN32
+ #include <time.h>
+ #include <sys/timeb.h>
++#else
++#include <ctime>
+ #endif
+
+ //#include "Event.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__include__Nepenthes.hpp b/net/nepenthes/files/patch-nepenthes-core__include__Nepenthes.hpp
new file mode 100644
index 000000000000..9936ac1f40a6
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__include__Nepenthes.hpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/include/Nepenthes.hpp.orig
++++ nepenthes-core/include/Nepenthes.hpp
+@@ -40,6 +40,7 @@
+
+ #include <stdint.h>
+ #include <string>
++#include <sys/types.h>
+
+ typedef unsigned char byte;
+
diff --git a/net/nepenthes/files/patch-nepenthes-core__include__SocketManager.hpp b/net/nepenthes/files/patch-nepenthes-core__include__SocketManager.hpp
new file mode 100644
index 000000000000..14d933dd13a9
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__include__SocketManager.hpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/include/SocketManager.hpp.orig
++++ nepenthes-core/include/SocketManager.hpp
+@@ -32,6 +32,7 @@
+
+ #include <list>
+ #include <stdint.h>
++#include <ctime>
+
+ #include "Manager.hpp"
+
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__DNSManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__DNSManager.cpp
new file mode 100644
index 000000000000..2442b78d996f
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__DNSManager.cpp
@@ -0,0 +1,12 @@
+--- nepenthes-core/src/DNSManager.cpp.orig
++++ nepenthes-core/src/DNSManager.cpp
+@@ -33,7 +33,8 @@
+ #include <poll.h>
+ #endif
+
+-#include <errno.h>
++#include <cstring>
++#include <cerrno>
+ #include "DNSManager.hpp"
+ #include "DNSCallback.hpp"
+ #include "DNSResult.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__DNSResult.cpp b/net/nepenthes/files/patch-nepenthes-core__src__DNSResult.cpp
new file mode 100644
index 000000000000..e712f856cc06
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__DNSResult.cpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/src/DNSResult.cpp.orig
++++ nepenthes-core/src/DNSResult.cpp
+@@ -27,6 +27,7 @@
+
+ /* $Id: DNSResult.cpp 836 2007-02-06 15:16:50Z common $ */
+
++#include <cstring>
+ #include "DNSResult.hpp"
+ #include "Nepenthes.hpp"
+ #include "LogManager.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__Download.cpp b/net/nepenthes/files/patch-nepenthes-core__src__Download.cpp
new file mode 100644
index 000000000000..64c5293e3cc8
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__Download.cpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/src/Download.cpp.orig
++++ nepenthes-core/src/Download.cpp
+@@ -27,6 +27,7 @@
+
+ /* $Id: Download.cpp 2099 2005-10-23 22:12:52Z common $ */
+
++#include <cstring>
+ #include "Download.hpp"
+ #include "DownloadUrl.hpp"
+ #include "DownloadBuffer.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__DownloadBuffer.cpp b/net/nepenthes/files/patch-nepenthes-core__src__DownloadBuffer.cpp
new file mode 100644
index 000000000000..777fb2cbf7d2
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__DownloadBuffer.cpp
@@ -0,0 +1,14 @@
+--- nepenthes-core/src/DownloadBuffer.cpp.orig
++++ nepenthes-core/src/DownloadBuffer.cpp
+@@ -26,8 +26,9 @@
+ *******************************************************************************/
+
+
+-#include <stdlib.h>
+-#include <errno.h>
++#include <cstdlib>
++#include <cstring>
++#include <cerrno>
+
+ #include "DownloadBuffer.hpp"
+ #include "Nepenthes.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__DownloadManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__DownloadManager.cpp
new file mode 100644
index 000000000000..890ae4fe67ea
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__DownloadManager.cpp
@@ -0,0 +1,12 @@
+--- nepenthes-core/src/DownloadManager.cpp.orig
++++ nepenthes-core/src/DownloadManager.cpp
+@@ -27,6 +27,9 @@
+
+ /* $Id: DownloadManager.cpp 1548 2008-02-14 11:18:18Z common $ */
+
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include <sys/param.h>
+
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__DownloadUrl.cpp b/net/nepenthes/files/patch-nepenthes-core__src__DownloadUrl.cpp
new file mode 100644
index 000000000000..c16709688633
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__DownloadUrl.cpp
@@ -0,0 +1,11 @@
+--- nepenthes-core/src/DownloadUrl.cpp.orig
++++ nepenthes-core/src/DownloadUrl.cpp
+@@ -26,6 +26,8 @@
+ *******************************************************************************/
+ /* $id */
+
++#include <cstdlib>
++
+ #ifdef WIN32
+
+ #else
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__EventManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__EventManager.cpp
new file mode 100644
index 000000000000..666b6f4bba33
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__EventManager.cpp
@@ -0,0 +1,11 @@
+--- nepenthes-core/src/EventManager.cpp.orig
++++ nepenthes-core/src/EventManager.cpp
+@@ -27,6 +27,8 @@
+
+ /* $Id: EventManager.cpp 1410 2007-10-12 13:07:23Z common $ */
+
++#include <cstdlib>
++
+ #include "EventManager.hpp"
+ #include "EventHandler.hpp"
+ #include "Nepenthes.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__FileLogger.cpp b/net/nepenthes/files/patch-nepenthes-core__src__FileLogger.cpp
new file mode 100644
index 000000000000..668f08717725
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__FileLogger.cpp
@@ -0,0 +1,23 @@
+--- nepenthes-core/src/FileLogger.cpp.orig
++++ nepenthes-core/src/FileLogger.cpp
+@@ -27,15 +27,17 @@
+
+ /* $Id: FileLogger.cpp 697 2006-11-11 09:17:19Z common $ */
+
+-#include <time.h>
++#include <ctime>
+
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <errno.h>
++#include <cerrno>
+ #include <pwd.h>
+ #include <grp.h>
+ #include "FileLogger.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__LogManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__LogManager.cpp
new file mode 100644
index 000000000000..495adbdd6114
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__LogManager.cpp
@@ -0,0 +1,17 @@
+--- nepenthes-core/src/LogManager.cpp.orig
++++ nepenthes-core/src/LogManager.cpp
+@@ -27,9 +27,11 @@
+
+ /* $Id: LogManager.cpp 836 2007-02-06 15:16:50Z common $ */
+
+-#include <stdarg.h>
+-#include <assert.h>
+-#include <stdio.h>
++#include <cstdarg>
++#include <cassert>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include "LogManager.hpp"
+ #include "LogHandlerEntry.hpp"
+ #include "LogHandler.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__ModuleManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__ModuleManager.cpp
new file mode 100644
index 000000000000..7a37cae91914
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__ModuleManager.cpp
@@ -0,0 +1,11 @@
+--- nepenthes-core/src/ModuleManager.cpp.orig
++++ nepenthes-core/src/ModuleManager.cpp
+@@ -27,6 +27,8 @@
+
+ /* $Id: ModuleManager.cpp 612 2006-08-10 15:31:56Z common $ */
+
++#include <cstdio>
++#include <cstdlib>
+ #include <dlfcn.h>
+
+ #include "ModuleManager.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__Nepenthes.cpp b/net/nepenthes/files/patch-nepenthes-core__src__Nepenthes.cpp
new file mode 100644
index 000000000000..980fbb98c669
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__Nepenthes.cpp
@@ -0,0 +1,25 @@
+--- nepenthes-core/src/Nepenthes.cpp.orig
++++ nepenthes-core/src/Nepenthes.cpp
+@@ -35,16 +35,17 @@
+ #include <getopt.h>
+ #endif /* WIN32 */
+
+-#include <stdio.h>
+-#include <signal.h>
++#include <cstdio>
++#include <cstdlib>
++#include <csignal>
+ #include <sys/types.h>
+ #include <pwd.h>
+ #include <grp.h>
+ #include <dirent.h>
+ #include <sys/utsname.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <string.h>
++#include <cctype>
++#include <cerrno>
++#include <cstring>
+
+ #ifdef HAVE_LIBCAP
+ #undef _POSIX_SOURCE
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__RingFileLogger.cpp b/net/nepenthes/files/patch-nepenthes-core__src__RingFileLogger.cpp
new file mode 100644
index 000000000000..497f4c5fd6fe
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__RingFileLogger.cpp
@@ -0,0 +1,26 @@
+--- nepenthes-core/src/RingFileLogger.cpp.orig
++++ nepenthes-core/src/RingFileLogger.cpp
+@@ -27,18 +27,16 @@
+
+ /* $Id: RingFileLogger.cpp 697 2006-11-11 09:17:19Z common $ */
+
+-#include <time.h>
++#include <ctime>
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+-#include <errno.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-#include <errno.h>
++#include <cerrno>
+ #include <pwd.h>
+ #include <grp.h>
+
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__ShellcodeManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__ShellcodeManager.cpp
new file mode 100644
index 000000000000..81272ed91624
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__ShellcodeManager.cpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/src/ShellcodeManager.cpp.orig
++++ nepenthes-core/src/ShellcodeManager.cpp
+@@ -27,6 +27,7 @@
+
+ /* $Id: ShellcodeManager.cpp 505 2006-04-09 16:39:36Z oxff $ */
+
++#include <cstdio>
+ #include "ShellcodeManager.hpp"
+ #include "ShellcodeHandler.hpp"
+ #include "Nepenthes.hpp"
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__Socket.cpp b/net/nepenthes/files/patch-nepenthes-core__src__Socket.cpp
new file mode 100644
index 000000000000..241ce62389d1
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__Socket.cpp
@@ -0,0 +1,17 @@
+--- nepenthes-core/src/Socket.cpp.orig
++++ nepenthes-core/src/Socket.cpp
+@@ -27,10 +27,13 @@
+
+ /* $Id: Socket.cpp 699 2006-11-11 09:20:15Z common $ */
+
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include <sstream>
+
+-#include <time.h>
++#include <ctime>
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__SocketManager.cpp b/net/nepenthes/files/patch-nepenthes-core__src__SocketManager.cpp
new file mode 100644
index 000000000000..4798b2a47233
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__SocketManager.cpp
@@ -0,0 +1,12 @@
+--- nepenthes-core/src/SocketManager.cpp.orig
++++ nepenthes-core/src/SocketManager.cpp
+@@ -36,7 +36,8 @@
+ #include <poll.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <errno.h>
++#include <cstdlib>
++#include <cerrno>
+ #include <netinet/in.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__TCPSocket.cpp b/net/nepenthes/files/patch-nepenthes-core__src__TCPSocket.cpp
new file mode 100644
index 000000000000..e2314fe8ddef
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__TCPSocket.cpp
@@ -0,0 +1,10 @@
+--- nepenthes-core/src/TCPSocket.cpp.orig
++++ nepenthes-core/src/TCPSocket.cpp
+@@ -29,6 +29,7 @@
+
+ #include "config.h"
+
++#include <cstring>
+ #include <sys/types.h>
+
+ #ifdef WIN32
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__UDPSocket.cpp b/net/nepenthes/files/patch-nepenthes-core__src__UDPSocket.cpp
new file mode 100644
index 000000000000..3c06b37e37bc
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__UDPSocket.cpp
@@ -0,0 +1,12 @@
+--- nepenthes-core/src/UDPSocket.cpp.orig
++++ nepenthes-core/src/UDPSocket.cpp
+@@ -27,7 +27,8 @@
+
+ /* $Id: UDPSocket.cpp 1410 2007-10-12 13:07:23Z common $ */
+
+-#include <errno.h>
++#include <cstring>
++#include <cerrno>
+ #include <sys/types.h>
+
+ #ifdef WIN32
diff --git a/net/nepenthes/files/patch-nepenthes-core__src__Utilities.cpp b/net/nepenthes/files/patch-nepenthes-core__src__Utilities.cpp
new file mode 100644
index 000000000000..36440d0b91cf
--- /dev/null
+++ b/net/nepenthes/files/patch-nepenthes-core__src__Utilities.cpp
@@ -0,0 +1,17 @@
+--- nepenthes-core/src/Utilities.cpp.orig
++++ nepenthes-core/src/Utilities.cpp
+@@ -33,10 +33,12 @@
+ #endif
+
+
+-#include <string.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include <sys/types.h>
+ #include <inttypes.h>
+-#include <ctype.h>
++#include <cctype>
+
+ #include "Utilities.hpp"
+ #include "LogManager.hpp"
diff --git a/net/nepenthes/pkg-deinstall b/net/nepenthes/pkg-deinstall
new file mode 100644
index 000000000000..671f2981d6f0
--- /dev/null
+++ b/net/nepenthes/pkg-deinstall
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+if [ "$2" != "DEINSTALL" ]; then
+ exit 0
+fi
+
+if cmp -s ${PKG_PREFIX}/share/nepenthes/signatures/shellcode-signatures.sc \
+ /var/cache/nepenthes/signatures/shellcode-signatures.sc; then
+ rm -f /var/cache/nepenthes/signatures/shellcode-signatures.sc
+fi
+
+if [ -d /var/spool/nepenthes/submitpostgres ]; then
+ rmdir /var/spool/nepenthes/submitpostgres 2>/dev/null || true
+fi
+
+if [ -d /var/spool/nepenthes/gotek ]; then
+ rmdir /var/spool/nepenthes/gotek 2>/dev/null || true
+fi
+
+if [ -d /var/spool/nepenthes ]; then
+ rmdir /var/spool/nepenthes 2>/dev/null || true
+fi
+
+if [ -d /var/log/pcap ]; then
+ rmdir /var/log/pcap 2>/dev/null || true
+fi
+
+if [ -d /var/hexdumps ]; then
+ rmdir /var/hexdumps 2>/dev/null || true
+fi
+
+if [ -d /var/cache/nepenthes/signatures ]; then
+ rmdir /var/cache/nepenthes/signatures 2>/dev/null || true
+fi
+
+if [ -d /var/cache/nepenthes/pcap ]; then
+ rmdir /var/cache/nepenthes/pcap 2>/dev/null || true
+fi
+
+if [ -d /var/cache/nepenthes ]; then
+ rmdir /var/cache/nepenthes 2>/dev/null || true
+fi
+
+if [ -d /var/binaries ]; then
+ rmdir /var/binaries 2>/dev/null || true
+fi
diff --git a/net/nepenthes/pkg-descr b/net/nepenthes/pkg-descr
index c61e4670e0c6..ca9344c7924e 100644
--- a/net/nepenthes/pkg-descr
+++ b/net/nepenthes/pkg-descr
@@ -1,6 +1,6 @@
-Nepenthes can determine the malware activity on a network
-by deploying a nepenthes sensor (i.e. honey pot). The programm
-emulates different well known vulnerabilities waiting for
-malicious connections trying to exploit them.
+Nepenthes can determine the malware activity on a network by deploying
+a nepenthes sensor (i.e. honey pot). The programm emulates different
+well known vulnerabilities waiting for malicious connections trying to
+exploit them.
-WWW: http://nepenthes.sourceforge.net/
+WWW: http://nepenthes.carnivore.it/
diff --git a/net/nepenthes/pkg-install b/net/nepenthes/pkg-install
new file mode 100644
index 000000000000..c62009d06b67
--- /dev/null
+++ b/net/nepenthes/pkg-install
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then
+ exit 0
+fi
+
+if [ ! -d /var/binaries ]; then
+ install -d /var/binaries
+fi
+
+if [ ! -d /var/cache/nepenthes ]; then
+ install -d /var/cache/nepenthes
+fi
+
+if [ ! -d /var/cache/nepenthes/pcap ]; then
+ install -d /var/cache/nepenthes/pcap
+fi
+
+if [ ! -d /var/cache/nepenthes/signatures ]; then
+ install -d /var/cache/nepenthes/signatures
+fi
+
+if [ ! -d /var/hexdumps ]; then
+ install -d /var/hexdumps
+fi
+
+if [ ! -d /var/log/pcap ]; then
+ install -d /var/log/pcap
+fi
+
+if [ ! -d /var/binaries ]; then
+ install -d /var/spool/nepenthes
+fi
+
+if [ ! -d /var/binaries ]; then
+ install -d /var/spool/nepenthes/gotek
+fi
+
+if [ ! -d /var/binaries ]; then
+ install -d /var/spool/nepenthes/submitpostgres
+fi
+
+if [ ! -f /var/cache/nepenthes/signatures/shellcode-signatures.sc ]; then
+ install -c ${PKG_PREFIX}/share/nepenthes/signatures/shellcode-signatures.sc \
+ /var/cache/nepenthes/signatures
+fi
diff --git a/net/nepenthes/pkg-plist b/net/nepenthes/pkg-plist
index 1863abaa58fa..223f7fef224d 100644
--- a/net/nepenthes/pkg-plist
+++ b/net/nepenthes/pkg-plist
@@ -1,226 +1,170 @@
bin/nepenthes
-etc/nepenthes/download-csend.conf
-etc/nepenthes/download-curl.conf
-etc/nepenthes/download-ftp.conf
-etc/nepenthes/download-link.conf
-etc/nepenthes/download-tftp.conf
-etc/nepenthes/log-download.conf
-etc/nepenthes/log-irc.conf
-etc/nepenthes/log-prelude.conf
-etc/nepenthes/log-surfnet.conf
-etc/nepenthes/module-honeytrap.conf
-etc/nepenthes/module-portwatch.conf
-etc/nepenthes/nepenthes.conf
-etc/nepenthes/nepenthes.conf.dist
-etc/nepenthes/shellcode-generic.conf
-etc/nepenthes/submit-file.conf
-etc/nepenthes/submit-gotek.conf
-etc/nepenthes/submit-http.conf
-etc/nepenthes/submit-mwserv.conf
-etc/nepenthes/submit-postgres.conf
-etc/nepenthes/submit-norman.conf
-etc/nepenthes/vuln-asn1.conf
-etc/nepenthes/vuln-bagle.conf
-etc/nepenthes/vuln-dameware.conf
-etc/nepenthes/vuln-dcom.conf
-etc/nepenthes/vuln-ftpd.conf
-etc/nepenthes/vuln-iis.conf
-etc/nepenthes/vuln-kuang2.conf
-etc/nepenthes/vuln-lsass.conf
-etc/nepenthes/vuln-msdtc.conf
-etc/nepenthes/vuln-msmq.conf
-etc/nepenthes/vuln-mssql.conf
-etc/nepenthes/vuln-mydoom.conf
-etc/nepenthes/vuln-netbiosname.conf
-etc/nepenthes/vuln-netdde.conf
-etc/nepenthes/vuln-optix.conf
-etc/nepenthes/vuln-pnp.conf
-etc/nepenthes/vuln-sasserftpd.conf
-etc/nepenthes/vuln-sub7.conf
-etc/nepenthes/vuln-upnp.conf
-etc/nepenthes/vuln-veritas.conf
-etc/nepenthes/vuln-wins.conf
-etc/nepenthes/x-2.conf
+%%ETCDIR%%/download-csend.conf
+%%ETCDIR%%/download-curl.conf
+%%ETCDIR%%/download-ftp.conf
+%%ETCDIR%%/download-link.conf
+%%ETCDIR%%/download-tftp.conf
+%%ETCDIR%%/log-download.conf
+%%ETCDIR%%/log-irc.conf
+%%ETCDIR%%/log-prelude.conf
+%%ETCDIR%%/log-surfnet.conf
+%%ETCDIR%%/module-honeytrap.conf
+%%ETCDIR%%/module-portwatch.conf
+%%ETCDIR%%/nepenthes.conf
+%%ETCDIR%%/nepenthes.conf.dist
+%%ETCDIR%%/shellcode-generic.conf
+%%ETCDIR%%/submit-file.conf
+%%ETCDIR%%/submit-gotek.conf
+%%ETCDIR%%/submit-http.conf
+%%ETCDIR%%/submit-mwserv.conf
+%%ETCDIR%%/submit-norman.conf
+%%ETCDIR%%/submit-postgres.conf
+%%ETCDIR%%/vuln-asn1.conf
+%%ETCDIR%%/vuln-bagle.conf
+%%ETCDIR%%/vuln-dameware.conf
+%%ETCDIR%%/vuln-dcom.conf
+%%ETCDIR%%/vuln-ftpd.conf
+%%ETCDIR%%/vuln-iis.conf
+%%ETCDIR%%/vuln-kuang2.conf
+%%ETCDIR%%/vuln-lsass.conf
+%%ETCDIR%%/vuln-msdtc.conf
+%%ETCDIR%%/vuln-msmq.conf
+%%ETCDIR%%/vuln-mssql.conf
+%%ETCDIR%%/vuln-mydoom.conf
+%%ETCDIR%%/vuln-netbiosname.conf
+%%ETCDIR%%/vuln-netdde.conf
+%%ETCDIR%%/vuln-optix.conf
+%%ETCDIR%%/vuln-pnp.conf
+%%ETCDIR%%/vuln-sasserftpd.conf
+%%ETCDIR%%/vuln-sub7.conf
+%%ETCDIR%%/vuln-upnp.conf
+%%ETCDIR%%/vuln-veritas.conf
+%%ETCDIR%%/vuln-wins.conf
+%%ETCDIR%%/x-2.conf
lib/nepenthes/dnsresolveadns.a
-lib/nepenthes/dnsresolveadns.la
lib/nepenthes/dnsresolveadns.so
lib/nepenthes/downloadcreceive.a
-lib/nepenthes/downloadcreceive.la
lib/nepenthes/downloadcreceive.so
lib/nepenthes/downloadcsend.a
-lib/nepenthes/downloadcsend.la
lib/nepenthes/downloadcsend.so
lib/nepenthes/downloadcurl.a
-lib/nepenthes/downloadcurl.la
lib/nepenthes/downloadcurl.so
lib/nepenthes/downloadftp.a
-lib/nepenthes/downloadftp.la
lib/nepenthes/downloadftp.so
lib/nepenthes/downloadhttp.a
-lib/nepenthes/downloadhttp.la
lib/nepenthes/downloadhttp.so
lib/nepenthes/downloadlink.a
-lib/nepenthes/downloadlink.la
lib/nepenthes/downloadlink.so
lib/nepenthes/downloadrcp.a
-lib/nepenthes/downloadrcp.la
lib/nepenthes/downloadrcp.so
lib/nepenthes/downloadtftp.a
-lib/nepenthes/downloadtftp.la
lib/nepenthes/downloadtftp.so
lib/nepenthes/logdownload.a
-lib/nepenthes/logdownload.la
lib/nepenthes/logdownload.so
lib/nepenthes/loghexdump.a
-lib/nepenthes/loghexdump.la
lib/nepenthes/loghexdump.so
lib/nepenthes/logirc.a
-lib/nepenthes/logirc.la
lib/nepenthes/logirc.so
lib/nepenthes/logprelude.a
-lib/nepenthes/logprelude.la
lib/nepenthes/logprelude.so
lib/nepenthes/logsurfnet.a
-lib/nepenthes/logsurfnet.la
lib/nepenthes/logsurfnet.so
lib/nepenthes/modulebridge.a
-lib/nepenthes/modulebridge.la
lib/nepenthes/modulebridge.so
lib/nepenthes/modulehoneytrap.a
-lib/nepenthes/modulehoneytrap.la
lib/nepenthes/modulehoneytrap.so
lib/nepenthes/modulepeiros.a
-lib/nepenthes/modulepeiros.la
lib/nepenthes/modulepeiros.so
lib/nepenthes/moduleportwatch.a
-lib/nepenthes/moduleportwatch.la
lib/nepenthes/moduleportwatch.so
lib/nepenthes/shellcodegeneric.a
-lib/nepenthes/shellcodegeneric.la
lib/nepenthes/shellcodegeneric.so
lib/nepenthes/shellcodesignatures.a
-lib/nepenthes/shellcodesignatures.la
lib/nepenthes/shellcodesignatures.so
lib/nepenthes/shellemuwinnt.a
-lib/nepenthes/shellemuwinnt.la
lib/nepenthes/shellemuwinnt.so
lib/nepenthes/sqlhandlerpostgres.a
-lib/nepenthes/sqlhandlerpostgres.la
lib/nepenthes/sqlhandlerpostgres.so
lib/nepenthes/submitfile.a
-lib/nepenthes/submitfile.la
lib/nepenthes/submitfile.so
lib/nepenthes/submitgotek.a
-lib/nepenthes/submitgotek.la
lib/nepenthes/submitgotek.so
lib/nepenthes/submithttp.a
-lib/nepenthes/submithttp.la
lib/nepenthes/submithttp.so
lib/nepenthes/submitmwserv.a
-lib/nepenthes/submitmwserv.la
lib/nepenthes/submitmwserv.so
lib/nepenthes/submitnorman.a
-lib/nepenthes/submitnorman.la
lib/nepenthes/submitnorman.so
lib/nepenthes/submitpostgres.a
-lib/nepenthes/submitpostgres.la
lib/nepenthes/submitpostgres.so
lib/nepenthes/vulnasn1.a
-lib/nepenthes/vulnasn1.la
lib/nepenthes/vulnasn1.so
lib/nepenthes/vulnbagle.a
-lib/nepenthes/vulnbagle.la
lib/nepenthes/vulnbagle.so
lib/nepenthes/vulndameware.a
-lib/nepenthes/vulndameware.la
lib/nepenthes/vulndameware.so
lib/nepenthes/vulndcom.a
-lib/nepenthes/vulndcom.la
lib/nepenthes/vulndcom.so
lib/nepenthes/vulnftpd.a
-lib/nepenthes/vulnftpd.la
lib/nepenthes/vulnftpd.so
lib/nepenthes/vulniis.a
-lib/nepenthes/vulniis.la
lib/nepenthes/vulniis.so
lib/nepenthes/vulnkuang2.a
-lib/nepenthes/vulnkuang2.la
lib/nepenthes/vulnkuang2.so
lib/nepenthes/vulnlsass.a
-lib/nepenthes/vulnlsass.la
lib/nepenthes/vulnlsass.so
lib/nepenthes/vulnmsdtc.a
-lib/nepenthes/vulnmsdtc.la
lib/nepenthes/vulnmsdtc.so
lib/nepenthes/vulnmsmq.a
-lib/nepenthes/vulnmsmq.la
lib/nepenthes/vulnmsmq.so
lib/nepenthes/vulnmssql.a
-lib/nepenthes/vulnmssql.la
lib/nepenthes/vulnmssql.so
lib/nepenthes/vulnmydoom.a
-lib/nepenthes/vulnmydoom.la
lib/nepenthes/vulnmydoom.so
lib/nepenthes/vulnnetbiosname.a
-lib/nepenthes/vulnnetbiosname.la
lib/nepenthes/vulnnetbiosname.so
lib/nepenthes/vulnnetdde.a
-lib/nepenthes/vulnnetdde.la
lib/nepenthes/vulnnetdde.so
lib/nepenthes/vulnoptix.a
-lib/nepenthes/vulnoptix.la
lib/nepenthes/vulnoptix.so
lib/nepenthes/vulnpnp.a
-lib/nepenthes/vulnpnp.la
lib/nepenthes/vulnpnp.so
lib/nepenthes/vulnrealvnc.a
-lib/nepenthes/vulnrealvnc.la
lib/nepenthes/vulnrealvnc.so
lib/nepenthes/vulnsasserftpd.a
-lib/nepenthes/vulnsasserftpd.la
lib/nepenthes/vulnsasserftpd.so
lib/nepenthes/vulnsav.a
-lib/nepenthes/vulnsav.la
lib/nepenthes/vulnsav.so
lib/nepenthes/vulnssh.a
-lib/nepenthes/vulnssh.la
lib/nepenthes/vulnssh.so
lib/nepenthes/vulnsub7.a
-lib/nepenthes/vulnsub7.la
lib/nepenthes/vulnsub7.so
lib/nepenthes/vulnupnp.a
-lib/nepenthes/vulnupnp.la
lib/nepenthes/vulnupnp.so
lib/nepenthes/vulnveritas.a
-lib/nepenthes/vulnveritas.la
lib/nepenthes/vulnveritas.so
lib/nepenthes/vulnwins.a
-lib/nepenthes/vulnwins.la
lib/nepenthes/vulnwins.so
lib/nepenthes/x1.a
-lib/nepenthes/x1.la
lib/nepenthes/x1.so
lib/nepenthes/x2.a
-lib/nepenthes/x2.la
lib/nepenthes/x2.so
lib/nepenthes/x3.a
-lib/nepenthes/x3.la
lib/nepenthes/x3.so
lib/nepenthes/x4.a
-lib/nepenthes/x4.la
lib/nepenthes/x4.so
lib/nepenthes/x5.a
-lib/nepenthes/x5.la
lib/nepenthes/x5.so
lib/nepenthes/x6.a
-lib/nepenthes/x6.la
lib/nepenthes/x6.so
lib/nepenthes/x9.a
-lib/nepenthes/x9.la
lib/nepenthes/x9.so
+man/man8/nepenthes.8.gz
%%DATADIR%%/README
%%DATADIR%%/README.VFS
%%DATADIR%%/logo-shaded.svg
-@dirrm etc/nepenthes
-@dirrm lib/nepenthes
+%%DATADIR%%/signatures/shellcode-signatures.sc
+@dirrm %%DATADIR%%/signatures
@dirrm %%DATADIR%%
+@dirrm lib/nepenthes
+@dirrm %%ETCDIR%%