Attachment #129951 for bug #174024




# $FreeBSD$

PORTNAME=	barnyard2
PORTVERSION=	1.11
PORTREVISION?=	0
CATEGORIES=	security

MAINTAINER=	pauls@utdallas.edu

USE_GITHUB=	yes
GH_ACCOUNT=	firnsy
GH_PROJECT=	${PORTNAME}
GH_TAGNAME=	master
GH_COMMIT=	4dfdc80

OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPv6 MPLS MYSQL MYSQL-SSL ODBC PRELUDE PGSQL
OPTIONS_DEFAULT=#empty
NO_OPTIONS_SORT=yes

64BIT_DESC=	Enable 64bit compilation (experimental)
ARUBA_DESC=	Enable aruba support
BRO_DESC=	Enable bro support (libbroccoli)
GRE_DESC=	Enable gre support
IPv6_DESC=	Enable ipv6 support
MPLS_DESC=	Enable mpls support
MYSQL_DESC=	Enable mysql support
MYSQL-SSL_DESC=	Enable mysql ssl support (experimental)
ODBC_DESC=	Enable odbc support
PRELUDE_DESC=	Enable prelude support
PGSQL_DESC=	Enable postgresql support

.if defined(SLAVE)
OPTIONS_DEFINE+=	TCL
OPTIONS_DESC=	Enable tcl support for sguil
OPTIONS_DEFAULT+=	TCL
.endif

USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf


PORTDOCS1=	README RELEASE.NOTES
PORTDOCS2=	INSTALL README.aruba README.database README.sguil README.snortsam
PORTEXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:M64BIT}
CONFIGURE_ARGS+=	--enable-64bit-gcc
.else
CONFIGURE_ARGS+=	--disable-64bit-gcc
.endif

.if ${PORT_OPTIONS:MARUBA}
CONFIGURE_ARGS+=	--enable-aruba
.else
CONFIGURE_ARGS+=	--disable-aruba
.endif

.if ${PORT_OPTIONS:MBRO}
BROKEN=			Will not compile until bro update is committed - deselect this option
BUILD_DEPENDS+=		bro:${PORTSDIR}/security/bro-barnyard2
CONFIGURE_ARGS+=	--enable-bro --with-broccoli=${LOCALBASE}/lib
.else
CONFIGURE_ARGS+=	--disable-bro
.endif

.if ${PORT_OPTIONS:MGRE}
CONFIGURE_ARGS+=	--enable-gre
.else
CONFIGURE_ARGS+=	--disable-gre
.endif

.if ${PORT_OPTIONS:MIPv6}
CONFIGURE_ARGS+=	--enable-ipv6
.else
CONFIGURE_ARGS+=	--disable-ipv6
.endif

.if ${PORT_OPTIONS:MMPLS}
CONFIGURE_ARGS+=	--enable-mpls
.else
CONFIGURE_ARGS+=	--disable-mpls
.endif

.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL=		yes
CONFIGURE_ARGS+=	--with-mysql \
			--with-mysql-includes=${LOCALBASE}/include/mysql \
			--with-mysql-libraries=${LOCALBASE}/lib/mysql
SUB_LIST+=		MYSQL=" mysql"
.else
CONFIGURE_ARGS+=	--without-mysql
SUB_LIST+=		MYSQL=""
.endif

.if ${PORT_OPTIONS:MMYSQL-SSL}
OPTIONS_DEFAULT+=	MYSQL
CONFIGURE_ARGS+=	--enable-mysql-ssl-support
SUB_LIST+=		PGSQL=" postgresql"
.else
CONFIGURE_ARGS+=	--disable-mysql-ssl-support
SUB_LIST+=		PGSQL=""
.endif

.if ${PORT_OPTIONS:MODBC}
LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS+=	--with-odbc
.else
CONFIGURE_ARGS+=	--without-odbc
.endif

.if ${PORT_OPTIONS:MPRELUDE}
BUILD_DEPENDS+=	prelude-manager:${PORTSDIR}/security/prelude-manager
CONFIGURE_ARGS+=	--enable-prelude
.else
CONFIGURE_ARGS+=	--disable-prelude
.endif

.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL=		yes
CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
.else
CONFIGURE_ARGS+=	--without-postgresql
.endif

.if ${PORT_OPTIONS:MSURICATA}
RUN_DEPENDS+=		${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
.endif

.if ${PORT_OPTIONS:MTCL}
USE_TCL=		yes
CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}

		${WRKSRC}/etc/barnyard2.conf

post-install:
	@cp ${WRKSRC}/etc/barnyard2.conf ${PREFIX}/etc/barnyard2.conf.sample
	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
		${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
	fi

Lines 1-2 Link Here

(-)../barnyard2/distinfo (-2 / +2 lines)
1	SHA256 (barnyard2-1.10.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2	1	SHA256 (barnyard2-1.11.tar.gz) = 345d6dfd7f88cc7d72258338e2db0fa05499dc434c0fe33b685d998f497f2bcd
2	SIZE (barnyard2-1.10.tar.gz) = 419781	2	SIZE (barnyard2-1.11.tar.gz) = 425392

Lines 1-8 Link Here

(-)../barnyard2/files/patch-etc__Makefile.am (-8 lines)
1	--- ./etc/Makefile.am.orig 2012-10-08 10:03:32.000000000 -0400
2	+++ ./etc/Makefile.am 2012-10-08 10:05:02.000000000 -0400
3	@@ -4,4 +4,4 @@
4	EXTRA_DIST = barnyard2.conf
5
6	install-data-am:
7	- test -e $(sysconfdir)/barnyard2.conf \|\| install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)
8	+ install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)/barnyard2.conf.sample

Lines 9-12 Link Here

(-)../barnyard2/files/pkg-message.in (+4 lines)
9	For the various options available, type % barnyard2 -h after install or read	9	For the various options available, type % barnyard2 -h after install or read
10	the options in the startup script - in %%PREFIX%%/etc/rc.d.	10	the options in the startup script - in %%PREFIX%%/etc/rc.d.
11		11
		12	Barnyard2 can process unified2 files from snort or suricata. It can also
		13	interact with snortsam firewall rules as well as the sguil-sensor. Those
		14	ports must be installed separately if you wish to use them.
		15
12	************************************************************************	16	************************************************************************

Lines 2-4 Link Here

(-)../barnyard2/pkg-plist (+8 lines)
2	@unexec if cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf.sample; then rm -f %D/etc/barnyard2.conf; fi	2	@unexec if cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf.sample; then rm -f %D/etc/barnyard2.conf; fi
3	etc/barnyard2.conf.sample	3	etc/barnyard2.conf.sample
4	@exec [ -f %B/barnyard2.conf ] \|\| cp -p %B/%f %B/barnyard2.conf	4	@exec [ -f %B/barnyard2.conf ] \|\| cp -p %B/%f %B/barnyard2.conf
		5	%%DOCSDIR%%/INSTALL
		6	%%DOCSDIR%%/README
		7	%%DOCSDIR%%/README.aruba
		8	%%DOCSDIR%%/README.database
		9	%%DOCSDIR%%/README.sguil
		10	%%DOCSDIR%%/README.snortsam
		11	%%DOCSDIR%%/RELEASE.NOTES
		12	@dirrm %%DOCSDIR%%

Return to bug 174024

Lines 1-8 Link Here

(-)../barnyard2/Makefile (-34 / +78 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= barnyard2	3	PORTNAME= barnyard2
4	PORTVERSION= 1.10	4	PORTVERSION= 1.11
5	PORTREVISION?= 0
6	CATEGORIES= security	5	CATEGORIES= security
7		6
8	MAINTAINER= pauls@utdallas.edu	7	MAINTAINER= pauls@utdallas.edu
Lines 13-34 Link Here
13	USE_GITHUB= yes	12	USE_GITHUB= yes
14	GH_ACCOUNT= firnsy	13	GH_ACCOUNT= firnsy
15	GH_PROJECT= ${PORTNAME}	14	GH_PROJECT= ${PORTNAME}
16	GH_TAGNAME= v2-${PORTVERSION}	15	GH_TAGNAME= master
17	GH_COMMIT= 2f5d496	16	GH_COMMIT= 4dfdc80
18		17
19	OPTIONS_DEFINE= MYSQL PGSQL BRO SNORT SNORTSAM SURICATA	18	OPTIONS_DEFINE= 64BIT ARUBA BRO GRE IPv6 MPLS MYSQL MYSQL-SSL ODBC PRELUDE PGSQL
20	OPTIONS_DEFAULT=#empty
21	NO_OPTIONS_SORT=yes	19	NO_OPTIONS_SORT=yes
22		20
23	BRO_DESC= Depend on security/bro	21	64BIT_DESC= Enable 64bit compilation (experimental)
24	MYSQL_DESC= Enable MySQL support	22	ARUBA_DESC= Enable aruba support
25	PGSQL_DESC= Enable PostgreSQL support	23	BRO_DESC= Enable bro support (libbroccoli)
26	SNORT_DESC= Depend on security/snort	24	GRE_DESC= Enable gre support
27	SNORTSAM_DESC= Depend on security/snortsam	25	IPv6_DESC= Enable ipv6 support
28	SURICATA_DESC= Depend on security/suricata	26	MPLS_DESC= Enable mpls support
		27	MYSQL_DESC= Enable mysql support
		28	MYSQL-SSL_DESC= Enable mysql ssl support (experimental)
		29	ODBC_DESC= Enable odbc support
		30	PRELUDE_DESC= Enable prelude support
		31	PGSQL_DESC= Enable postgresql support
29		32
30	.if !defined(SLAVE)	33	.if defined(SLAVE)
31	OPTIONS_DEFINE+=TCL	34	OPTIONS_DEFINE+= TCL
		35	OPTIONS_DESC= Enable tcl support for sguil
		36	OPTIONS_DEFAULT+= TCL
32	.endif	37	.endif
33		38
34	USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf	39	USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf
Lines 44-90 Link Here
44		49
45	PORTDOCS1= README RELEASE.NOTES	50	PORTDOCS1= README RELEASE.NOTES
46	PORTDOCS2= INSTALL README.aruba README.database README.sguil README.snortsam	51	PORTDOCS2= INSTALL README.aruba README.database README.sguil README.snortsam
47	PORTEXAMPLES= create_db2 create_mysql create_postgresql SCHEMA_ACCESS create_mssql create_oracle.sql	52	PORTEXAMPLES= SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
48	PORTDOCS= ${PORTDOCS1} ${PORTDOCS2}
49		53
50	.include <bsd.port.options.mk>	54	.include <bsd.port.options.mk>
51		55
		56	.if ${PORT_OPTIONS:M64BIT}
		57	CONFIGURE_ARGS+= --enable-64bit-gcc
		58	.else
		59	CONFIGURE_ARGS+= --disable-64bit-gcc
		60	.endif
		61
		62	.if ${PORT_OPTIONS:MARUBA}
		63	CONFIGURE_ARGS+= --enable-aruba
		64	.else
		65	CONFIGURE_ARGS+= --disable-aruba
		66	.endif
		67
		68	.if ${PORT_OPTIONS:MBRO}
		69	BROKEN= Will not compile until bro update is committed - deselect this option
		70	BUILD_DEPENDS+= bro:${PORTSDIR}/security/bro-barnyard2
		71	CONFIGURE_ARGS+= --enable-bro --with-broccoli=${LOCALBASE}/lib
		72	.else
		73	CONFIGURE_ARGS+= --disable-bro
		74	.endif
		75
		76	.if ${PORT_OPTIONS:MGRE}
		77	CONFIGURE_ARGS+= --enable-gre
		78	.else
		79	CONFIGURE_ARGS+= --disable-gre
		80	.endif
		81
		82	.if ${PORT_OPTIONS:MIPv6}
		83	CONFIGURE_ARGS+= --enable-ipv6
		84	.else
		85	CONFIGURE_ARGS+= --disable-ipv6
		86	.endif
		87
		88	.if ${PORT_OPTIONS:MMPLS}
		89	CONFIGURE_ARGS+= --enable-mpls
		90	.else
		91	CONFIGURE_ARGS+= --disable-mpls
		92	.endif
		93
52	.if ${PORT_OPTIONS:MMYSQL}	94	.if ${PORT_OPTIONS:MMYSQL}
53	USE_MYSQL= yes	95	USE_MYSQL= yes
54	CONFIGURE_ARGS+= --with-mysql \	96	CONFIGURE_ARGS+= --with-mysql \
55	--with-mysql-includes=${LOCALBASE}/include/mysql \	97	--with-mysql-includes=${LOCALBASE}/include/mysql \
56	--with-mysql-libraries=${LOCALBASE}/lib/mysql	98	--with-mysql-libraries=${LOCALBASE}/lib/mysql
57	SUB_LIST+= MYSQL=" mysql"
58	.else	99	.else
59	CONFIGURE_ARGS+= --without-mysql	100	CONFIGURE_ARGS+= --without-mysql
60	SUB_LIST+= MYSQL=""
61	.endif	101	.endif
62		102
63	.if ${PORT_OPTIONS:MPGSQL}	103	.if ${PORT_OPTIONS:MMYSQL-SSL}
64	USE_PGSQL= yes	104	OPTIONS_DEFAULT+= MYSQL
65	CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}	105	CONFIGURE_ARGS+= --enable-mysql-ssl-support
66	SUB_LIST+= PGSQL=" postgresql"
67	.else	106	.else
68	CONFIGURE_ARGS+= --without-postgresql	107	CONFIGURE_ARGS+= --disable-mysql-ssl-support
69	SUB_LIST+= PGSQL=""
70	.endif	108	.endif
71		109
72	.if ${PORT_OPTIONS:MBRO}	110	.if ${PORT_OPTIONS:MODBC}
73	RUN_DEPENDS+= ${LOCALBASE}/bin/bro:${PORTSDIR}/security/bro	111	LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
		112	CONFIGURE_ARGS+= --with-odbc
		113	.else
		114	CONFIGURE_ARGS+= --without-odbc
74	.endif	115	.endif
75		116
76	.if ${PORT_OPTIONS:MSNORT}	117	.if ${PORT_OPTIONS:MPRELUDE}
77	RUN_DEPENDS+= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort	118	BUILD_DEPENDS+= prelude-manager:${PORTSDIR}/security/prelude-manager
		119	CONFIGURE_ARGS+= --enable-prelude
		120	.else
		121	CONFIGURE_ARGS+= --disable-prelude
78	.endif	122	.endif
79		123
80	.if ${PORT_OPTIONS:MSNORTSAM}	124	.if ${PORT_OPTIONS:MPGSQL}
81	RUN_DEPENDS+= ${LOCALBASE}/bin/snortsnam:${PORTSDIR}/security/snortsam	125	USE_PGSQL= yes
		126	CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
		127	.else
		128	CONFIGURE_ARGS+= --without-postgresql
82	.endif	129	.endif
83		130
84	.if ${PORT_OPTIONS:MSURICATA}
85	RUN_DEPENDS+= ${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
86	.endif
87
88	.if ${PORT_OPTIONS:MTCL}	131	.if ${PORT_OPTIONS:MTCL}
89	USE_TCL= yes	132	USE_TCL= yes
90	CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}	133	CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
Lines 97-102 Link Here
97	${WRKSRC}/etc/barnyard2.conf	140	${WRKSRC}/etc/barnyard2.conf
98		141
99	post-install:	142	post-install:
		143	@cp ${WRKSRC}/etc/barnyard2.conf ${PREFIX}/etc/barnyard2.conf.sample
100	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \	144	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
101	${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \	145	${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
102	fi	146	fi