Date: Sat, 6 Oct 2012 22:36:40 +0000 (UTC) From: Paul Schmehl <pauls@utdallas.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172461: security/barnyard2, port update Message-ID: <20121006223640.2962EDCA826@buttercup4.utdallas.edu> Resent-Message-ID: <201210071930.q97JUAbh092554@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172461 >Category: ports >Synopsis: security/barnyard2, port update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 07 19:30:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Paul Schmehl >Release: FreeBSD 8.3-PRERELEASE amd64 >Organization: University of Texas at Dallas >Environment: System: FreeBSD hostname.utdallas.edu 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #1: Wed Mar 7 18:01:57 UTC 2012 root@hostname.utdallas.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update port to the new release version >How-To-Repeat: >Fix: --- barnyard2.diff begins here --- diff -Nar ../barnyard2/Makefile barnyard2/Makefile 9,10c9 < PORTVERSION= 1.9 < PORTREVISION= 2 --- > PORTVERSION= 1.10 12d10 < MASTER_SITES= http://www.securixlive.com/download/barnyard2/ 15c13 < COMMENT= An output system for Snort or Suricata that parses unified2 files --- > COMMENT= An output system for security monitoring systems that parses unified2 files 17,22c15,36 < OPTIONS= MYSQL "Enable MySQL support" on \ < POSTGRESQL "Enable PostgreSQL support" off \ < SNORT "Depend on security/snort" off \ < SURICATA "Depend on security/suricata" off < .if !defined(SLAVE) < OPTIONS+= TCL "Enable TCL support" off --- > LICENSE?= GPLv2 > LICENSE_FILE?= ${WRKSRC}/LICENSE > > GH_ACCOUNT= firnsy > GH_PROJECT= barnyard2 > GH_TAGNAME= v2-1.10 > GH_COMMIT= 2f5d496 > USE_GITHUB= yes > MAKE_JOBS_UNSAFE= yes > > OPTIONS_DEFINE= MYSQL POSTGRESQL SNORT SURICATA BRO SNORTSAM > OPTIONS_DEFAULT= no > > BRO_DESC= Depend on security/bro > MYSQL_DESC= Enable MySql support > POSTGRESQL_DESC= Enable PostgreSQL support > SNORT_DESC= Depend on security/snort > SNORTSAM_DESC= Enable Snortsam support > SURICATA_DESC= Depend on security/suricata > > .if defined(SLAVE) > OPTIONS_DEFINE+= TCL 25a40 > USE_GITHUB= yes 29,31c44,47 < PORTDOCS1= README < PORTDOCS2= INSTALL README.aruba README.database README.sguil < PORTDOCS= ${PORTDOCS1} ${PORTDOCS2} --- > PORTDOCS1= README RELEASE.NOTES > PORTDOCS2= INSTALL README.aruba README.database README.sguil README.snortsam > PORTDOCS3= create_db2 create_mysql create_postgresql SCHEMA_ACCESS create_mssql create_oracle.sql > PORTDOCS= ${PORTDOCS1} ${PORTDOCS2} ${PORTDOCS3} 35c51,54 < .if defined(WITH_MYSQL) --- > pre-configure: > cd ${WRKSRC}; ${SH} autogen.sh > > .if ${PORT_OPTIONS:MWITH_MYSQL} 41a61,63 > CONFIGURE_ARGS+= --without-mysql \ > --without-mysql-includes \ > --without-mysql-libraries 45c67 < .if defined(WITH_POSTGRESQL) --- > .if $(PORT_OPTIONS:MWITH_POSTGRESQL) 49a72 > CONFIGURE_ARGS+= --without-postgresql 53c76 < .if defined(WITH_SNORT) --- > .if $(PORT_OPTIONS:MWITH_SNORT) 57c80 < .if defined(WITH_SURICATA) --- > .if $(PORT_OPTIONS:MWITH_SURICATA) 60a84,91 > .if $(PORT_OPTIONS:MWITH_BRO) > RUN_DEPENDS+= ${LOCALBASE}bin/bro:${PORTSDIR}/security/bro > .endif > > .if $(PORT_OPTIONS:MWITH_SNORTSAM) > RUN_DEPENDS+= ${LOCALBASE}bin/snortsnam:${PORTSDIR}/security/snortsam > .endif > 64c95,98 < LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84 --- > LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 > .else > USE_TCL= no > CONFIGURE_ARGS+= --without-tcl 67,69d100 < pre-install: < ${CHMOD} 744 ${WRKSRC}/install-sh < 77,78c108 < [ -f ${PREFIX}/etc/${f} ] || \ < ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f} --- > ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}-sample 83a114 > cd ${WRKSRC}/schemas && ${INSTALL_DATA} ${PORTDOCS3} ${DOCSDIR} diff -Nar ../barnyard2/distinfo barnyard2/distinfo 1,2c1,2 < SHA256 (barnyard2-1.9.tar.gz) = 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50b33bc1125125c8a9e78a5b0c < SIZE (barnyard2-1.9.tar.gz) = 652879 --- > SHA256 (barnyard2-1.10.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2 > SIZE (barnyard2-1.10.tar.gz) = 419781 diff -Nar ../barnyard2/files/patch-configure barnyard2/files/patch-configure 1,190d0 < --- ./configure.orig 2010-12-26 23:39:18.000000000 +0100 < +++ ./configure 2011-05-15 18:42:45.000000000 +0200 < @@ -13610,93 +13610,6 @@ < fi < fi < < -# Checking for Tcl support (required by spo_sguil) < - < -# Check whether --with-tcl was given. < -if test "${with_tcl+set}" = set; then : < - withval=$with_tcl; with_tcl="$withval" < -else < - with_tcl=no < -fi < - < - < -if test "$with_tcl" != "no"; then < - # prioritise manual definition of the Tcl library. < - if test -d "$with_tcl"; then < - tclpath="$with_tcl" < - else < - # let tclsh tell us where it was installed (prefer new Tcl versions). < - for ac_prog in tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh < -do < - # Extract the first word of "$ac_prog", so it can be a program name with args. < -set dummy $ac_prog; ac_word=$2 < -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 < -$as_echo_n "checking for $ac_word... " >&6; } < -if test "${ac_cv_prog_TCLSH+set}" = set; then : < - $as_echo_n "(cached) " >&6 < -else < - if test -n "$TCLSH"; then < - ac_cv_prog_TCLSH="$TCLSH" # Let the user override the test. < -else < -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR < -for as_dir in $PATH < -do < - IFS=$as_save_IFS < - test -z "$as_dir" && as_dir=. < - for ac_exec_ext in '' $ac_executable_extensions; do < - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then < - ac_cv_prog_TCLSH="$ac_prog" < - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 < - break 2 < - fi < -done < - done < -IFS=$as_save_IFS < - < -fi < -fi < -TCLSH=$ac_cv_prog_TCLSH < -if test -n "$TCLSH"; then < - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5 < -$as_echo "$TCLSH" >&6; } < -else < - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 < -$as_echo "no" >&6; } < -fi < - < - < - test -n "$TCLSH" && break < -done < - < - if test "$TCLSH" != ""; then < - tclpath=`echo 'puts [lindex $tcl_pkgPath 0]' | $TCLSH` < - fi < - fi < - < - # check, if tclConfig.sh can be found in tclsh's installation directory. < - if test ! -r $tclpath/tclConfig.sh; then < - { $as_echo "$as_me:${as_lineno-$LINENO}: result: < - Can't find Tcl libraries. Use --with-tcl to specify < - the directory containing tclConfig.sh on your system. < - Continuing build without Tcl support." >&5 < -$as_echo " < - Can't find Tcl libraries. Use --with-tcl to specify < - the directory containing tclConfig.sh on your system. < - Continuing build without Tcl support." >&6; } < - else < - # source tclsh's configuration file and tell the user about the version. < - . $tclpath/tclConfig.sh < - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the tcl version number" >&5 < -$as_echo_n "checking for the tcl version number... " >&6; } < - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&5 < -$as_echo "$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&6; } < - LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC" < - TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION" < - CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL"; < - fi < -fi < - < - < # Check whether --with-mysql was given. < if test "${with_mysql+set}" = set; then : < withval=$with_mysql; with_mysql="$withval" < @@ -14496,6 +14409,93 @@ < LIBS="${LIBS} -lbroccoli" < fi < < +# Checking for Tcl support (required by spo_sguil) < + < +# Check whether --with-tcl was given. < +if test "${with_tcl+set}" = set; then : < + withval=$with_tcl; with_tcl="$withval" < +else < + with_tcl=no < +fi < + < + < +if test "$with_tcl" != "no"; then < + # prioritise manual definition of the Tcl library. < + if test -d "$with_tcl"; then < + tclpath="$with_tcl" < + else < + # let tclsh tell us where it was installed (prefer new Tcl versions). < + for ac_prog in tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh < +do < + # Extract the first word of "$ac_prog", so it can be a program name with args. < +set dummy $ac_prog; ac_word=$2 < +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 < +$as_echo_n "checking for $ac_word... " >&6; } < +if test "${ac_cv_prog_TCLSH+set}" = set; then : < + $as_echo_n "(cached) " >&6 < +else < + if test -n "$TCLSH"; then < + ac_cv_prog_TCLSH="$TCLSH" # Let the user override the test. < +else < +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR < +for as_dir in $PATH < +do < + IFS=$as_save_IFS < + test -z "$as_dir" && as_dir=. < + for ac_exec_ext in '' $ac_executable_extensions; do < + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then < + ac_cv_prog_TCLSH="$ac_prog" < + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 < + break 2 < + fi < +done < + done < +IFS=$as_save_IFS < + < +fi < +fi < +TCLSH=$ac_cv_prog_TCLSH < +if test -n "$TCLSH"; then < + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5 < +$as_echo "$TCLSH" >&6; } < +else < + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 < +$as_echo "no" >&6; } < +fi < + < + < + test -n "$TCLSH" && break < +done < + < + if test "$TCLSH" != ""; then < + tclpath=`echo 'puts [lindex $tcl_pkgPath 0]' | $TCLSH` < + fi < + fi < + < + # check, if tclConfig.sh can be found in tclsh's installation directory. < + if test ! -r $tclpath/tclConfig.sh; then < + { $as_echo "$as_me:${as_lineno-$LINENO}: result: < + Can't find Tcl libraries. Use --with-tcl to specify < + the directory containing tclConfig.sh on your system. < + Continuing build without Tcl support." >&5 < +$as_echo " < + Can't find Tcl libraries. Use --with-tcl to specify < + the directory containing tclConfig.sh on your system. < + Continuing build without Tcl support." >&6; } < + else < + # source tclsh's configuration file and tell the user about the version. < + . $tclpath/tclConfig.sh < + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the tcl version number" >&5 < +$as_echo_n "checking for the tcl version number... " >&6; } < + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&5 < +$as_echo "$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL" >&6; } < + LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC" < + TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION" < + CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL"; < + fi < +fi < + < + < # let's make some fixes.. < < CFLAGS=`echo $CFLAGS | sed -e 's/-I\/usr\/include //g'` diff -Nar ../barnyard2/files/patch-etc-Makefile.in barnyard2/files/patch-etc-Makefile.in 1,11d0 < --- etc/Makefile.in.orig 2010-07-04 13:17:33.000000000 -0400 < +++ etc/Makefile.in 2010-07-04 13:18:42.000000000 -0400 < @@ -249,7 +249,7 @@ < done | $(am__base_list) | \ < while read files; do \ < echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ < - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ < + $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)/$$files-sample" || exit $$?; \ < done < < uninstall-sysconfDATA: diff -Nar ../barnyard2/pkg-plist barnyard2/pkg-plist 4d3 < @exec if [ ! -f %D/etc/barnyard2.conf ] ; then cp -p %D/%F %B/barnyard2.conf; fi --- barnyard2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121006223640.2962EDCA826>