ports/123380: security/barnyard-sguil, build with postgresql fails

[Paul Schmehl]

>Number:         123380
>Category:       ports
>Synopsis:       security/barnyard-sguil, build with postgresql fails
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 04 02:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Paul Schmehl
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 7.0-STABLE FreeBSD 7.0-STABLE #6: Wed Apr 16 17:14:28 CDT 2008 root at hostname.utdallas.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	security/barnyard-sguil, the port fails when the POSTGRES OPTION is selected
	as reported by a user attempting to install with postgresql support.
	This submission replaces files/patch-configure.in with a new patch that
	fixes the problem and patches the Makefile to add PORTREVISION.

	Note: security/barnyard-sguil6 was just repocopied to security/barnyard-sguil,
	so this submission corrects the problem for the new port, not the old one.  The
	repocopy was done to more accurately reflect that barnyard-sguil now supports 
	multiple versions of sguil, beginning with versiont 0.6.x.
>How-To-Repeat:
	
>Fix:

	

--- patch-Makefile begins here ---
--- Makefile.orig	2008-05-03 20:06:04.000000000 -0500
+++ Makefile	2008-05-03 20:06:27.000000000 -0500
@@ -7,6 +7,7 @@
 
 PKGNAMESUFFIX=	-sguil
 COMMENT=	An output system for Snort (patched for sguil)
+PORTREVISION=	1
 
 LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
 
--- patch-Makefile ends here ---

--- patch-configure.in begins here ---
--- configure.in.orig	2004-05-01 11:43:29.000000000 -0500
+++ configure.in	2008-05-03 19:38:01.000000000 -0500
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.17 2004/05/01 16:43:29 andrewbaker Exp $ 
+# $Id: configure.in,v 1.2 2005/03/08 20:37:40 bamm Exp $ 
 AC_INIT(src/barnyard.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(barnyard,0.2.0)
@@ -281,7 +281,7 @@
 
   dnl check for the header
   LDFLAGS="${LDFLAGS} -L${MYSQL_LIB_DIR}"
-  LIBS="${LIBS} -lz -lssl -lmysqlclient"
+  LIBS="${LIBS} -lmysqlclient -lcrypto"
   AC_CHECK_LIB(mysqlclient, mysql_real_connect, FOUND=yes, FOUND=no)
 
   if test "$FOUND" = "no"; then
@@ -290,8 +290,8 @@
     
 fi
 
-
 dnl mysql support 
+
 AC_ARG_ENABLE(postgres,
     [  --enable-postgres              PostgreSQL database support])
 AC_ARG_WITH(postgres_includes,
@@ -338,6 +338,46 @@
     
 fi
 
+AC_ARG_ENABLE(tcl,
+	[  --enable-tcl           Enable Tcl language support.],,
+	[enable_tcl="no"])
+dnl AC_MSG_RESULT($enable_tcl)
+
+if test "yes" = "$enable_tcl"; then
+
+    dnl let tclsh tell us where it was
+	dnl installed (prefer new tcl versions).
+	AC_CHECK_PROGS(TCLSH, tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh)
+    if test "$TCLSH" != ""; then
+        tclpath=`echo 'puts [[lindex $tcl_pkgPath 0]]' | $TCLSH`
+    fi
+
+    dnl let the user overwrite the installation
+	dnl directory which was just found.
+	AC_ARG_WITH(tcl,
+		[  --with-tcl=PATH         Location of tclConfig.sh],
+		tclpath="$withval")
+
+	dnl check, if tclConfig.sh can be found in
+	dnl tclsh's installation directory.
+    if test ! -r $tclpath/tclConfig.sh; then
+		AC_MSG_RESULT(
+		[
+	Can't find Tcl libraries.  Use --with-tcl to specify
+        the directory containing tclConfig.sh on your system.
+	Continuing build without Tcl support.])
+    else
+	dnl source tclsh's configuration file
+	dnl and tell the user about the version.
+	. $tclpath/tclConfig.sh
+	AC_MSG_CHECKING([for the tcl version number])
+	AC_MSG_RESULT([$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL])
+        LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC"
+	TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION"
+	CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL";
+    fi
+fi
+
 if test "$tru64_types" = "yes"; then
         AC_CHECK_TYPE(u_int8_t, unsigned char)
         AC_CHECK_TYPE(u_int16_t, unsigned short)
--- patch-configure.in ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: