nepenthes was released to public today, however i've been running this
for a long time.
ok?
cheers,
rui
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nepenthes/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile 14 Feb 2008 21:36:27 -0000 1.19
+++ Makefile 14 Feb 2008 22:01:58 -0000
@@ -3,8 +3,7 @@
COMMENT= determine the malware activity on a network
-DISTNAME= nepenthes-20070830
-PKGNAME= ${DISTNAME}p4
+DISTNAME= nepenthes-0.2.2
CATEGORIES= net
HOMEPAGE= http://nepenthes.mwcollect.org/
@@ -17,7 +16,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nepenthes/}
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nepenthes/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 2 Sep 2007 22:42:55 -0000 1.5
+++ distinfo 14 Feb 2008 22:01:58 -0000
@@ -1,5 +1,5 @@
-MD5 (nepenthes-20070830.tar.gz) = SWGBdSlEWf8ScjCobcAo+w==
-RMD160 (nepenthes-20070830.tar.gz) = XAvJ5pp+3EI5xDG8yoJpnSccSpM=
-SHA1 (nepenthes-20070830.tar.gz) = ixI9s6wIPxeDfedCJnznRCf+ZRU=
-SHA256 (nepenthes-20070830.tar.gz) =
sDaTUSWXkrWPs+hzs04WZ+X1hvrLLQ4mjNAggxCKOxM=
-SIZE (nepenthes-20070830.tar.gz) = 1881994
+MD5 (nepenthes-0.2.2.tar.gz) = doFVfs5MBei2Afmcp9p5/w==
+RMD160 (nepenthes-0.2.2.tar.gz) = ubMMfYWansMpRaiRinUYfWciVas=
+SHA1 (nepenthes-0.2.2.tar.gz) = zJdAMYsGbk7whcnTYLJJMtO+ecg=
+SHA256 (nepenthes-0.2.2.tar.gz) = HqeWm0HvTGivaPRiBxeJlu/G4bXxBG8JDkUNUqH61k4=
+SIZE (nepenthes-0.2.2.tar.gz) = 936776
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/nepenthes/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 2 Sep 2007 22:42:55 -0000 1.4
+++ patches/patch-Makefile_in 14 Feb 2008 22:01:58 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2007/09/02 22:42:55 rui Exp $
---- Makefile.in.orig Sun Apr 29 14:29:35 2007
-+++ Makefile.in Sun Apr 29 14:31:50 2007
-@@ -214,7 +214,7 @@ AUTOMAKE_OPTIONS = foreign
- SUBDIRS = nepenthes-core modules
- #tools
- EXTRA_DIST = configure.ac CHANGES doc/README.VFS doc/logo-shaded.svg
doc/nepenthes.8 conf/nepenthes.conf.dist
+$OpenBSD$
+--- Makefile.in.orig Thu Dec 13 22:02:56 2007
++++ Makefile.in Thu Dec 13 22:05:21 2007
+@@ -191,7 +191,7 @@ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
-docdir = $(prefix)/share/doc
+docdir = $(prefix)/share/doc/nepenthes
- doc_DATA = doc/README.VFS doc/logo-shaded.svg
-
- #sysconf_DATA = conf/nepenthes.conf.dist
-@@ -707,21 +707,9 @@ install-data-local:
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+@@ -714,21 +714,9 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(mandir)
$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
$(INSTALL_DATA) $(srcdir)/doc/nepenthes.8
$(DESTDIR)$(mandir)/man8/nepenthes.8;
Index: patches/patch-modules_download-ftp_CTRLDialogue_cpp
===================================================================
RCS file: patches/patch-modules_download-ftp_CTRLDialogue_cpp
diff -N patches/patch-modules_download-ftp_CTRLDialogue_cpp
--- patches/patch-modules_download-ftp_CTRLDialogue_cpp 13 Dec 2007 21:47:32
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-modules_download-ftp_CTRLDialogue_cpp,v 1.1 2007/12/13
21:47:32 rui Exp $
---- modules/download-ftp/CTRLDialogue.cpp.orig Sat Dec 8 19:52:46 2007
-+++ modules/download-ftp/CTRLDialogue.cpp Sat Dec 8 19:57:35 2007
-@@ -28,6 +28,7 @@
- /* $Id: patch-modules_download-ftp_CTRLDialogue_cpp,v 1.1 2007/12/13
21:47:32 rui Exp $ */
-
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -455,10 +456,17 @@ void CTRLDialogue::sendPort()
-
-
- asprintf(&nmsg,"PORT %d,%d,%d,%d,%d,%d\r\n",
-+#if BYTE_ORDER == BIG_ENDIAN
-+ (int32_t)(ip >> 24) & 0xff,
-+ (int32_t)(ip >> 16) & 0xff,
-+ (int32_t)(ip >> 8) & 0xff,
- (int32_t)ip & 0xff,
-+#else
-+ (int32_t)ip & 0xff,
- (int32_t)(ip >> 8) & 0xff,
- (int32_t)(ip >> 16) & 0xff,
- (int32_t)(ip >> 24) & 0xff,
-+#endif
- (int32_t)(port >> 8) & 0xff,
- (int32_t)port & 0xff);
- logDebug("FTPSEND: '%s'\n",nmsg);
Index: patches/patch-modules_shellcode-signatures_sch_namespace_cpp
===================================================================
RCS file: patches/patch-modules_shellcode-signatures_sch_namespace_cpp
diff -N patches/patch-modules_shellcode-signatures_sch_namespace_cpp
--- patches/patch-modules_shellcode-signatures_sch_namespace_cpp 18 Sep
2007 18:30:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_shellcode-signatures_sch_namespace_cpp,v 1.1
2007/09/18 18:30:19 rui Exp $
---- modules/shellcode-signatures/sch_namespace.cpp.orig Fri Sep 7
21:58:58 2007
-+++ modules/shellcode-signatures/sch_namespace.cpp Fri Sep 7 22:00:11 2007
-@@ -107,7 +107,7 @@ bool NamespaceShellcodeHandler::Init()
- if ( (m_Pcre = pcre_compile(m_Pattern.c_str(), PCRE_DOTALL,
&pcreEerror, (int *)&pcreErrorPos, 0)) == NULL )
- {
- logCrit("%s could not compile pattern \n\t\"%s\"\n\t
Error:\"%s\" at Position %u",
-- m_ShellcodeHandlerName.c_str(), pcreEerror,
pcreErrorPos);
-+ m_ShellcodeHandlerName.c_str(),
m_Pattern.c_str(), pcreEerror, pcreErrorPos);
- return false;
- } else
- {
Index: patches/patch-modules_shellcode-signatures_shellcode-signatures_sc
===================================================================
RCS file: patches/patch-modules_shellcode-signatures_shellcode-signatures_sc
diff -N patches/patch-modules_shellcode-signatures_shellcode-signatures_sc
--- patches/patch-modules_shellcode-signatures_shellcode-signatures_sc 18 Sep
2007 18:30:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_shellcode-signatures_shellcode-signatures_sc,v 1.1
2007/09/18 18:30:19 rui Exp $
---- modules/shellcode-signatures/shellcode-signatures.sc.orig Fri Sep 7
22:00:20 2007
-+++ modules/shellcode-signatures/shellcode-signatures.sc Fri Sep 7
22:01:42 2007
-@@ -181,7 +181,7 @@ xor::leimbach
- xor::marburganderlahn
- {
- pattern
--
"(.*)(\\xEB\\x0E\\x5A\\x4A\\x31\\xC9\\xB1(.)\\x80\\x34\\x11(.)\\xE2\\xFA\\xEB\\x05\\xE8\\xED\xFF\xFF\xFF)(.*)$";
-+
"(.*)(\\xEB\\x0E\\x5A\\x4A\\x31\\xC9\\xB1(.)\\x80\\x34\\x11(.)\\xE2\\xFA\\xEB\\x05\\xE8\\xED\\xFF\\xFF\\xFF)(.*)$";
- mapping (none,pre,decoder,size,key,post);
- };
-
Index: patches/patch-nepenthes-core_src_DownloadManager_cpp
===================================================================
RCS file: patches/patch-nepenthes-core_src_DownloadManager_cpp
diff -N patches/patch-nepenthes-core_src_DownloadManager_cpp
--- patches/patch-nepenthes-core_src_DownloadManager_cpp 2 Dec 2007
20:46:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-nepenthes-core_src_DownloadManager_cpp,v 1.1 2007/12/02
20:46:52 rui Exp $
---- nepenthes-core/src/DownloadManager.cpp.orig Thu Aug 30 23:14:37 2007
-+++ nepenthes-core/src/DownloadManager.cpp Sun Dec 2 18:20:26 2007
-@@ -28,6 +28,7 @@
- /* $Id: patch-nepenthes-core_src_DownloadManager_cpp,v 1.1 2007/12/02
20:46:52 rui Exp $ */
-
- #include <string>
-+#include <sys/param.h>
-
- #include "DownloadManager.hpp"
- #include "DownloadHandler.hpp"
-@@ -114,16 +115,16 @@ bool DownloadManager::Exit()
- * these cool makros are taken from the clamav mailing list
- *
- */
--//#ifndef BIG_ENDIAN
--// #define SWAP_ORDER(x) (x)
--//#else
-- #define SWAP_ORDER(x) ( \
-- ((x & 0xff) << 24) | \
-- ((x & 0xff00) << 8) | \
-- ((x & 0xff0000) >> 8 ) | \
-- ((x & 0xff000000) >> 24 ))
--//#endif
--
-+#if BYTE_ORDER == BIG_ENDIAN
-+ #define SWAP_ORDER(x) (x)
-+#else
-+ #define SWAP_ORDER(x) ( \
-+ ((x & 0xff) << 24) | \
-+ ((x & 0xff00) << 8) | \
-+ ((x & 0xff0000) >> 8 ) | \
-+ ((x & 0xff000000) >> 24 ))
-+#endif
-+
- #define PACKADDR(a, b, c, d) SWAP_ORDER((((uint32_t)(a) << 24) | ((b) << 16)
| ((c) << 8) | (d)))
- #define MAKEMASK(bits) SWAP_ORDER(((uint32_t)(0xffffffff <<
(32-bits))))
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nepenthes/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 2 Sep 2007 22:42:55 -0000 1.5
+++ pkg/PLIST 14 Feb 2008 22:01:58 -0000
@@ -87,12 +87,8 @@
@sample ${SYSCONFDIR}/nepenthes/log-prelude.conf
share/examples/nepenthes/log-surfnet.conf
@sample ${SYSCONFDIR}/nepenthes/log-surfnet.conf
-share/examples/nepenthes/module-bridge.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/nepenthes/module-bridge.conf
share/examples/nepenthes/module-honeytrap.conf
@sample ${SYSCONFDIR}/nepenthes/module-honeytrap.conf
-share/examples/nepenthes/module-peiros.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/nepenthes/module-peiros.conf
share/examples/nepenthes/module-portwatch.conf
@sample ${SYSCONFDIR}/nepenthes/module-portwatch.conf
share/examples/nepenthes/nepenthes.conf
@@ -164,8 +160,6 @@
@sample ${SYSCONFDIR}/nepenthes/vuln-pnp.conf
share/examples/nepenthes/vuln-sasserftpd.conf
@sample ${SYSCONFDIR}/nepenthes/vuln-sasserftpd.conf
-share/examples/nepenthes/vuln-ssh.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/nepenthes/vuln-ssh.conf
share/examples/nepenthes/vuln-sub7.conf
@sample ${SYSCONFDIR}/nepenthes/vuln-sub7.conf
share/examples/nepenthes/vuln-upnp.conf
