cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.2.0, from maintainer rui reis

Browse Source
This commit is contained in:
jolan 2007-03-17 21:50:11 +00:00
parent 1c6709e0e4
commit 9723ad7c84
14 changed files with 68 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/nepenthes/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2006/08/01 10:50:19 espie Exp $
# $OpenBSD: Makefile,v 1.8 2007/03/17 21:50:11 jolan Exp $
SHARED_ONLY= Yes
COMMENT= "determine the malware activity on a network"
DISTNAME= nepenthes-0.1.7
PKGNAME= ${DISTNAME}p2
DISTNAME= nepenthes-0.2.0
CATEGORIES= net
HOMEPAGE= http://nepenthes.mwcollect.org/
@ -24,21 +23,20 @@ LIBTOOL_FLAGS+= --tag=disable-static
LIB_DEPENDS= adns.>=1::net/adns \
curl.>=3.3::net/curl \
GeoIP.>=4::net/GeoIP \
magic.>=1::devel/libmagic \
pcre.>=1::devel/pcre
WANTLIB= c crypto m ssl stdc++ z
WANTLIB= c crypto m ssl stdc++ pcap z
FAKE_FLAGS+= localstatedir='/var/nepenthes' \
sysconfdir='${PREFIX}/share/examples'
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS+=--disable-geolocation-ip2location \
CONFIGURE_ARGS+=--enable-debug-logging \
--disable-mysql \
--disable-postgre \
--enable-geolocation \
--disable-capabilities \
--localstatedir='/var/nepenthes' \
--with-curl-lib=${PREFIX}/lib
@ -49,5 +47,7 @@ pre-configure:
${WRKBUILD}/conf/nepenthes.conf.dist
@perl -pi -e 's:\"var\/log:\"\/var\/nepenthes\/log:g' \
${WRKBUILD}/modules/log-download/log-download.conf.dist
@perl -pi -e 's:\"var\/binaries:\"/var\/nepenthes\/binaries:g' \
${WRKBUILD}/modules/submit-file/submit-file.conf.dist
.include <bsd.port.mk>

9
net/nepenthes/distinfo
View File

@ -1,4 +1,5 @@
MD5 (nepenthes-0.1.7.tar.gz) = 799c671b3aaef58087f635064b6acd61
RMD160 (nepenthes-0.1.7.tar.gz) = 847309634b8a1bbad75e8d43f5110e9ae83b1fb7
SHA1 (nepenthes-0.1.7.tar.gz) = ab3d8fe00128b34deff3d31ae578c8aeedb49231
SIZE (nepenthes-0.1.7.tar.gz) = 840661
MD5 (nepenthes-0.2.0.tar.gz) = 3123b62700403a8baeb597b29d075779
RMD160 (nepenthes-0.2.0.tar.gz) = bd6cc0d7b68b59b80c7b2914db10b275156aabec
SHA1 (nepenthes-0.2.0.tar.gz) = 73744ab4d3744877916cee5bd1d8e9e7e3b433d5
SHA256 (nepenthes-0.2.0.tar.gz) = a33a56b791bfb71559e121175106783087ae31d147362c9f17ea11796a68938a
SIZE (nepenthes-0.2.0.tar.gz) = 913270

26
net/nepenthes/patches/patch-Makefile_in
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-Makefile_in,v 1.2 2006/04/26 19:06:17 jolan Exp $
--- Makefile.in.orig Wed Apr 26 18:47:56 2006
+++ Makefile.in Wed Apr 26 18:49:51 2006
@@ -198,7 +198,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.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@
-docdir = $(prefix)/share/doc
+docdir = $(prefix)/share/doc/nepenthes
doc_DATA = doc/README.VFS doc/logo-shaded.svg
#sysconf_DATA = conf/nepenthes.conf.dist
@@ -691,19 +691,9 @@ install-data-local:
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
@@ -711,21 +711,9 @@ install-data-local:
$(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/geolocation
- $(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
@ -25,7 +25,9 @@ $OpenBSD: patch-Makefile_in,v 1.2 2006/04/26 19:06:17 jolan Exp $
- $(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.

10
net/nepenthes/patches/patch-modules_geolocation-geoip_geolocation-geoip_cpp
View File

@ -1,10 +0,0 @@
--- modules/geolocation-geoip/geolocation-geoip.cpp.orig Fri Mar 24 23:41:35 2006
+++ modules/geolocation-geoip/geolocation-geoip.cpp Fri Mar 24 23:38:53 2006
@@ -32,6 +32,7 @@
#ifdef HAVE_GEOLOCATION
#include <ctype.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

11
net/nepenthes/patches/patch-modules_geolocation-hostip_GeoDialogue_cpp
View File

@ -1,11 +0,0 @@
--- modules/geolocation-hostip/GeoDialogue.cpp.orig Fri Mar 24 23:24:57 2006
+++ modules/geolocation-hostip/GeoDialogue.cpp Fri Mar 24 23:23:47 2006
@@ -32,7 +32,7 @@
#ifdef HAVE_GEOLOCATION
#include <ctype.h>
-#include <ctype.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

28
net/nepenthes/patches/patch-modules_geolocation-hostip_geolocation-hostip_cpp
View File

@ -1,28 +0,0 @@
--- modules/geolocation-hostip/geolocation-hostip.cpp.orig Fri Dec 16 09:15:14 2005
+++ modules/geolocation-hostip/geolocation-hostip.cpp Wed Apr 5 03:16:56 2006
@@ -32,6 +32,7 @@
#ifdef HAVE_GEOLOCATION
#include <ctype.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -213,7 +214,7 @@ void GeoLocationHostIp::downloadSuccess(
if (test[2].m_Value != NULL)
{
- len = strtof(test[2].m_Value,NULL);
+ len = (float)strtod(test[2].m_Value,NULL);
}else
{
len = 0.0;
@@ -221,7 +222,7 @@ void GeoLocationHostIp::downloadSuccess(
if (test[3].m_Value != NULL)
{
- lat = strtof(test[3].m_Value,NULL);
+ lat = (float)strtod(test[3].m_Value,NULL);
}else
{
lat = 0.0;

10
net/nepenthes/patches/patch-modules_geolocation-ip2location_geolocation-ip2location_cpp
View File

@ -1,10 +0,0 @@
--- modules/geolocation-ip2location/geolocation-ip2location.cpp.orig Fri Mar 24 23:48:14 2006
+++ modules/geolocation-ip2location/geolocation-ip2location.cpp Fri Mar 24 23:46:30 2006
@@ -32,6 +32,7 @@
#ifdef HAVE_GEOLOCATION
#include <ctype.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

11
net/nepenthes/patches/patch-modules_module-peiros_module-peiros_cpp Normal file
View File

@ -0,0 +1,11 @@
$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>

12
net/nepenthes/patches/patch-modules_shellcode-signatures_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_shellcode-signatures_Makefile_in,v 1.1 2007/03/17 21:50:11 jolan Exp $
--- modules/shellcode-signatures/Makefile.in.orig Wed Nov 15 21:51:52 2006
+++ modules/shellcode-signatures/Makefile.in Wed Nov 15 21:52:57 2006
@@ -233,7 +233,7 @@ AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS = -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
AM_CXXFLAGS = -Wall -Werror
AM_CFLAGS = -Wall
-AM_LDFLAGS = ${LIB_PCRE} @LEXLIB@ ${LIB_LIBY}
+AM_LDFLAGS = ${LIB_PCRE}
AM_YFLAGS = -d
pkglib_LTLIBRARIES = shellcodesignatures.la
shellcodesignatures_la_SOURCES = shellcode-signatures.sc \

28
net/nepenthes/patches/patch-modules_vuln-bagle_BagleDialogue_cpp
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-modules_vuln-bagle_BagleDialogue_cpp,v 1.1 2006/05/05 22:58:45 jolan Exp $
--- modules/vuln-bagle/BagleDialogue.cpp.orig Fri May 5 23:42:58 2006
+++ modules/vuln-bagle/BagleDialogue.cpp Fri May 5 23:44:49 2006
@@ -158,6 +158,7 @@ ConsumeLevel BagleDialogue::incomingData
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 @@ ConsumeLevel BagleDialogue::incomingData
case BAGLE_BINARY:
// FIXME m_MaxFileSize
m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
+ return CL_ASSIGN_AND_DONE;
break;
}
@@ -232,8 +234,6 @@ ConsumeLevel BagleDialogue::connectionSh
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;

28
net/nepenthes/patches/patch-modules_vuln-mydoom_MydoomDialogue_cpp
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-modules_vuln-mydoom_MydoomDialogue_cpp,v 1.1 2006/05/05 22:58:45 jolan Exp $
--- modules/vuln-mydoom/MydoomDialogue.cpp.orig Fri May 5 23:40:18 2006
+++ modules/vuln-mydoom/MydoomDialogue.cpp Fri May 5 23:42:23 2006
@@ -120,7 +120,7 @@ ConsumeLevel MydoomDialogue::incomingDat
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 @@ ConsumeLevel MydoomDialogue::incomingDat
case MYDOOM_FILETRANSFERR:
{
m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
+ return CL_ASSIGN_AND_DONE;
}
break;
@@ -196,7 +197,6 @@ ConsumeLevel MydoomDialogue::connectionS
if (m_Download != NULL)
{
g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
- return CL_ASSIGN_AND_DONE;
}
return CL_DROP;
}

11
net/nepenthes/patches/patch-nepenthes-core_src_GeoLocationManager_cpp
View File

@ -1,11 +0,0 @@
--- nepenthes-core/src/GeoLocationManager.cpp.orig Mon Oct 31 09:47:28 2005
+++ nepenthes-core/src/GeoLocationManager.cpp Wed Apr 5 03:16:56 2006
@@ -31,7 +31,7 @@
#ifdef HAVE_GEOLOCATION
-
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

17
net/nepenthes/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/04/26 19:06:17 jolan Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/17 21:50:11 jolan Exp $
lib/nepenthes/dnsresolveadns.so
lib/nepenthes/downloadcreceive.so
lib/nepenthes/downloadcsend.so
@ -6,26 +6,24 @@ lib/nepenthes/downloadcurl.so
lib/nepenthes/downloadftp.so
lib/nepenthes/downloadhttp.so
lib/nepenthes/downloadlink.so
lib/nepenthes/downloadnepenthes.so
lib/nepenthes/downloadrcp.so
lib/nepenthes/downloadtftp.so
lib/nepenthes/geolocationgeoip.so
lib/nepenthes/geolocationhostip.so
lib/nepenthes/geolocationip2location.so
lib/nepenthes/logdownload.so
lib/nepenthes/logirc.so
lib/nepenthes/logprelude.so
lib/nepenthes/logsurfnet.so
lib/nepenthes/modulebridge.so
lib/nepenthes/modulehoneytrap.so
lib/nepenthes/modulepeiros.so
lib/nepenthes/moduleportwatch.so
lib/nepenthes/shellcodegeneric.so
lib/nepenthes/shellcodesignatures.so
lib/nepenthes/shellemuwinnt.so
lib/nepenthes/sqlhandlerpostgres.so
lib/nepenthes/submitfile.so
lib/nepenthes/submitgotek.so
lib/nepenthes/submitnepenthes.so
lib/nepenthes/submitnorman.so
lib/nepenthes/submitxmlrpc.so
lib/nepenthes/uploadhttp.so
lib/nepenthes/submitpostgres.so
lib/nepenthes/vulnasn1.so
lib/nepenthes/vulnbagle.so
lib/nepenthes/vulndameware.so
@ -42,6 +40,7 @@ lib/nepenthes/vulnnetbiosname.so
lib/nepenthes/vulnnetdde.so
lib/nepenthes/vulnoptix.so
lib/nepenthes/vulnpnp.so
lib/nepenthes/vulnrealvnc.so
lib/nepenthes/vulnsasserftpd.so
lib/nepenthes/vulnssh.so
lib/nepenthes/vulnsub7.so
@ -54,4 +53,4 @@ lib/nepenthes/x3.so
lib/nepenthes/x4.so
lib/nepenthes/x5.so
lib/nepenthes/x6.so
lib/nepenthes/x8.so
lib/nepenthes/x9.so

29
net/nepenthes/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2006/04/26 19:06:17 jolan Exp $
@comment $OpenBSD: PLIST,v 1.3 2007/03/17 21:50:11 jolan Exp $
%%SHARED%%
bin/nepenthes
lib/nepenthes/
@ -9,26 +9,24 @@ lib/nepenthes/downloadcurl.la
lib/nepenthes/downloadftp.la
lib/nepenthes/downloadhttp.la
lib/nepenthes/downloadlink.la
lib/nepenthes/downloadnepenthes.la
lib/nepenthes/downloadrcp.la
lib/nepenthes/downloadtftp.la
lib/nepenthes/geolocationgeoip.la
lib/nepenthes/geolocationhostip.la
lib/nepenthes/geolocationip2location.la
lib/nepenthes/logdownload.la
lib/nepenthes/logirc.la
lib/nepenthes/logprelude.la
lib/nepenthes/logsurfnet.la
lib/nepenthes/modulebridge.la
lib/nepenthes/modulehoneytrap.la
lib/nepenthes/modulepeiros.la
lib/nepenthes/moduleportwatch.la
lib/nepenthes/shellcodegeneric.la
lib/nepenthes/shellcodesignatures.la
lib/nepenthes/shellemuwinnt.la
lib/nepenthes/sqlhandlerpostgres.la
lib/nepenthes/submitfile.la
lib/nepenthes/submitgotek.la
lib/nepenthes/submitnepenthes.la
lib/nepenthes/submitnorman.la
lib/nepenthes/submitxmlrpc.la
lib/nepenthes/uploadhttp.la
lib/nepenthes/submitpostgres.la
lib/nepenthes/vulnasn1.la
lib/nepenthes/vulnbagle.la
lib/nepenthes/vulndameware.la
@ -45,6 +43,7 @@ lib/nepenthes/vulnnetbiosname.la
lib/nepenthes/vulnnetdde.la
lib/nepenthes/vulnoptix.la
lib/nepenthes/vulnpnp.la
lib/nepenthes/vulnrealvnc.la
lib/nepenthes/vulnsasserftpd.la
lib/nepenthes/vulnssh.la
lib/nepenthes/vulnsub7.la
@ -57,7 +56,7 @@ lib/nepenthes/x3.la
lib/nepenthes/x4.la
lib/nepenthes/x5.la
lib/nepenthes/x6.la
lib/nepenthes/x8.la
lib/nepenthes/x9.la
@man man/man8/nepenthes.8
share/doc/nepenthes/
share/doc/nepenthes/README.VFS
@ -72,12 +71,8 @@ share/examples/nepenthes/download-ftp.conf
@sample ${SYSCONFDIR}/nepenthes/download-ftp.conf
share/examples/nepenthes/download-link.conf
@sample ${SYSCONFDIR}/nepenthes/download-link.conf
share/examples/nepenthes/download-nepenthes.conf
@sample ${SYSCONFDIR}/nepenthes/download-nepenthes.conf
share/examples/nepenthes/download-tftp.conf
@sample ${SYSCONFDIR}/nepenthes/download-tftp.conf
share/examples/nepenthes/geolocation-ip2location.conf
@sample ${SYSCONFDIR}/nepenthes/geolocation-ip2location.conf
share/examples/nepenthes/log-download.conf
@sample ${SYSCONFDIR}/nepenthes/log-download.conf
share/examples/nepenthes/log-irc.conf
@ -86,6 +81,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-honeytrap.conf
@sample ${SYSCONFDIR}/nepenthes/module-honeytrap.conf
share/examples/nepenthes/module-portwatch.conf
@sample ${SYSCONFDIR}/nepenthes/module-portwatch.conf
share/examples/nepenthes/nepenthes.conf
@ -97,12 +94,8 @@ 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-nepenthes.conf
@sample ${SYSCONFDIR}/nepenthes/submit-nepenthes.conf
share/examples/nepenthes/submit-norman.conf
@sample ${SYSCONFDIR}/nepenthes/submit-norman.conf
share/examples/nepenthes/submit-xmlrpc.conf
@sample ${SYSCONFDIR}/nepenthes/submit-xmlrpc.conf
share/examples/nepenthes/vuln-asn1.conf
@sample ${SYSCONFDIR}/nepenthes/vuln-asn1.conf
share/examples/nepenthes/vuln-bagle.conf
@ -149,7 +142,6 @@ share/examples/nepenthes/vuln-wins.conf
@sample ${SYSCONFDIR}/nepenthes/vuln-wins.conf
share/examples/nepenthes/x-2.conf
@sample ${SYSCONFDIR}/nepenthes/x-2.conf
@extraunexec rm -fr /var/nepenthes/
@sample /var/nepenthes/
@sample /var/nepenthes/binaries/
@sample /var/nepenthes/cache/
@ -163,3 +155,4 @@ share/examples/nepenthes/shellcode-signatures.sc
@sample /var/nepenthes/spool/
@sample /var/nepenthes/spool/nepenthes/
@sample /var/nepenthes/spool/nepenthes/gotek/
@extraunexec rm -fr /var/nepenthes/