8 files changed, 54 insertions, 133 deletions

diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index e27ff3756f7a..3cd18e4605b7 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nepenthes
-PORTVERSION=	0.1.7
-PORTREVISION=	3
+PORTVERSION=	0.2.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nepenthes
@@ -26,12 +25,17 @@ CONFIGURE_ARGS+=	--enable-prelude
 EXTRA_PATCHES=		${FILESDIR}/prelude_modules_log-prelude_Makefile.in.patch
 .endif
 
+.if defined(WITH_DEBUG_LOGGING)
+CONFIGURE_ARGS+=	--enable-debug-logging
+.endif
+
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --infodir=${PREFIX}/info
 
-MAN8=		nepenthes.8
-DOCS=		README README.VFS logo-shaded.svg
+DOCS=	README README.VFS logo-shaded.svg
+MAN8=	nepenthes.8
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/nepenthes/distinfo b/net/nepenthes/distinfo
index 43b04f5bf13f..aac0aa8d4d61 100644
--- a/net/nepenthes/distinfo
+++ b/net/nepenthes/distinfo
@@ -1,3 +1,3 @@
-MD5 (nepenthes-0.1.7.tar.gz) = 799c671b3aaef58087f635064b6acd61
-SHA256 (nepenthes-0.1.7.tar.gz) = 1347db3895ac6129b8271fb7effb061f107085fd8ab428eeab6d0fcc54edad85
-SIZE (nepenthes-0.1.7.tar.gz) = 840661
+MD5 (nepenthes-0.2.0.tar.gz) = 3123b62700403a8baeb597b29d075779
+SHA256 (nepenthes-0.2.0.tar.gz) = a33a56b791bfb71559e121175106783087ae31d147362c9f17ea11796a68938a
+SIZE (nepenthes-0.2.0.tar.gz) = 913270
diff --git a/net/nepenthes/files/patch-Makefile.in b/net/nepenthes/files/patch-Makefile.in
index d255f271c84d..5447a6fff143 100644
--- a/net/nepenthes/files/patch-Makefile.in
+++ b/net/nepenthes/files/patch-Makefile.in
@@ -1,13 +1,21 @@
---- Makefile.in.orig	Sun Apr 30 22:50:20 2006
-+++ Makefile.in	Sun Apr 30 22:50:38 2006
-@@ -198,8 +198,8 @@
- SUBDIRS = nepenthes-core modules 
+--- Makefile.in.orig    Sun Jan 14 13:34:14 2007
++++ Makefile.in Sun Jan 14 13:34:40 2007
+@@ -188,7 +188,7 @@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(prefix)/share/doc
++docdir = $(prefix)/share/nepenthes
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -219,7 +219,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
--docdir = $(prefix)/share/doc
 -doc_DATA = doc/README.VFS doc/logo-shaded.svg
-+docdir = $(prefix)/share/nepenthes
 +doc_DATA = README doc/README.VFS doc/logo-shaded.svg
- 
+
  #sysconf_DATA = conf/nepenthes.conf.dist
  AM_CXXFLAGS = ''
+
diff --git a/net/nepenthes/files/patch-conf-nepenthes.conf.dist b/net/nepenthes/files/patch-conf-nepenthes.conf.dist
deleted file mode 100644
index 3d6d5a7c87c9..000000000000
--- a/net/nepenthes/files/patch-conf-nepenthes.conf.dist
+++ /dev/null
@@ -1,31 +0,0 @@
---- conf/nepenthes.conf.dist.orig	Sat Dec  3 17:23:03 2005
-+++ conf/nepenthes.conf.dist	Sat Dec  3 17:23:56 2005
-@@ -87,8 +87,8 @@
- 
-     logmanager
-     {
--	ring_logging_file		"var/log/nepenthes.%d.log";
--	file_logging_file		"var/log/nepenthes.log";
-+	ring_logging_file		"var/log/nepenthes/nepenthes.%d.log";
-+	file_logging_file		"var/log/nepenthes/nepenthes.log";
-     };
- 
-     modulemanager
-@@ -100,7 +100,7 @@
-     {
-         strictfiletype              "1";
-         // where does submit-file write to? set this to the same dir
--        filesdir                    "var/binaries/"; 
-+        filesdir                    "var/nepenthes/binaries/"; 
-     };
- 
-     downloadmanager
-@@ -116,7 +116,7 @@
-     
-     utilities
-     {
--	hexdump_path                "var/hexdumps/";
-+	hexdump_path                "var/nepenthes/hexdumps/";
-     };
-     
-     geolocationmanager
diff --git a/net/nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp b/net/nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp
deleted file mode 100644
index bde493ded484..000000000000
--- a/net/nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- modules/vuln-bagle/BagleDialogue.cpp.old	Sun May  7 16:07:25 2006
-+++ modules/vuln-bagle/BagleDialogue.cpp	Sun May  7 16:08:14 2006
-@@ -158,6 +158,7 @@
- 				m_State = BAGLE_BINARY;
- 				m_Download = new Download(m_Socket->getRemoteHost(),"bagle://",m_Socket->getRemoteHost(),"bagle://foo/bar");
- 				m_Download->getDownloadBuffer()->addData(msg->getMsg()+4,msg->getSize()-4);
-+				return CL_ASSIGN_AND_DONE;
- 			}
- 		}
- 		break;
-@@ -165,6 +166,7 @@
- 	case BAGLE_BINARY:
- 		// FIXME m_MaxFileSize
- 		m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
-+		return CL_ASSIGN_AND_DONE;
- 		break;
- 
- 	}
-@@ -232,8 +234,6 @@
- 		if ( m_Download->getDownloadBuffer()->getSize() == m_FileSize )
- 		{
- 			g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
--			// destructor will delete it
--			return CL_ASSIGN_AND_DONE;
- 		}
- 	}
- 	return CL_DROP;
diff --git a/net/nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp b/net/nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp
deleted file mode 100644
index cffca6e73371..000000000000
--- a/net/nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- modules/vuln-mydoom/MydoomDialogue.cpp.old	Sun May  7 16:03:52 2006
-+++ modules/vuln-mydoom/MydoomDialogue.cpp	Sun May  7 16:05:33 2006
-@@ -120,7 +120,7 @@
- 				m_Download = new Download(msg->getRemoteHost(),"mydoom://foo/bar",msg->getRemoteHost(),"some triggerline");
- 				m_Download->getDownloadBuffer()->addData((char *)m_Buffer->getData(),m_Buffer->getSize());
- 				m_Buffer->clear();
--				return CL_ASSIGN;
-+				return CL_ASSIGN_AND_DONE;
- 			}
- 		}
- 		if (m_Buffer->getSize() > 128 )
-@@ -130,6 +130,7 @@
- 	case MYDOOM_FILETRANSFERR:
- 		{
- 			m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
-+			return CL_ASSIGN_AND_DONE;
- 		}
- 		break;
- 
-@@ -196,7 +197,6 @@
- 	if (m_Download != NULL)
- 	{
-     	g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
--		return CL_ASSIGN_AND_DONE;
- 	}
- 	return CL_DROP;
- }
diff --git a/net/nepenthes/files/prelude_modules_log-prelude_Makefile.in.patch b/net/nepenthes/files/prelude_modules_log-prelude_Makefile.in.patch
index 8a9878e29c0f..01e68f347c10 100644
--- a/net/nepenthes/files/prelude_modules_log-prelude_Makefile.in.patch
+++ b/net/nepenthes/files/prelude_modules_log-prelude_Makefile.in.patch
@@ -1,11 +1,11 @@
---- modules/log-prelude/Makefile.in.orig	Sun Apr 23 19:49:07 2006
-+++ modules/log-prelude/Makefile.in	Fri Oct 20 15:01:06 2006
-@@ -195,7 +195,7 @@
+--- modules/log-prelude/Makefile.in.orig    Sun Jan 14 14:09:10 2007
++++ modules/log-prelude/Makefile.in Sun Jan 14 14:09:21 2007
+@@ -216,7 +216,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
--AM_CPPFLAGS = -I/usr/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
+-AM_CPPFLAGS = -I/usr/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE $(CPPFLAG_PRELUDE)
 +AM_CPPFLAGS = -I/usr/local/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
  AM_CXXFLAGS = -Wall
- AM_LDFLAGS = 
+ AM_LDFLAGS = $(LDFLAG_PRELUDE) ${LIB_PRELUDE}
  pkglib_LTLIBRARIES = logprelude.la
diff --git a/net/nepenthes/pkg-plist b/net/nepenthes/pkg-plist
index 4976efe87307..0fcfdb334c57 100644
--- a/net/nepenthes/pkg-plist
+++ b/net/nepenthes/pkg-plist
@@ -3,22 +3,19 @@ etc/nepenthes/download-csend.conf
 etc/nepenthes/download-curl.conf
 etc/nepenthes/download-ftp.conf
 etc/nepenthes/download-link.conf
-etc/nepenthes/download-nepenthes.conf
 etc/nepenthes/download-tftp.conf
-etc/nepenthes/geolocation-ip2location.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-nepenthes.conf
 etc/nepenthes/submit-norman.conf
-etc/nepenthes/submit-xmlrpc.conf
 etc/nepenthes/vuln-asn1.conf
 etc/nepenthes/vuln-bagle.conf
 etc/nepenthes/vuln-dameware.conf
@@ -63,24 +60,12 @@ lib/nepenthes/downloadhttp.so
 lib/nepenthes/downloadlink.a
 lib/nepenthes/downloadlink.la
 lib/nepenthes/downloadlink.so
-lib/nepenthes/downloadnepenthes.a
-lib/nepenthes/downloadnepenthes.la
-lib/nepenthes/downloadnepenthes.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/geolocationgeoip.a
-lib/nepenthes/geolocationgeoip.la
-lib/nepenthes/geolocationgeoip.so
-lib/nepenthes/geolocationhostip.a
-lib/nepenthes/geolocationhostip.la
-lib/nepenthes/geolocationhostip.so
-lib/nepenthes/geolocationip2location.a
-lib/nepenthes/geolocationip2location.la
-lib/nepenthes/geolocationip2location.so
 lib/nepenthes/logdownload.a
 lib/nepenthes/logdownload.la
 lib/nepenthes/logdownload.so
@@ -93,6 +78,15 @@ 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
@@ -105,24 +99,21 @@ 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/submitnepenthes.a
-lib/nepenthes/submitnepenthes.la
-lib/nepenthes/submitnepenthes.so
 lib/nepenthes/submitnorman.a
 lib/nepenthes/submitnorman.la
 lib/nepenthes/submitnorman.so
-lib/nepenthes/submitxmlrpc.a
-lib/nepenthes/submitxmlrpc.la
-lib/nepenthes/submitxmlrpc.so
-lib/nepenthes/uploadhttp.a
-lib/nepenthes/uploadhttp.la
-lib/nepenthes/uploadhttp.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
@@ -171,6 +162,9 @@ 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
@@ -207,9 +201,9 @@ lib/nepenthes/x5.so
 lib/nepenthes/x6.a
 lib/nepenthes/x6.la
 lib/nepenthes/x6.so
-lib/nepenthes/x8.a
-lib/nepenthes/x8.la
-lib/nepenthes/x8.so
+lib/nepenthes/x9.a
+lib/nepenthes/x9.la
+lib/nepenthes/x9.so
 %%DATADIR%%/README
 %%DATADIR%%/README.VFS
 %%DATADIR%%/logo-shaded.svg