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

Collapse All | Expand All

(-)suricata/Makefile (-5 / +22 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	suricata
4
PORTNAME=	suricata
5
PORTVERSION=	2.0.3
5
PORTVERSION=	2.0.3
6
PORTREVISION=	1
6
CATEGORIES=	security
7
CATEGORIES=	security
7
MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
8
MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
8
		http://mirrors.rit.edu/zi/
9
		http://mirrors.rit.edu/zi/
Lines 13-32 Link Here
13
LICENSE=	GPLv2
14
LICENSE=	GPLv2
14
15
15
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
16
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
16
		libhtp.so:${PORTSDIR}/devel/libhtp \
17
		libnet.so:${PORTSDIR}/net/libnet \
17
		libnet.so:${PORTSDIR}/net/libnet \
18
		libyaml.so:${PORTSDIR}/textproc/libyaml
18
		libyaml.so:${PORTSDIR}/textproc/libyaml
19
19
20
OPTIONS_DEFINE=	IPFW PRELUDE PORTS_PCAP TESTS
20
OPTIONS_DEFINE=	IPFW PRELUDE PORTS_PCAP TESTS JSON GEOIP HTP_PORT
21
OPTIONS_DEFAULT=IPFW PRELUDE
21
OPTIONS_DEFAULT=IPFW PRELUDE HTP_PORT
22
OPTIONS_SUB=	yes
22
OPTIONS_SUB=	yes
23
23
24
IPFW_DESC=	Enable IPFW and IP Divert support for inline IDP
24
IPFW_DESC=	Enable IPFW and IP Divert support for inline IDP
25
PRELUDE_DESC=	Enable Prelude support for NIDS alerts
25
PRELUDE_DESC=	Enable Prelude support for NIDS alerts
26
PORTS_PCAP_DESC=Use libpcap from ports
26
PORTS_PCAP_DESC=Use libpcap from ports
27
TESTS_DESC=	Enable unit tests in suricata binary
27
TESTS_DESC=	Enable unit tests in suricata binary
28
JSON_DESC=	Enable Suricata JSON output
29
GEOIP_DESC=	Enable GeoIP support for Suricata
30
HTP_PORT_DESC=	Use libhtp from ports instead of bundled
28
31
29
USES=		gmake pkgconfig libtool
32
USES=		gmake pkgconfig libtool pathfix
30
USE_AUTOTOOLS=	aclocal autoconf automake
33
USE_AUTOTOOLS=	aclocal autoconf automake
31
USE_LDCONFIG=	yes
34
USE_LDCONFIG=	yes
32
USE_RC_SUBR=	${PORTNAME}
35
USE_RC_SUBR=	${PORTNAME}
Lines 43-52 Link Here
43
PRELUDE_CONFIGURE_ENABLE=	prelude
46
PRELUDE_CONFIGURE_ENABLE=	prelude
44
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
47
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
45
TESTS_CONFIGURE_ENABLE=		unittests
48
TESTS_CONFIGURE_ENABLE=		unittests
49
JSON_CONFIGURE_OFF=		--with-libjansson-includes=${LOCALBASE}/include	\
50
				--with-libjansson-libraries=${LOCALBASE}/lib
51
JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
52
GEOIP_CONFIGURE_ON=		--enable-geoip
53
GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
54
HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
55
HTP_PORT_LIB_DEPENDS=		libhtp.so:${PORTSDIR}/devel/libhtp
56
HTP_PORT_CONFLICT_OFF=		libhtp-[0-9]* libhtp-suricata
46
57
47
SUB_FILES=	pkg-message
58
SUB_FILES=	pkg-message
48
59
49
CONFIGURE_ARGS+=--enable-non-bundled-htp --enable-gccprotect \
60
CONFIGURE_ARGS+=--enable-gccprotect \
50
		--with-libpcre-includes=${LOCALBASE}/include \
61
		--with-libpcre-includes=${LOCALBASE}/include \
51
		--with-libpcre-libraries=${LOCALBASE}/lib \
62
		--with-libpcre-libraries=${LOCALBASE}/lib \
52
		--with-libyaml-includes=${LOCALBASE}/include \
63
		--with-libyaml-includes=${LOCALBASE}/include \
Lines 66-71 Link Here
66
77
67
.include <bsd.port.pre.mk>
78
.include <bsd.port.pre.mk>
68
79
80
.if ${PORT_OPTIONS:MHTP_PORT}
81
PLIST_SUB+=	HTPPORT="@comment "
82
.else
83
PLIST_SUB+=	HTPPORT=""
84
.endif
85
69
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
86
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
70
BROKEN=		Does not compile on ia64, powerpc, or sparc64
87
BROKEN=		Does not compile on ia64, powerpc, or sparc64
71
.endif
88
.endif
(-)suricata/pkg-plist (+22 lines)
Lines 28-33 Link Here
28
%%DOCSDIR%%/Ubuntu_Installation.txt
28
%%DOCSDIR%%/Ubuntu_Installation.txt
29
%%DOCSDIR%%/Ubuntu_Installation_from_GIT.txt
29
%%DOCSDIR%%/Ubuntu_Installation_from_GIT.txt
30
%%DOCSDIR%%/Windows.txt
30
%%DOCSDIR%%/Windows.txt
31
%%HTPPORT%%include/htp/bstr.h
32
%%HTPPORT%%include/htp/bstr_builder.h
33
%%HTPPORT%%include/htp/htp.h
34
%%HTPPORT%%include/htp/htp_base64.h
35
%%HTPPORT%%include/htp/htp_config.h
36
%%HTPPORT%%include/htp/htp_connection_parser.h
37
%%HTPPORT%%include/htp/htp_core.h
38
%%HTPPORT%%include/htp/htp_decompressors.h
39
%%HTPPORT%%include/htp/htp_hooks.h
40
%%HTPPORT%%include/htp/htp_list.h
41
%%HTPPORT%%include/htp/htp_multipart.h
42
%%HTPPORT%%include/htp/htp_table.h
43
%%HTPPORT%%include/htp/htp_transaction.h
44
%%HTPPORT%%include/htp/htp_urlencoded.h
45
%%HTPPORT%%include/htp/htp_utf8_decoder.h
46
%%HTPPORT%%include/htp/htp_version.h
47
%%HTPPORT%%lib/libhtp-0.5.15.so.1
48
%%HTPPORT%%lib/libhtp-0.5.15.so.1.0.0
49
%%HTPPORT%%lib/libhtp.a
50
%%HTPPORT%%lib/libhtp.so
51
%%HTPPORT%%libdata/pkgconfig/htp.pc
52
%%HTPPORT%%@dirrmtry include/htp
31
@unexec if cmp  -s %D/etc/suricata/suricata.yaml-sample %D/etc/suricata/suricata.yaml; then rm -f %D/etc/suricata/suricata.yaml; fi
53
@unexec if cmp  -s %D/etc/suricata/suricata.yaml-sample %D/etc/suricata/suricata.yaml; then rm -f %D/etc/suricata/suricata.yaml; fi
32
etc/suricata/suricata.yaml-sample
54
etc/suricata/suricata.yaml-sample
33
@exec if [ ! -f %D/etc/suricata/suricata.yaml ] ; then cp -p %D/%F %B/suricata.yaml; fi
55
@exec if [ ! -f %D/etc/suricata/suricata.yaml ] ; then cp -p %D/%F %B/suricata.yaml; fi

Return to bug 193220