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

Collapse All | Expand All

(-)b/security/suricata/Makefile (-22 / +16 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	suricata
4
PORTNAME=	suricata
5
DISTVERSION=	4.0.5
5
DISTVERSION=	4.1.0-rc2
6
CATEGORIES=	security
6
CATEGORIES=	security
7
MASTER_SITES=	http://www.openinfosecfoundation.org/download/
7
MASTER_SITES=	http://www.openinfosecfoundation.org/download/
8
8
Lines 12-22 COMMENT= High Performance Network IDS, IPS and Security Monitoring engine Link Here
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
LICENSE_FILE=	${WRKSRC}/LICENSE
13
LICENSE_FILE=	${WRKSRC}/LICENSE
14
14
15
CONFLICTS_INSTALL=libhtp
16
15
LIB_DEPENDS=	libpcre.so:devel/pcre \
17
LIB_DEPENDS=	libpcre.so:devel/pcre \
16
		libnet.so:net/libnet \
18
		libnet.so:net/libnet \
19
		liblz4.so:archivers/liblz4 \
17
		libyaml.so:textproc/libyaml
20
		libyaml.so:textproc/libyaml
18
21
19
USES=		autoreconf cpe gmake libtool pathfix pkgconfig
22
USES=		autoreconf cpe gmake iconv:translit libtool pathfix pkgconfig
20
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
21
USE_RC_SUBR=	${PORTNAME}
24
USE_RC_SUBR=	${PORTNAME}
22
25
Lines 27-34 CPE_VENDOR= openinfosecfoundation Link Here
27
INSTALL_TARGET=		install-strip
30
INSTALL_TARGET=		install-strip
28
TEST_TARGET=		check
31
TEST_TARGET=		check
29
32
30
OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \
33
OPTIONS_DEFINE=		GEOIP IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \
31
			REDIS SC TESTS
34
			REDIS RUST SC TESTS
32
OPTIONS_DEFINE_amd64=	HYPERSCAN
35
OPTIONS_DEFINE_amd64=	HYPERSCAN
33
OPTIONS_DEFAULT=	IPFW JSON NETMAP PRELUDE
36
OPTIONS_DEFAULT=	IPFW JSON NETMAP PRELUDE
34
OPTIONS_SUB=		yes
37
OPTIONS_SUB=		yes
Lines 40-68 SCRIPTS_DESC= Scripting Link Here
40
43
41
GEOIP_DESC=		GeoIP support
44
GEOIP_DESC=		GeoIP support
42
HYPERSCAN_DESC=		Hyperscan support
45
HYPERSCAN_DESC=		Hyperscan support
43
HTP_PORT_DESC=		Use libhtp from ports
44
IPFW_DESC=		IPFW and IP Divert support for inline IDP
46
IPFW_DESC=		IPFW and IP Divert support for inline IDP
45
JSON_DESC=		JSON output support
47
JSON_DESC=		JSON output support
46
LUA_DESC=		LUA scripting support
47
LUAJIT_DESC=		LuaJIT scripting support
48
LUAJIT_DESC=		LuaJIT scripting support
49
LUA_DESC=		LUA scripting support
48
NETMAP_DESC=		Netmap support for inline IDP
50
NETMAP_DESC=		Netmap support for inline IDP
49
NSS_DESC=		File checksums and SSL/TLS fingerprinting
51
NSS_DESC=		File checksums and SSL/TLS fingerprinting
50
PORTS_PCAP_DESC=	Use libpcap from ports
52
PORTS_PCAP_DESC=	Use libpcap from ports
51
PRELUDE_DESC=		Prelude support for NIDS alerts
53
PRELUDE_DESC=		Prelude support for NIDS alerts
52
REDIS_DESC=		Redis output support
54
REDIS_DESC=		Redis output support
55
RUST_DESC=		Rust parser support
53
SC_DESC=		Suricata socket client (suricatasc)
56
SC_DESC=		Suricata socket client (suricatasc)
54
TESTS_DESC=		Unit tests in suricata binary
57
TESTS_DESC=		Unit tests in suricata binary
55
58
56
GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
59
GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
57
GEOIP_CONFIGURE_ON=		--enable-geoip
60
GEOIP_CONFIGURE_ON=		--enable-geoip
58
61
59
HTP_PORT_BUILD_DEPENDS=		libhtp>=0.5.27:devel/libhtp
60
HTP_PORT_LIB_DEPENDS=		libhtp.so:devel/libhtp
61
HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
62
HTP_PORT_CONFIGURE_OFF=		--enable-bundled-htp
63
HTP_PORT_CONFLICTS_INSTALL_OFF=	libhtp
64
HTP_PORT_USES_OFF=		iconv:translit
65
66
HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
62
HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
67
HYPERSCAN_CONFIGURE_ON=		--with-libhs-includes=${LOCALBASE}/include \
63
HYPERSCAN_CONFIGURE_ON=		--with-libhs-includes=${LOCALBASE}/include \
68
				--with-libhs-libraries=${LOCALBASE}/lib
64
				--with-libhs-libraries=${LOCALBASE}/lib
Lines 83-89 LUAJIT_CONFIGURE_ON= --enable-luajit Link Here
83
79
84
NSS_LIB_DEPENDS=		libnss3.so:security/nss \
80
NSS_LIB_DEPENDS=		libnss3.so:security/nss \
85
				libnspr4.so:devel/nspr
81
				libnspr4.so:devel/nspr
86
NSS_CONFIGURE_OFF=		--disable-nss --disable-nspr
87
NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
82
NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
88
				--with-libnss-libraries=${LOCALBASE}/lib \
83
				--with-libnss-libraries=${LOCALBASE}/lib \
89
				--with-libnspr-libraries=${LOCALBASE}/lib \
84
				--with-libnspr-libraries=${LOCALBASE}/lib \
Lines 110-115 REDIS_CONFIGURE_ON= --enable-hiredis \ Link Here
110
				--with-libhiredis-includes=${LOCALBASE}/include \
105
				--with-libhiredis-includes=${LOCALBASE}/include \
111
				--with-libhiredis-libraries=${LOCALBASE}/lib
106
				--with-libhiredis-libraries=${LOCALBASE}/lib
112
107
108
RUST_BUILD_DEPENDS=		rustc:lang/rust
109
RUST_CONFIGURE_ENABLE=		rust
110
113
SC_USES=			python:2.7
111
SC_USES=			python:2.7
114
SC_CONFIGURE_ENABLE=		python
112
SC_CONFIGURE_ENABLE=		python
115
113
Lines 118-123 TESTS_CONFIGURE_ENABLE= unittests Link Here
118
SUB_FILES=	pkg-message
116
SUB_FILES=	pkg-message
119
117
120
CONFIGURE_ARGS+=--enable-gccprotect \
118
CONFIGURE_ARGS+=--enable-gccprotect \
119
		--enable-bundled-htp \
121
		--with-libpcre-includes=${LOCALBASE}/include \
120
		--with-libpcre-includes=${LOCALBASE}/include \
122
		--with-libpcre-libraries=${LOCALBASE}/lib \
121
		--with-libpcre-libraries=${LOCALBASE}/lib \
123
		--with-libyaml-includes=${LOCALBASE}/include \
122
		--with-libyaml-includes=${LOCALBASE}/include \
Lines 130-154 CONFIGURE_ARGS+=--enable-gccprotect \ Link Here
130
129
131
CONFIG_DIR?=	${ETCDIR}
130
CONFIG_DIR?=	${ETCDIR}
132
CONFIG_FILES=	suricata.yaml classification.config reference.config threshold.config
131
CONFIG_FILES=	suricata.yaml classification.config reference.config threshold.config
133
RULES_DIR=	${CONFIG_DIR}/rules
134
RULES_FILES=	app-layer-events.rules decoder-events.rules dns-events.rules files.rules \
135
		http-events.rules modbus-events.rules smtp-events.rules stream-events.rules \
136
		tls-events.rules
137
LOGS_DIR?=	/var/log/${PORTNAME}
132
LOGS_DIR?=	/var/log/${PORTNAME}
138
133
139
pre-patch:
134
pre-patch:
140
	@${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
135
	@${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
141
136
137
post-patch-NSS-off:
138
	@${REINPLACE_CMD} -e 's|PKG_CHECK_MODULES(\[libnspr\]|#&| ; s|AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no")|#&|' ${WRKSRC}/configure.ac
139
142
post-install:
140
post-install:
143
	@${MKDIR} ${STAGEDIR}${CONFIG_DIR}
141
	@${MKDIR} ${STAGEDIR}${CONFIG_DIR}
144
	@${MKDIR} ${STAGEDIR}${RULES_DIR}
145
	@${MKDIR} ${STAGEDIR}${LOGS_DIR}
142
	@${MKDIR} ${STAGEDIR}${LOGS_DIR}
146
.for f in ${CONFIG_FILES}
143
.for f in ${CONFIG_FILES}
147
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
144
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
148
.endfor
145
.endfor
149
.for f in ${RULES_FILES}
150
	${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f}
151
.endfor
152
146
153
post-install-SC-on:
147
post-install-SC-on:
154
	(cd ${STAGEDIR}${PREFIX} \
148
	(cd ${STAGEDIR}${PREFIX} \
(-)b/security/suricata/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1532091141
1
TIMESTAMP = 1539758499
2
SHA256 (suricata-4.0.5.tar.gz) = 74dacb4359d57fbd3452e384eeeb1dd77b6ae00f02e9994ad5a7b461d5f4c6c2
2
SHA256 (suricata-4.1.0-rc2.tar.gz) = 9a329b3b15fcfec87947f29ced6bb151812f7e4e70758412d5dc90b6e894c1c7
3
SIZE (suricata-4.0.5.tar.gz) = 12494906
3
SIZE (suricata-4.1.0-rc2.tar.gz) = 15397231
(-)b/security/suricata/pkg-plist (-53 / +41 lines)
Lines 1-77 Link Here
1
bin/suricata
1
bin/suricata
2
include/htp/bstr.h
3
include/htp/bstr_builder.h
4
include/htp/htp.h
5
include/htp/htp_base64.h
6
include/htp/htp_config.h
7
include/htp/htp_connection_parser.h
8
include/htp/htp_core.h
9
include/htp/htp_decompressors.h
10
include/htp/htp_hooks.h
11
include/htp/htp_list.h
12
include/htp/htp_multipart.h
13
include/htp/htp_table.h
14
include/htp/htp_transaction.h
15
include/htp/htp_urlencoded.h
16
include/htp/htp_utf8_decoder.h
17
include/htp/htp_version.h
18
lib/libhtp.a
19
lib/libhtp.so
20
lib/libhtp.so.2
21
lib/libhtp.so.2.0.0
22
libdata/pkgconfig/htp.pc
2
man/man1/suricata.1.gz
23
man/man1/suricata.1.gz
3
%%SC%%bin/suricatasc
24
%%SC%%bin/suricatasc
4
%%DOCSDIR%%/AUTHORS
25
%%DOCSDIR%%/AUTHORS
5
%%DOCSDIR%%/Basic_Setup.txt
26
%%DOCSDIR%%/Basic_Setup.txt
6
%%DOCSDIR%%/CentOS5.txt
7
%%DOCSDIR%%/CentOS_56_Installation.txt
8
%%DOCSDIR%%/Debian_Installation.txt
9
%%DOCSDIR%%/Fedora_Core.txt
10
%%DOCSDIR%%/FreeBSD_8.txt
11
%%DOCSDIR%%/GITGUIDE
27
%%DOCSDIR%%/GITGUIDE
12
%%DOCSDIR%%/HTP_library_installation.txt
13
%%DOCSDIR%%/INSTALL
28
%%DOCSDIR%%/INSTALL
14
%%DOCSDIR%%/INSTALL.PF_RING
29
%%DOCSDIR%%/INSTALL.PF_RING
15
%%DOCSDIR%%/INSTALL.WINDOWS
30
%%DOCSDIR%%/INSTALL.WINDOWS
16
%%DOCSDIR%%/Installation_from_GIT_with_PCRE-JIT.txt
17
%%DOCSDIR%%/Installation_from_GIT_with_PF_RING_on_Ubuntu_server_1104.txt
18
%%DOCSDIR%%/Installation_with_CUDA_and_PFRING_on_Scientific_Linux_6.txt
19
%%DOCSDIR%%/Installation_with_CUDA_and_PF_RING_on_Ubuntu_server_1104.txt
20
%%DOCSDIR%%/Installation_with_CUDA_on_Scientific_Linux_6.txt
21
%%DOCSDIR%%/Installation_with_CUDA_on_Ubuntu_server_1104.txt
22
%%DOCSDIR%%/Installation_with_PF_RING.txt
23
%%DOCSDIR%%/Mac_OS_X_106x.txt
24
%%DOCSDIR%%/NEWS
31
%%DOCSDIR%%/NEWS
25
%%DOCSDIR%%/OpenBSD_Installation_from_GIT.txt
26
%%DOCSDIR%%/README
32
%%DOCSDIR%%/README
27
%%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt
33
%%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt
28
%%DOCSDIR%%/TODO
34
%%DOCSDIR%%/TODO
29
%%DOCSDIR%%/Third_Party_Installation_Guides.txt
35
%%DOCSDIR%%/Third_Party_Installation_Guides.txt
30
%%DOCSDIR%%/Ubuntu_Installation.txt
31
%%DOCSDIR%%/Ubuntu_Installation_from_GIT.txt
32
%%DOCSDIR%%/Windows.txt
33
%%NO_HTP_PORT%%include/htp/bstr.h
34
%%NO_HTP_PORT%%include/htp/bstr_builder.h
35
%%NO_HTP_PORT%%include/htp/htp.h
36
%%NO_HTP_PORT%%include/htp/htp_base64.h
37
%%NO_HTP_PORT%%include/htp/htp_config.h
38
%%NO_HTP_PORT%%include/htp/htp_connection_parser.h
39
%%NO_HTP_PORT%%include/htp/htp_core.h
40
%%NO_HTP_PORT%%include/htp/htp_decompressors.h
41
%%NO_HTP_PORT%%include/htp/htp_hooks.h
42
%%NO_HTP_PORT%%include/htp/htp_list.h
43
%%NO_HTP_PORT%%include/htp/htp_multipart.h
44
%%NO_HTP_PORT%%include/htp/htp_table.h
45
%%NO_HTP_PORT%%include/htp/htp_transaction.h
46
%%NO_HTP_PORT%%include/htp/htp_urlencoded.h
47
%%NO_HTP_PORT%%include/htp/htp_utf8_decoder.h
48
%%NO_HTP_PORT%%include/htp/htp_version.h
49
%%NO_HTP_PORT%%lib/libhtp.a
50
%%NO_HTP_PORT%%lib/libhtp.so
51
%%NO_HTP_PORT%%lib/libhtp.so.2
52
%%NO_HTP_PORT%%lib/libhtp.so.2.0.0
53
%%NO_HTP_PORT%%libdata/pkgconfig/htp.pc
54
%%NO_HTP_PORT%%@dir include/htp
55
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc-0.9-py%%PYTHON_VER%%.egg-info
36
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc-0.9-py%%PYTHON_VER%%.egg-info
56
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
37
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
57
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
38
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
58
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.py
39
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.py
59
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.pyc
40
%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.pyc
60
@sample %%ETCDIR%%/suricata.yaml.sample
61
@sample %%ETCDIR%%/classification.config.sample
41
@sample %%ETCDIR%%/classification.config.sample
62
@sample %%ETCDIR%%/reference.config.sample
42
@sample %%ETCDIR%%/reference.config.sample
43
@sample %%ETCDIR%%/suricata.yaml.sample
63
@sample %%ETCDIR%%/threshold.config.sample
44
@sample %%ETCDIR%%/threshold.config.sample
64
%%ETCDIR%%/rules/app-layer-events.rules
45
%%DATADIR%%/rules/app-layer-events.rules
65
%%ETCDIR%%/rules/decoder-events.rules
46
%%DATADIR%%/rules/decoder-events.rules
66
%%ETCDIR%%/rules/dns-events.rules
47
%%DATADIR%%/rules/dnp3-events.rules
67
%%ETCDIR%%/rules/files.rules
48
%%DATADIR%%/rules/dns-events.rules
68
%%ETCDIR%%/rules/http-events.rules
49
%%DATADIR%%/rules/files.rules
69
%%ETCDIR%%/rules/modbus-events.rules
50
%%DATADIR%%/rules/http-events.rules
70
%%ETCDIR%%/rules/smtp-events.rules
51
%%DATADIR%%/rules/ipsec-events.rules
71
%%ETCDIR%%/rules/stream-events.rules
52
%%DATADIR%%/rules/kerberos-events.rules
72
%%ETCDIR%%/rules/tls-events.rules
53
%%DATADIR%%/rules/modbus-events.rules
73
@dir etc/suricata/rules
54
%%DATADIR%%/rules/nfs-events.rules
74
@dir etc/suricata
55
%%DATADIR%%/rules/ntp-events.rules
56
%%DATADIR%%/rules/smb-events.rules
57
%%DATADIR%%/rules/smtp-events.rules
58
%%DATADIR%%/rules/stream-events.rules
59
%%DATADIR%%/rules/tls-events.rules
60
@dir %%DATADIR%%
61
@dir %%ETCDIR%%
62
@dir include/htp
75
@dir(root,wheel,0700) /var/log/suricata
63
@dir(root,wheel,0700) /var/log/suricata
76
@postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/etc/suricata`` to remove configuration files."; fi
64
@postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/%%ETCDIR%%`` to remove configuration files."; fi
77
@dir %%DOCSDIR%%
65
@dir %%DOCSDIR%%

Return to bug 231839