View | Details | Raw Unified | Return to bug 107916
Collapse All | Expand All

(-)nepenthes/Makefile (-3 / +5 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	nepenthes
8
PORTNAME=	nepenthes
9
PORTVERSION=	0.1.7
9
PORTVERSION=	0.2.0
10
PORTREVISION=	3
11
CATEGORIES=	net
10
CATEGORIES=	net
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	nepenthes
12
MASTER_SITE_SUBDIR=	nepenthes
Lines 26-36 Link Here
26
EXTRA_PATCHES=		${FILESDIR}/prelude_modules_log-prelude_Makefile.in.patch
25
EXTRA_PATCHES=		${FILESDIR}/prelude_modules_log-prelude_Makefile.in.patch
27
.endif
26
.endif
28
27
28
.if defined(WITH_DEBUG_LOGGING)
29
CONFIGURE_ARGS+=        --enable-debug-logging
30
.endif
31
29
USE_PERL5=	yes
32
USE_PERL5=	yes
30
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
31
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
34
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32
35
33
MAN8=		nepenthes.8
34
DOCS=		README README.VFS logo-shaded.svg
36
DOCS=		README README.VFS logo-shaded.svg
35
37
36
.include <bsd.port.pre.mk>
38
.include <bsd.port.pre.mk>
(-)nepenthes/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nepenthes-0.1.7.tar.gz) = 799c671b3aaef58087f635064b6acd61
1
MD5 (nepenthes-0.2.0.tar.gz) = 3123b62700403a8baeb597b29d075779
2
SHA256 (nepenthes-0.1.7.tar.gz) = 1347db3895ac6129b8271fb7effb061f107085fd8ab428eeab6d0fcc54edad85
2
SHA256 (nepenthes-0.2.0.tar.gz) = a33a56b791bfb71559e121175106783087ae31d147362c9f17ea11796a68938a
3
SIZE (nepenthes-0.1.7.tar.gz) = 840661
3
SIZE (nepenthes-0.2.0.tar.gz) = 913270
(-)nepenthes/files/patch-Makefile.in (-7 / +15 lines)
Lines 1-13 Link Here
1
--- Makefile.in.orig	Sun Apr 30 22:50:20 2006
1
--- Makefile.in.orig    Sun Jan 14 13:34:14 2007
2
+++ Makefile.in	Sun Apr 30 22:50:38 2006
2
+++ Makefile.in Sun Jan 14 13:34:40 2007
3
@@ -198,8 +198,8 @@
3
@@ -188,7 +188,7 @@
4
 SUBDIRS = nepenthes-core modules 
4
 build_vendor = @build_vendor@
5
 datadir = @datadir@
6
 datarootdir = @datarootdir@
7
-docdir = $(prefix)/share/doc
8
+docdir = $(prefix)/share/nepenthes
9
 dvidir = @dvidir@
10
 exec_prefix = @exec_prefix@
11
 host = @host@
12
@@ -219,7 +219,7 @@
13
 SUBDIRS = nepenthes-core modules
5
 #tools
14
 #tools
6
 EXTRA_DIST = configure.ac CHANGES doc/README.VFS doc/logo-shaded.svg doc/nepenthes.8 conf/nepenthes.conf.dist
15
 EXTRA_DIST = configure.ac CHANGES doc/README.VFS doc/logo-shaded.svg doc/nepenthes.8 conf/nepenthes.conf.dist
7
-docdir = $(prefix)/share/doc
8
-doc_DATA = doc/README.VFS doc/logo-shaded.svg
16
-doc_DATA = doc/README.VFS doc/logo-shaded.svg
9
+docdir = $(prefix)/share/nepenthes
10
+doc_DATA = README doc/README.VFS doc/logo-shaded.svg
17
+doc_DATA = README doc/README.VFS doc/logo-shaded.svg
11
 
18
12
 #sysconf_DATA = conf/nepenthes.conf.dist
19
 #sysconf_DATA = conf/nepenthes.conf.dist
13
 AM_CXXFLAGS = ''
20
 AM_CXXFLAGS = ''
21
(-)nepenthes/files/patch-conf-nepenthes.conf.dist (-31 lines)
Lines 1-31 Link Here
1
--- conf/nepenthes.conf.dist.orig	Sat Dec  3 17:23:03 2005
2
+++ conf/nepenthes.conf.dist	Sat Dec  3 17:23:56 2005
3
@@ -87,8 +87,8 @@
4
 
5
     logmanager
6
     {
7
-	ring_logging_file		"var/log/nepenthes.%d.log";
8
-	file_logging_file		"var/log/nepenthes.log";
9
+	ring_logging_file		"var/log/nepenthes/nepenthes.%d.log";
10
+	file_logging_file		"var/log/nepenthes/nepenthes.log";
11
     };
12
 
13
     modulemanager
14
@@ -100,7 +100,7 @@
15
     {
16
         strictfiletype              "1";
17
         // where does submit-file write to? set this to the same dir
18
-        filesdir                    "var/binaries/"; 
19
+        filesdir                    "var/nepenthes/binaries/"; 
20
     };
21
 
22
     downloadmanager
23
@@ -116,7 +116,7 @@
24
     
25
     utilities
26
     {
27
-	hexdump_path                "var/hexdumps/";
28
+	hexdump_path                "var/nepenthes/hexdumps/";
29
     };
30
     
31
     geolocationmanager
(-)nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp (-27 lines)
Lines 1-27 Link Here
1
--- modules/vuln-bagle/BagleDialogue.cpp.old	Sun May  7 16:07:25 2006
2
+++ modules/vuln-bagle/BagleDialogue.cpp	Sun May  7 16:08:14 2006
3
@@ -158,6 +158,7 @@
4
 				m_State = BAGLE_BINARY;
5
 				m_Download = new Download(m_Socket->getRemoteHost(),"bagle://",m_Socket->getRemoteHost(),"bagle://foo/bar");
6
 				m_Download->getDownloadBuffer()->addData(msg->getMsg()+4,msg->getSize()-4);
7
+				return CL_ASSIGN_AND_DONE;
8
 			}
9
 		}
10
 		break;
11
@@ -165,6 +166,7 @@
12
 	case BAGLE_BINARY:
13
 		// FIXME m_MaxFileSize
14
 		m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
15
+		return CL_ASSIGN_AND_DONE;
16
 		break;
17
 
18
 	}
19
@@ -232,8 +234,6 @@
20
 		if ( m_Download->getDownloadBuffer()->getSize() == m_FileSize )
21
 		{
22
 			g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
23
-			// destructor will delete it
24
-			return CL_ASSIGN_AND_DONE;
25
 		}
26
 	}
27
 	return CL_DROP;
(-)nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp (-27 lines)
Lines 1-27 Link Here
1
--- modules/vuln-mydoom/MydoomDialogue.cpp.old	Sun May  7 16:03:52 2006
2
+++ modules/vuln-mydoom/MydoomDialogue.cpp	Sun May  7 16:05:33 2006
3
@@ -120,7 +120,7 @@
4
 				m_Download = new Download(msg->getRemoteHost(),"mydoom://foo/bar",msg->getRemoteHost(),"some triggerline");
5
 				m_Download->getDownloadBuffer()->addData((char *)m_Buffer->getData(),m_Buffer->getSize());
6
 				m_Buffer->clear();
7
-				return CL_ASSIGN;
8
+				return CL_ASSIGN_AND_DONE;
9
 			}
10
 		}
11
 		if (m_Buffer->getSize() > 128 )
12
@@ -130,6 +130,7 @@
13
 	case MYDOOM_FILETRANSFERR:
14
 		{
15
 			m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
16
+			return CL_ASSIGN_AND_DONE;
17
 		}
18
 		break;
19
 
20
@@ -196,7 +197,6 @@
21
 	if (m_Download != NULL)
22
 	{
23
     	g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
24
-		return CL_ASSIGN_AND_DONE;
25
 	}
26
 	return CL_DROP;
27
 }
(-)nepenthes/files/prelude_modules_log-prelude_Makefile.in.patch (-5 / +5 lines)
Lines 1-11 Link Here
1
--- modules/log-prelude/Makefile.in.orig	Sun Apr 23 19:49:07 2006
1
--- modules/log-prelude/Makefile.in.orig    Sun Jan 14 14:09:10 2007
2
+++ modules/log-prelude/Makefile.in	Fri Oct 20 15:01:06 2006
2
+++ modules/log-prelude/Makefile.in Sun Jan 14 14:09:21 2007
3
@@ -195,7 +195,7 @@
3
@@ -216,7 +216,7 @@
4
 sysconfdir = @sysconfdir@
4
 sysconfdir = @sysconfdir@
5
 target_alias = @target_alias@
5
 target_alias = @target_alias@
6
 AUTOMAKE_OPTIONS = foreign
6
 AUTOMAKE_OPTIONS = foreign
7
-AM_CPPFLAGS = -I/usr/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
7
-AM_CPPFLAGS = -I/usr/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE $(CPPFLAG_PRELUDE)
8
+AM_CPPFLAGS = -I/usr/local/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
8
+AM_CPPFLAGS = -I/usr/local/include/libprelude -I$(top_srcdir)/nepenthes-core/include -I$(top_srcdir)/nepenthes-core/src -pipe -D _GNU_SOURCE
9
 AM_CXXFLAGS = -Wall
9
 AM_CXXFLAGS = -Wall
10
 AM_LDFLAGS = 
10
 AM_LDFLAGS = $(LDFLAG_PRELUDE) ${LIB_PRELUDE}
11
 pkglib_LTLIBRARIES = logprelude.la
11
 pkglib_LTLIBRARIES = logprelude.la
(-)nepenthes/pkg-plist (-28 / +22 lines)
Lines 3-24 Link Here
3
etc/nepenthes/download-curl.conf
3
etc/nepenthes/download-curl.conf
4
etc/nepenthes/download-ftp.conf
4
etc/nepenthes/download-ftp.conf
5
etc/nepenthes/download-link.conf
5
etc/nepenthes/download-link.conf
6
etc/nepenthes/download-nepenthes.conf
7
etc/nepenthes/download-tftp.conf
6
etc/nepenthes/download-tftp.conf
8
etc/nepenthes/geolocation-ip2location.conf
9
etc/nepenthes/log-download.conf
7
etc/nepenthes/log-download.conf
10
etc/nepenthes/log-irc.conf
8
etc/nepenthes/log-irc.conf
11
etc/nepenthes/log-prelude.conf
9
etc/nepenthes/log-prelude.conf
12
etc/nepenthes/log-surfnet.conf
10
etc/nepenthes/log-surfnet.conf
11
etc/nepenthes/module-honeytrap.conf
13
etc/nepenthes/module-portwatch.conf
12
etc/nepenthes/module-portwatch.conf
14
etc/nepenthes/nepenthes.conf
13
etc/nepenthes/nepenthes.conf
15
etc/nepenthes/nepenthes.conf.dist
14
etc/nepenthes/nepenthes.conf.dist
16
etc/nepenthes/shellcode-generic.conf
15
etc/nepenthes/shellcode-generic.conf
17
etc/nepenthes/submit-file.conf
16
etc/nepenthes/submit-file.conf
18
etc/nepenthes/submit-gotek.conf
17
etc/nepenthes/submit-gotek.conf
19
etc/nepenthes/submit-nepenthes.conf
20
etc/nepenthes/submit-norman.conf
18
etc/nepenthes/submit-norman.conf
21
etc/nepenthes/submit-xmlrpc.conf
22
etc/nepenthes/vuln-asn1.conf
19
etc/nepenthes/vuln-asn1.conf
23
etc/nepenthes/vuln-bagle.conf
20
etc/nepenthes/vuln-bagle.conf
24
etc/nepenthes/vuln-dameware.conf
21
etc/nepenthes/vuln-dameware.conf
Lines 63-86 Link Here
63
lib/nepenthes/downloadlink.a
60
lib/nepenthes/downloadlink.a
64
lib/nepenthes/downloadlink.la
61
lib/nepenthes/downloadlink.la
65
lib/nepenthes/downloadlink.so
62
lib/nepenthes/downloadlink.so
66
lib/nepenthes/downloadnepenthes.a
67
lib/nepenthes/downloadnepenthes.la
68
lib/nepenthes/downloadnepenthes.so
69
lib/nepenthes/downloadrcp.a
63
lib/nepenthes/downloadrcp.a
70
lib/nepenthes/downloadrcp.la
64
lib/nepenthes/downloadrcp.la
71
lib/nepenthes/downloadrcp.so
65
lib/nepenthes/downloadrcp.so
72
lib/nepenthes/downloadtftp.a
66
lib/nepenthes/downloadtftp.a
73
lib/nepenthes/downloadtftp.la
67
lib/nepenthes/downloadtftp.la
74
lib/nepenthes/downloadtftp.so
68
lib/nepenthes/downloadtftp.so
75
lib/nepenthes/geolocationgeoip.a
76
lib/nepenthes/geolocationgeoip.la
77
lib/nepenthes/geolocationgeoip.so
78
lib/nepenthes/geolocationhostip.a
79
lib/nepenthes/geolocationhostip.la
80
lib/nepenthes/geolocationhostip.so
81
lib/nepenthes/geolocationip2location.a
82
lib/nepenthes/geolocationip2location.la
83
lib/nepenthes/geolocationip2location.so
84
lib/nepenthes/logdownload.a
69
lib/nepenthes/logdownload.a
85
lib/nepenthes/logdownload.la
70
lib/nepenthes/logdownload.la
86
lib/nepenthes/logdownload.so
71
lib/nepenthes/logdownload.so
Lines 93-98 Link Here
93
lib/nepenthes/logsurfnet.a
78
lib/nepenthes/logsurfnet.a
94
lib/nepenthes/logsurfnet.la
79
lib/nepenthes/logsurfnet.la
95
lib/nepenthes/logsurfnet.so
80
lib/nepenthes/logsurfnet.so
81
lib/nepenthes/modulebridge.a
82
lib/nepenthes/modulebridge.la
83
lib/nepenthes/modulebridge.so
84
lib/nepenthes/modulehoneytrap.a
85
lib/nepenthes/modulehoneytrap.la
86
lib/nepenthes/modulehoneytrap.so
87
lib/nepenthes/modulepeiros.a
88
lib/nepenthes/modulepeiros.la
89
lib/nepenthes/modulepeiros.so
96
lib/nepenthes/moduleportwatch.a
90
lib/nepenthes/moduleportwatch.a
97
lib/nepenthes/moduleportwatch.la
91
lib/nepenthes/moduleportwatch.la
98
lib/nepenthes/moduleportwatch.so
92
lib/nepenthes/moduleportwatch.so
Lines 105-128 Link Here
105
lib/nepenthes/shellemuwinnt.a
99
lib/nepenthes/shellemuwinnt.a
106
lib/nepenthes/shellemuwinnt.la
100
lib/nepenthes/shellemuwinnt.la
107
lib/nepenthes/shellemuwinnt.so
101
lib/nepenthes/shellemuwinnt.so
102
lib/nepenthes/sqlhandlerpostgres.a
103
lib/nepenthes/sqlhandlerpostgres.la
104
lib/nepenthes/sqlhandlerpostgres.so
108
lib/nepenthes/submitfile.a
105
lib/nepenthes/submitfile.a
109
lib/nepenthes/submitfile.la
106
lib/nepenthes/submitfile.la
110
lib/nepenthes/submitfile.so
107
lib/nepenthes/submitfile.so
111
lib/nepenthes/submitgotek.a
108
lib/nepenthes/submitgotek.a
112
lib/nepenthes/submitgotek.la
109
lib/nepenthes/submitgotek.la
113
lib/nepenthes/submitgotek.so
110
lib/nepenthes/submitgotek.so
114
lib/nepenthes/submitnepenthes.a
115
lib/nepenthes/submitnepenthes.la
116
lib/nepenthes/submitnepenthes.so
117
lib/nepenthes/submitnorman.a
111
lib/nepenthes/submitnorman.a
118
lib/nepenthes/submitnorman.la
112
lib/nepenthes/submitnorman.la
119
lib/nepenthes/submitnorman.so
113
lib/nepenthes/submitnorman.so
120
lib/nepenthes/submitxmlrpc.a
114
lib/nepenthes/submitpostgres.a
121
lib/nepenthes/submitxmlrpc.la
115
lib/nepenthes/submitpostgres.la
122
lib/nepenthes/submitxmlrpc.so
116
lib/nepenthes/submitpostgres.so
123
lib/nepenthes/uploadhttp.a
124
lib/nepenthes/uploadhttp.la
125
lib/nepenthes/uploadhttp.so
126
lib/nepenthes/vulnasn1.a
117
lib/nepenthes/vulnasn1.a
127
lib/nepenthes/vulnasn1.la
118
lib/nepenthes/vulnasn1.la
128
lib/nepenthes/vulnasn1.so
119
lib/nepenthes/vulnasn1.so
Lines 171-176 Link Here
171
lib/nepenthes/vulnpnp.a
162
lib/nepenthes/vulnpnp.a
172
lib/nepenthes/vulnpnp.la
163
lib/nepenthes/vulnpnp.la
173
lib/nepenthes/vulnpnp.so
164
lib/nepenthes/vulnpnp.so
165
lib/nepenthes/vulnrealvnc.a
166
lib/nepenthes/vulnrealvnc.la
167
lib/nepenthes/vulnrealvnc.so
174
lib/nepenthes/vulnsasserftpd.a
168
lib/nepenthes/vulnsasserftpd.a
175
lib/nepenthes/vulnsasserftpd.la
169
lib/nepenthes/vulnsasserftpd.la
176
lib/nepenthes/vulnsasserftpd.so
170
lib/nepenthes/vulnsasserftpd.so
Lines 207-215 Link Here
207
lib/nepenthes/x6.a
201
lib/nepenthes/x6.a
208
lib/nepenthes/x6.la
202
lib/nepenthes/x6.la
209
lib/nepenthes/x6.so
203
lib/nepenthes/x6.so
210
lib/nepenthes/x8.a
204
lib/nepenthes/x9.a
211
lib/nepenthes/x8.la
205
lib/nepenthes/x9.la
212
lib/nepenthes/x8.so
206
lib/nepenthes/x9.so
213
%%DATADIR%%/README
207
%%DATADIR%%/README
214
%%DATADIR%%/README.VFS
208
%%DATADIR%%/README.VFS
215
%%DATADIR%%/logo-shaded.svg
209
%%DATADIR%%/logo-shaded.svg

Return to bug 107916