From ff3259c1878d6403c9a93e71e08de59a34079f83 Mon Sep 17 00:00:00 2001 From: rui Date: Sat, 16 Feb 2008 10:56:41 +0000 Subject: [PATCH] - maintenance update to 0.2.2. --- net/nepenthes/Makefile | 7 ++-- net/nepenthes/distinfo | 10 ++--- net/nepenthes/patches/patch-Makefile_in | 22 +++++------ ...atch-modules_download-ftp_CTRLDialogue_cpp | 29 -------------- ...les_shellcode-signatures_sch_namespace_cpp | 12 ------ ...ellcode-signatures_shellcode-signatures_sc | 12 ------ ...tch-nepenthes-core_src_DownloadManager_cpp | 38 ------------------- net/nepenthes/pkg/PLIST | 8 +--- 8 files changed, 20 insertions(+), 118 deletions(-) delete mode 100644 net/nepenthes/patches/patch-modules_download-ftp_CTRLDialogue_cpp delete mode 100644 net/nepenthes/patches/patch-modules_shellcode-signatures_sch_namespace_cpp delete mode 100644 net/nepenthes/patches/patch-modules_shellcode-signatures_shellcode-signatures_sc delete mode 100644 net/nepenthes/patches/patch-nepenthes-core_src_DownloadManager_cpp diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index 70b1d5ebbcb..5ea0675e523 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2008/02/14 21:36:27 rui Exp $ +# $OpenBSD: Makefile,v 1.20 2008/02/16 10:56:41 rui Exp $ SHARED_ONLY= Yes 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_PACKAGE_FTP= Yes 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 diff --git a/net/nepenthes/distinfo b/net/nepenthes/distinfo index 0b63c90429e..3c3d81ed810 100644 --- a/net/nepenthes/distinfo +++ b/net/nepenthes/distinfo @@ -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 diff --git a/net/nepenthes/patches/patch-Makefile_in b/net/nepenthes/patches/patch-Makefile_in index 82bb2549eae..65cc6b989b4 100644 --- a/net/nepenthes/patches/patch-Makefile_in +++ b/net/nepenthes/patches/patch-Makefile_in @@ -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: patch-Makefile_in,v 1.5 2008/02/16 10:56:41 rui Exp $ +--- 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; diff --git a/net/nepenthes/patches/patch-modules_download-ftp_CTRLDialogue_cpp b/net/nepenthes/patches/patch-modules_download-ftp_CTRLDialogue_cpp deleted file mode 100644 index dd9603dff70..00000000000 --- a/net/nepenthes/patches/patch-modules_download-ftp_CTRLDialogue_cpp +++ /dev/null @@ -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 -+#include - #include - #include - #include -@@ -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); diff --git a/net/nepenthes/patches/patch-modules_shellcode-signatures_sch_namespace_cpp b/net/nepenthes/patches/patch-modules_shellcode-signatures_sch_namespace_cpp deleted file mode 100644 index 29dc187ee41..00000000000 --- a/net/nepenthes/patches/patch-modules_shellcode-signatures_sch_namespace_cpp +++ /dev/null @@ -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 - { diff --git a/net/nepenthes/patches/patch-modules_shellcode-signatures_shellcode-signatures_sc b/net/nepenthes/patches/patch-modules_shellcode-signatures_shellcode-signatures_sc deleted file mode 100644 index a26c7648bc7..00000000000 --- a/net/nepenthes/patches/patch-modules_shellcode-signatures_shellcode-signatures_sc +++ /dev/null @@ -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); - }; - diff --git a/net/nepenthes/patches/patch-nepenthes-core_src_DownloadManager_cpp b/net/nepenthes/patches/patch-nepenthes-core_src_DownloadManager_cpp deleted file mode 100644 index c214e3ba4f5..00000000000 --- a/net/nepenthes/patches/patch-nepenthes-core_src_DownloadManager_cpp +++ /dev/null @@ -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 -+#include - - #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)))) - diff --git a/net/nepenthes/pkg/PLIST b/net/nepenthes/pkg/PLIST index b4b0e69dd03..befe7e2966b 100644 --- a/net/nepenthes/pkg/PLIST +++ b/net/nepenthes/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2007/09/02 22:42:55 rui Exp $ +@comment $OpenBSD: PLIST,v 1.6 2008/02/16 10:56:41 rui Exp $ @newgroup _nepenthes:584 @newuser _nepenthes:584:584:daemon:nepenthes user:/nonexistent:/sbin/nologin %%SHARED%% @@ -87,12 +87,8 @@ share/examples/nepenthes/log-prelude.conf @sample ${SYSCONFDIR}/nepenthes/log-prelude.conf share/examples/nepenthes/log-surfnet.conf @sample ${SYSCONFDIR}/nepenthes/log-surfnet.conf -share/examples/nepenthes/module-bridge.conf -@sample ${SYSCONFDIR}/nepenthes/module-bridge.conf share/examples/nepenthes/module-honeytrap.conf @sample ${SYSCONFDIR}/nepenthes/module-honeytrap.conf -share/examples/nepenthes/module-peiros.conf -@sample ${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 @@ share/examples/nepenthes/vuln-pnp.conf @sample ${SYSCONFDIR}/nepenthes/vuln-pnp.conf share/examples/nepenthes/vuln-sasserftpd.conf @sample ${SYSCONFDIR}/nepenthes/vuln-sasserftpd.conf -share/examples/nepenthes/vuln-ssh.conf -@sample ${SYSCONFDIR}/nepenthes/vuln-ssh.conf share/examples/nepenthes/vuln-sub7.conf @sample ${SYSCONFDIR}/nepenthes/vuln-sub7.conf share/examples/nepenthes/vuln-upnp.conf