View | Details | Raw Unified | Return to bug 196801 | Differences between
and this patch

Collapse All | Expand All

(-)security/suricata/Makefile (-11 / +28 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	suricata
4
PORTNAME=	suricata
5
PORTVERSION=	2.0.5
5
PORTVERSION=	2.0.6
6
CATEGORIES=	security
6
CATEGORIES=	security
7
MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
7
MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
8
		http://mirrors.rit.edu/zi/
8
		http://mirrors.rit.edu/zi/
Lines 24-41 Link Here
24
INSTALL_TARGET=		install-strip
24
INSTALL_TARGET=		install-strip
25
PATHFIX_MAKEFILEIN=	Makefile.am
25
PATHFIX_MAKEFILEIN=	Makefile.am
26
26
27
OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NSS PORTS_PCAP PRELUDE TESTS
27
OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON LUAJIT NSS NSPR PORTS_PCAP PRELUDE SC TESTS
28
OPTIONS_DEFAULT=	HTP_PORT IPFW PRELUDE
28
OPTIONS_DEFAULT=	GEOIP HTP_PORT IPFW JSON LUAJIT NSS NSPR PRELUDE SC
29
OPTIONS_SUB=		yes
29
OPTIONS_SUB=		yes
30
30
31
GEOIP_DESC=		Enable GeoIP support
31
GEOIP_DESC=		Enable GeoIP support
32
HTP_PORT_DESC=		Use libhtp from ports
32
HTP_PORT_DESC=		Use libhtp from ports
33
IPFW_DESC=		Enable IPFW and IP Divert support for inline IDP
33
IPFW_DESC=		Enable IPFW and IP Divert support for inline IDP
34
JSON_DESC=		Enable JSON output
34
JSON_DESC=		Enable JSON output
35
NSS_DESC=		Enable file checksums and SSL/TLS fingerprinting
35
LUAJIT_DESC=		LuaJIT support
36
NSS_DESC=		NSS crypto driver support
37
NSPR_DESC=		NSPR support
36
PORTS_PCAP_DESC=	Use libpcap from ports
38
PORTS_PCAP_DESC=	Use libpcap from ports
37
PRELUDE_DESC=		Enable Prelude support for NIDS alerts
39
PRELUDE_DESC=		Enable Prelude support for NIDS alerts
38
TESTS_DESC=		Build Unit Tests
40
SC_DESC=		Build and install suricatasc
41
TESTS_DESC=		Enable unit tests in suricata binary
39
42
40
GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
43
GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
41
GEOIP_CONFIGURE_ON=		--enable-geoip
44
GEOIP_CONFIGURE_ON=		--enable-geoip
Lines 59-70 Link Here
59
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
62
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
60
63
61
JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
64
JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
62
JSON_CONFIGURE_OFF=		--with-libjansson-includes=${LOCALBASE}/include	\
65
JSON_CONFIGURE_ON=		--with-libjansson-includes=${LOCALBASE}/include \
63
				--with-libjansson-libraries=${LOCALBASE}/lib
66
				--with-libjansson-libraries=${LOCALBASE}/lib
64
67
68
LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
69
LUAJIT_CONFIGURE_ON=		--enable-luajit
70
65
NSS_LIB_DEPENDS=		libnss3.so:${PORTSDIR}/security/nss
71
NSS_LIB_DEPENDS=		libnss3.so:${PORTSDIR}/security/nss
66
NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
72
NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
67
				--with-libnss-libraries=${LOCALBASE}/lib/nss \
73
				--with-libnss-libraries=${LOCALBASE}/lib
74
75
NSPR_LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
76
NSPR_CONFIGURE_ON=		--with-libnspr-libraries=${LOCALBASE}/lib \
77
				--with-libnspr-includes=${LOCALBASE}/include/nspr
78
79
SC_USES=			python
80
SC_CONFIGURE_ENV=		ac_cv_path_HAVE_PYTHON_CONFIG=yes
81
SC_CONFIGURE_ENV_OFF=		ac_cv_path_HAVE_PYTHON_CONFIG=no
68
82
69
TESTS_CONFIGURE_ENABLE=		unittests
83
TESTS_CONFIGURE_ENABLE=		unittests
70
84
Lines 80-86 Link Here
80
		--with-libhtp-includes=${LOCALBASE}/include/ \
94
		--with-libhtp-includes=${LOCALBASE}/include/ \
81
		--with-libhtp-libraries=${LOCALBASE}/lib \
95
		--with-libhtp-libraries=${LOCALBASE}/lib \
82
		--localstatedir=/var/
96
		--localstatedir=/var/
83
CONFIGURE_ENV+=	ac_cv_path_HAVE_PYTHON_CONFIG=no
84
97
85
LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
98
LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
86
CONFIG_DIR?=	${ETCDIR}
99
CONFIG_DIR?=	${ETCDIR}
Lines 98-109 Link Here
98
pre-patch:
111
pre-patch:
99
	${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
112
	${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
100
113
101
pre-install:
102
	@${REINPLACE_CMD} -e 's|/etc/suricata|${CONFIG_DIR}|g' ${WRKSRC}/suricata.yaml
103
104
post-install:
114
post-install:
105
	${MKDIR} ${STAGEDIR}${CONFIG_DIR}
115
	${MKDIR} ${STAGEDIR}${CONFIG_DIR}
106
	${MKDIR} ${STAGEDIR}${RULES_DIR}
116
	${MKDIR} ${STAGEDIR}${RULES_DIR}
117
	${MKDIR} ${STAGEDIR}${LOGS_DIR}
107
.for f in ${CONFIG_FILES}
118
.for f in ${CONFIG_FILES}
108
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
119
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
109
.endfor
120
.endfor
Lines 111-116 Link Here
111
	${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f}
122
	${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f}
112
.endfor
123
.endfor
113
124
125
.if ${PORT_OPTIONS:MSC}
126
	(cd ${STAGEDIR}${PREFIX} \
127
	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
128
	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
129
.endif
130
114
TMPDIR?=	/tmp
131
TMPDIR?=	/tmp
115
TESTDIR=	${TMPDIR}/${PORTNAME}
132
TESTDIR=	${TMPDIR}/${PORTNAME}
116
133
(-)security/suricata/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (suricata-2.0.5.tar.gz) = 57b1120e91bd4e348e1a4cee9eb7b197d05fc25169e062f1a11f5dd4b9322c60
1
SHA256 (suricata-2.0.6.tar.gz) = e833e35ea3b6029bbdef81660af22e8f563494eac85d97618d761ce1b69c78ec
2
SIZE (suricata-2.0.5.tar.gz) = 3090118
2
SIZE (suricata-2.0.6.tar.gz) = 3090886
(-)security/suricata/files/patch-scripts_suricatasc_suricatasc.in (+11 lines)
Line 0 Link Here
1
--- scripts/suricatasc/suricatasc.in.orig	2014-12-19 17:49:20.651663649 +0200
2
+++ scripts/suricatasc/suricatasc.in	2014-12-19 17:49:59.921665563 +0200
3
@@ -24,7 +24,7 @@
4
 args = parser.parse_args()
5
 
6
 if args.socket != None:
7
-    SOCKET_PATH = "@e_localstatedir@/" + args.socket[0]
8
+    SOCKET_PATH = args.socket
9
 else:
10
     SOCKET_PATH = "@e_localstatedir@/suricata-command.socket"
11
 
(-)security/suricata/pkg-plist (-10 / +21 lines)
Lines 1-4 Link Here
1
bin/suricata
1
bin/suricata
2
%%SC%%bin/suricatasc
2
%%DOCSDIR%%/AUTHORS
3
%%DOCSDIR%%/AUTHORS
3
%%DOCSDIR%%/Basic_Setup.txt
4
%%DOCSDIR%%/Basic_Setup.txt
4
%%DOCSDIR%%/CentOS5.txt
5
%%DOCSDIR%%/CentOS5.txt
Lines 49-62 Link Here
49
%%NO_HTP_PORT%%lib/libhtp.a
50
%%NO_HTP_PORT%%lib/libhtp.a
50
%%NO_HTP_PORT%%lib/libhtp.so
51
%%NO_HTP_PORT%%lib/libhtp.so
51
%%NO_HTP_PORT%%libdata/pkgconfig/htp.pc
52
%%NO_HTP_PORT%%libdata/pkgconfig/htp.pc
52
@sample etc/suricata/suricata.yaml.sample
53
%%NO_HTP_PORT%%@dir include/htp
53
@sample etc/suricata/classification.config.sample
54
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc-0.9-py%%PYTHON_VER%%.egg-info
54
@sample etc/suricata/reference.config.sample
55
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
55
etc/suricata/rules/decoder-events.rules
56
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
56
etc/suricata/rules/dns-events.rules
57
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.py
57
etc/suricata/rules/files.rules
58
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.pyc
58
etc/suricata/rules/http-events.rules
59
@sample %%ETCDIR%%/suricata.yaml.sample
59
etc/suricata/rules/smtp-events.rules
60
@sample %%ETCDIR%%/classification.config.sample
60
etc/suricata/rules/stream-events.rules
61
@sample %%ETCDIR%%/reference.config.sample
61
etc/suricata/rules/tls-events.rules
62
%%ETCDIR%%/rules/decoder-events.rules
63
%%ETCDIR%%/rules/dns-events.rules
64
%%ETCDIR%%/rules/files.rules
65
%%ETCDIR%%/rules/http-events.rules
66
%%ETCDIR%%/rules/smtp-events.rules
67
%%ETCDIR%%/rules/stream-events.rules
68
%%ETCDIR%%/rules/tls-events.rules
62
@dir etc/suricata/rules
69
@dir etc/suricata/rules
70
@dir etc/suricata
71
@dir(root,wheel,0700) /var/log/suricata
72
@unexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/suricata`` to remove any configuration files left."; fi
73
@dir %%DOCSDIR%%

Return to bug 196801