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

Collapse All | Expand All

(-)/usr/local/poudriere/ports/default/local/suricata/Makefile (-6 / +22 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/security/suricata/Makefile 365723 2014-08-23 12:08:16Z koobs $
2
# $FreeBSD: head/security/suricata/Makefile 365723 2014-08-23 12:08:16Z koobs $
3
3
4
PORTNAME=	suricata
4
PORTNAME=	suricata
5
PORTVERSION=	2.0.3
5
PORTVERSION=	2.0.4
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 13-32 Link Here
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
15
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
16
		libhtp.so:${PORTSDIR}/devel/libhtp \
17
		libnet.so:${PORTSDIR}/net/libnet \
16
		libnet.so:${PORTSDIR}/net/libnet \
18
		libyaml.so:${PORTSDIR}/textproc/libyaml
17
		libyaml.so:${PORTSDIR}/textproc/libyaml
19
18
20
OPTIONS_DEFINE=	IPFW PRELUDE PORTS_PCAP TESTS
19
OPTIONS_DEFINE=	IPFW PRELUDE PORTS_PCAP TESTS JSON GEOIP HTP_PORT
21
OPTIONS_DEFAULT=IPFW PRELUDE
20
OPTIONS_DEFAULT=IPFW PRELUDE HTP_PORT
22
OPTIONS_SUB=	yes
21
OPTIONS_SUB=	yes
23
22
24
IPFW_DESC=	Enable IPFW and IP Divert support for inline IDP
23
IPFW_DESC=	Enable IPFW and IP Divert support for inline IDP
25
PRELUDE_DESC=	Enable Prelude support for NIDS alerts
24
PRELUDE_DESC=	Enable Prelude support for NIDS alerts
26
PORTS_PCAP_DESC=Use libpcap from ports
25
PORTS_PCAP_DESC=Use libpcap from ports
27
TESTS_DESC=	Enable unit tests in suricata binary
26
TESTS_DESC=	Enable unit tests in suricata binary
27
JSON_DESC=	Enable Suricata JSON output
28
GEOIP_DESC=	Enable GeoIP support for Suricata
29
HTP_PORT_DESC=	Use libhtp from ports instead of bundled
28
30
29
USES=		gmake pkgconfig libtool
31
USES=		gmake pkgconfig libtool pathfix
30
USE_AUTOTOOLS=	aclocal autoconf automake
32
USE_AUTOTOOLS=	aclocal autoconf automake
31
USE_LDCONFIG=	yes
33
USE_LDCONFIG=	yes
32
USE_RC_SUBR=	${PORTNAME}
34
USE_RC_SUBR=	${PORTNAME}
Lines 43-52 Link Here
43
PRELUDE_CONFIGURE_ENABLE=	prelude
45
PRELUDE_CONFIGURE_ENABLE=	prelude
44
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
46
PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
45
TESTS_CONFIGURE_ENABLE=		unittests
47
TESTS_CONFIGURE_ENABLE=		unittests
48
JSON_CONFIGURE_OFF=		--with-libjansson-includes=${LOCALBASE}/include	\
49
				--with-libjansson-libraries=${LOCALBASE}/lib
50
JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
51
GEOIP_CONFIGURE_ON=		--enable-geoip
52
GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
53
HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
54
HTP_PORT_LIB_DEPENDS=		libhtp.so:${PORTSDIR}/devel/libhtp
55
HTP_PORT_CONFLICT_OFF=		libhtp-[0-9]* libhtp-suricata
46
56
47
SUB_FILES=	pkg-message
57
SUB_FILES=	pkg-message
48
58
49
CONFIGURE_ARGS+=--enable-non-bundled-htp --enable-gccprotect \
59
CONFIGURE_ARGS+=--enable-gccprotect \
50
		--with-libpcre-includes=${LOCALBASE}/include \
60
		--with-libpcre-includes=${LOCALBASE}/include \
51
		--with-libpcre-libraries=${LOCALBASE}/lib \
61
		--with-libpcre-libraries=${LOCALBASE}/lib \
52
		--with-libyaml-includes=${LOCALBASE}/include \
62
		--with-libyaml-includes=${LOCALBASE}/include \
Lines 66-71 Link Here
66
76
67
.include <bsd.port.pre.mk>
77
.include <bsd.port.pre.mk>
68
78
79
.if ${PORT_OPTIONS:MHTP_PORT}
80
PLIST_SUB+=	HTPPORT="@comment "
81
.else
82
PLIST_SUB+=	HTPPORT=""
83
.endif
84
69
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
85
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
70
BROKEN=		Does not compile on ia64, powerpc, or sparc64
86
BROKEN=		Does not compile on ia64, powerpc, or sparc64
71
.endif
87
.endif
(-)/usr/local/poudriere/ports/default/local/suricata/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (suricata-2.0.3.tar.gz) = b6e554cbacb925bbcf88dd4554c9222b51b21796c39e198cdf5b0b9cdc1ed383
1
SHA256 (suricata-2.0.4.tar.gz) = 677d97a829d9e05f664c82eb0372e870d5f6e9501ccee20130dfde4014bd5084
2
SIZE (suricata-2.0.3.tar.gz) = 3083891
2
SIZE (suricata-2.0.4.tar.gz) = 3085919
(-)/usr/local/poudriere/ports/default/local/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