update nepenthes to a recent svn snapshot to fix prelude flavor.

ajacoutot@ was kind enough to host the distfile, thanks.

input and ok aanriot@
This commit is contained in:
rui 2007-09-02 22:42:54 +00:00
parent f71bddc3e1
commit 9cd42354ad
8 changed files with 50 additions and 70 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2007/05/27 20:49:26 aanriot Exp $
# $OpenBSD: Makefile,v 1.13 2007/09/02 22:42:54 rui Exp $
SHARED_ONLY= Yes
COMMENT= "determine the malware activity on a network"
COMMENT= determine the malware activity on a network
DISTNAME= nepenthes-0.2.0
PKGNAME= ${DISTNAME}p2
DISTNAME= nepenthes-20070830
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= ${MASTER_SITE_SOURCEFORGE:=nepenthes/}
MASTER_SITES= http://www.obsd.fr/OpenBSD/distfiles/
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
@ -46,8 +45,6 @@ FLAVORS= prelude
FLAVOR?=
.if ${FLAVOR:L:Mprelude}
BROKEN= "phreading issues"
LIB_DEPENDS+= prelude.>=8::security/prelude/libprelude
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libprelude/" \

View File

@ -1,5 +1,5 @@
MD5 (nepenthes-0.2.0.tar.gz) = MSO2JwBAOouutZeynQdXeQ==
RMD160 (nepenthes-0.2.0.tar.gz) = vWzA17aLWbgMeykU2xCydRVqq+w=
SHA1 (nepenthes-0.2.0.tar.gz) = c3RKtNN0SHeRbO5b0djp5+O0M9U=
SHA256 (nepenthes-0.2.0.tar.gz) = ozpWt5G/txVZ4SEXUQZ4MIeuMdFHNiyfF+oReWpok4o=
SIZE (nepenthes-0.2.0.tar.gz) = 913270
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

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.3 2007/03/17 21:50:11 jolan Exp $
--- Makefile.in.orig Mon Nov 13 19:51:10 2006
+++ Makefile.in Wed Nov 15 20:16:05 2006
@@ -188,7 +188,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
$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
-docdir = $(prefix)/share/doc
+docdir = $(prefix)/share/doc/nepenthes
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
@@ -711,21 +711,9 @@ install-data-local:
doc_DATA = doc/README.VFS doc/logo-shaded.svg
#sysconf_DATA = conf/nepenthes.conf.dist
@@ -707,21 +707,9 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(mandir)
$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
$(INSTALL_DATA) $(srcdir)/doc/nepenthes.8 $(DESTDIR)$(mandir)/man8/nepenthes.8;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-conf_nepenthes_conf_dist,v 1.2 2007/04/15 11:58:25 aanriot Exp $
--- conf/nepenthes.conf.dist.orig Mon Nov 13 19:40:03 2006
+++ conf/nepenthes.conf.dist Sat Apr 7 22:14:09 2007
$OpenBSD: patch-conf_nepenthes_conf_dist,v 1.3 2007/09/02 22:42:55 rui Exp $
--- conf/nepenthes.conf.dist.orig Sat May 26 01:50:10 2007
+++ conf/nepenthes.conf.dist Sat May 26 01:53:31 2007
@@ -3,8 +3,8 @@
nepenthes
@ -12,7 +12,7 @@ $OpenBSD: patch-conf_nepenthes_conf_dist,v 1.2 2007/04/15 11:58:25 aanriot Exp $
modules(
// module name (in moduledir) config file (in moduleconfigdir)
@@ -30,17 +30,20 @@ nepenthes
@@ -30,6 +30,8 @@ nepenthes
"downloadtftp.so", "download-tftp.conf", ""
"downloadrcp.so", "" ""
@ -21,20 +21,7 @@ $OpenBSD: patch-conf_nepenthes_conf_dist,v 1.2 2007/04/15 11:58:25 aanriot Exp $
// submission handler
"submitfile.so", "submit-file.conf", "" // save to disk
// "submitnorman.so", "submit-norman.conf", ""
// "submitnepenthes.so", "submit-nepenthes.conf", "" // send to download-nepenthes in other nepenthes instances
// "submitxmlrpc.so", "submit-xmlrpc.conf", "" // submit files to a xmlrpc server
+// "submitpostgres.so", "submit-postgres.conf", "" // submit to postgresql server
// logging
"logdownload.so", "log-download.conf", ""
// "logirc.so", "log-irc.conf", "" // needs configuration
+// "logprelude.so", "log-prelude.conf", "" // enables prelude logging
-
// dumping and logging
"moduleportwatch.so", "module-portwatch.conf", ""
@@ -88,8 +91,8 @@ nepenthes
@@ -90,8 +92,8 @@ nepenthes
logmanager
{
@ -45,7 +32,7 @@ $OpenBSD: patch-conf_nepenthes_conf_dist,v 1.2 2007/04/15 11:58:25 aanriot Exp $
};
modulemanager
@@ -101,7 +104,7 @@ nepenthes
@@ -103,7 +105,7 @@ nepenthes
{
strictfiletype "1";
// where does submit-file write to? set this to the same dir
@ -54,7 +41,7 @@ $OpenBSD: patch-conf_nepenthes_conf_dist,v 1.2 2007/04/15 11:58:25 aanriot Exp $
};
downloadmanager
@@ -120,11 +123,11 @@ nepenthes
@@ -122,11 +124,11 @@ nepenthes
utilities
{

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-modules_download-curl_download-curl_cpp,v 1.2 2007/04/15 11:58:25 aanriot Exp $
--- modules/download-curl/download-curl.cpp.orig Mon Nov 13 20:40:06 2006
+++ modules/download-curl/download-curl.cpp Sat Apr 7 21:32:52 2007
@@ -230,7 +230,6 @@ bool CurlDownloadHandler::download(Download *down)
down->getDownloadUrl()->getPort(),
down->getDownloadUrl()->getPath().c_str());
// string auth = down->getDownloadUrl()->getUser() + ":" + down->getDownloadUrl()->getPass();
- curl_easy_setopt(pCurlHandle, CURLOPT_SOURCE_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str());
curl_easy_setopt(pCurlHandle, CURLOPT_USERPWD,(char *)down->getDownloadUrl()->getAuth().c_str());
curl_easy_setopt(pCurlHandle, CURLOPT_URL , url);
curl_easy_setopt(pCurlHandle, CURLOPT_FTP_RESPONSE_TIMEOUT, 120); // 2 min ftp timeout

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-modules_module-peiros_module-peiros_cpp,v 1.1 2007/03/17 21:50:11 jolan Exp $
--- modules/module-peiros/module-peiros.cpp.orig Sun Oct 29 19:22:38 2006
+++ modules/module-peiros/module-peiros.cpp Sun Oct 29 19:23:06 2006
@@ -29,6 +29,7 @@
#include <ctype.h>
#include <string.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/17 21:50:11 jolan Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2007/09/02 22:42:55 rui Exp $
lib/nepenthes/dnsresolveadns.so
lib/nepenthes/downloadcreceive.so
lib/nepenthes/downloadcsend.so
@ -9,6 +9,7 @@ lib/nepenthes/downloadlink.so
lib/nepenthes/downloadrcp.so
lib/nepenthes/downloadtftp.so
lib/nepenthes/logdownload.so
lib/nepenthes/loghexdump.so
lib/nepenthes/logirc.so
lib/nepenthes/logprelude.so
lib/nepenthes/logsurfnet.so
@ -22,6 +23,8 @@ lib/nepenthes/shellemuwinnt.so
lib/nepenthes/sqlhandlerpostgres.so
lib/nepenthes/submitfile.so
lib/nepenthes/submitgotek.so
lib/nepenthes/submithttp.so
lib/nepenthes/submitmwserv.so
lib/nepenthes/submitnorman.so
lib/nepenthes/submitpostgres.so
lib/nepenthes/vulnasn1.so
@ -42,6 +45,7 @@ lib/nepenthes/vulnoptix.so
lib/nepenthes/vulnpnp.so
lib/nepenthes/vulnrealvnc.so
lib/nepenthes/vulnsasserftpd.so
lib/nepenthes/vulnsav.so
lib/nepenthes/vulnssh.so
lib/nepenthes/vulnsub7.so
lib/nepenthes/vulnupnp.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2007/04/15 11:58:25 aanriot Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/09/02 22:42:55 rui Exp $
@newgroup _nepenthes:584
@newuser _nepenthes:584:584:daemon:nepenthes user:/nonexistent:/sbin/nologin
%%SHARED%%
@ -14,6 +14,7 @@ lib/nepenthes/downloadlink.la
lib/nepenthes/downloadrcp.la
lib/nepenthes/downloadtftp.la
lib/nepenthes/logdownload.la
lib/nepenthes/loghexdump.la
lib/nepenthes/logirc.la
lib/nepenthes/logprelude.la
lib/nepenthes/logsurfnet.la
@ -27,6 +28,8 @@ lib/nepenthes/shellemuwinnt.la
lib/nepenthes/sqlhandlerpostgres.la
lib/nepenthes/submitfile.la
lib/nepenthes/submitgotek.la
lib/nepenthes/submithttp.la
lib/nepenthes/submitmwserv.la
lib/nepenthes/submitnorman.la
lib/nepenthes/submitpostgres.la
lib/nepenthes/vulnasn1.la
@ -47,6 +50,7 @@ lib/nepenthes/vulnoptix.la
lib/nepenthes/vulnpnp.la
lib/nepenthes/vulnrealvnc.la
lib/nepenthes/vulnsasserftpd.la
lib/nepenthes/vulnsav.la
lib/nepenthes/vulnssh.la
lib/nepenthes/vulnsub7.la
lib/nepenthes/vulnupnp.la
@ -83,8 +87,12 @@ 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
@ -114,8 +122,14 @@ share/examples/nepenthes/submit-file.conf
@sample ${SYSCONFDIR}/nepenthes/submit-file.conf
share/examples/nepenthes/submit-gotek.conf
@sample ${SYSCONFDIR}/nepenthes/submit-gotek.conf
share/examples/nepenthes/submit-http.conf
@sample ${SYSCONFDIR}/nepenthes/submit-http.conf
share/examples/nepenthes/submit-mwserv.conf
@sample ${SYSCONFDIR}/nepenthes/submit-mwserv.conf
share/examples/nepenthes/submit-norman.conf
@sample ${SYSCONFDIR}/nepenthes/submit-norman.conf
share/examples/nepenthes/submit-postgres.conf
@sample ${SYSCONFDIR}/nepenthes/submit-postgres.conf
share/examples/nepenthes/vuln-asn1.conf
@sample ${SYSCONFDIR}/nepenthes/vuln-asn1.conf
share/examples/nepenthes/vuln-bagle.conf