FreeBSD port of Argus-3,0 (@SASLFLAGS@ et.al.)

[Carter Bullard]

Hey Stefan,
Thanks for the suggestions.   I will take a look, and try to get some
of the CMU folk to take a look, to see what makes sense for the
general release.  I would like to think that argus-3.0 supported
either SASL v 1 or 2, so we may have a little bit of work still left.

I would suggest that the default build be without SASL.  There are
a lot of reasons in both directions (with or without), but because
the configuration is a bit complicated, having it off seemed to be
the best default approach.

Carter


On Oct 28, 2006, at 6:39 AM, Stefan Esser wrote:

> Hi Carter,
>
> for a long time I've been maintaining the FreeBSD port of argus
> (currently based on 2.0.6), and I want to add new ports named
> argus3 and argus3-clients as soon as the RC phase is over.
>
> The plan is to keep the argus-2.0.6 port until users have switched
> over to argus-3. For that reason I do not intend to just upgrade
> the port from 2.0.6, but to offer 3.x as a separate package.
>
> I have sent my current version of the "port" to a few people
> and received some positive feedback. Argus can be built mostly
> out-of-the-box on FreeBSD, except for SASL support, which seems
> to make assumptions about the placement of include files and
> libraries that do not apply to FreeBSD.
>
> Attached to this mail are uni-diffs, which make the port build on
> FreeBSD with SASL. (I guess you want to fix the ".am" files, but
> I'm sending diffs for the ".in" files for easy reference ...)
>
> Only the patch to "configure" is problematic (i.e. conflicts
> with other supported architectures), since SASL headers are
> down one directory level (to support both SASL1 and SASL2 on
> the same box).
>
> I don't remember why <sys/types.h> must be included in argus_util.c,
> but this might also be a requirement only when building with SASL.
>
> If you feel the patches to configure and argus_util.c should be
> kept local to the FreeBSD port, I can easily keep them there ...
>
> The inclusion of @SASLFLAGS@ should be benign for all platforms
> and I'd appreciate, if you could include it in the affected files.
>
> BTW: I have no idea whether the pre-built binary package offered
> from the FreeBSD site should rather be built with or without support
> for SASL ...
>
> Regards, STefan
> --- Makefile.in~	Sat Sep 16 14:51:27 2006
> +++ Makefile.in	Sat Sep 16 14:51:32 2006
> @@ -28,6 +28,7 @@
>  LIBS = @LIBS@
>  WRAPLIBS = @WRAPLIBS@
>
> +CPPFLAGS = @SASLFLAGS@
>  CFLAGS = -g
>  LDFLAGS = -g
>
> --- argus/Makefile.in~	Tue Sep 26 05:36:13 2006
> +++ argus/Makefile.in	Sun Oct  1 22:08:43 2006
> @@ -41,7 +41,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include
> +INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include @SASLFLAGS@
>  DEFS = @DEFS@ -DARGUS_SYSLOG=1
>  #DEFS = -DARGUSPERFMETRICS=1 @DEFS@
>
> --- common/Makefile.in.orig	Thu Aug 10 16:54:14 2006
> +++ common/Makefile.in	Sat Sep 16 14:52:36 2006
> @@ -32,7 +32,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include
> +INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include @SASLFLAGS@
>  DEFS = @DEFS@ -DARGUS_SYSLOG=1
>
>  # Standard CFLAGS
> --- configure.orig	Mon Apr 26 14:39:58 2004
> +++ configure	Mon Apr 26 14:40:16 2004
> @@ -4163,7 +4163,7 @@
>
>        if test -d ${with_sasl}; then
>            ac_cv_sasl_where_lib=${with_sasl}/lib
> -          ac_cv_sasl_where_inc=${with_sasl}/include
> +          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
>
>            SASLFLAGS="-I$ac_cv_sasl_where_inc"
>            LIB_SASL="-L$ac_cv_sasl_where_lib"
> --- clients/Makefile.in~	Fri Aug 18 16:29:41 2006
> +++ clients/Makefile.in	Sat Sep 16 15:56:31 2006
> @@ -45,7 +45,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I. -I../include -I../common @V_INCLS@
> +INCLS = -I. -I../include -I../common @V_INCLS@ @SASLFLAGS@
>  DEFS = @DEFS@
>  COMPATLIB = @COMPATLIB@ @LIB_SASL@
>
> --- common/Makefile.in~	Fri Aug 18 16:14:57 2006
> +++ common/Makefile.in	Sat Sep 16 15:46:23 2006
> @@ -40,7 +40,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I. -I../include @V_INCLS@
> +INCLS = -I. -I../include @V_INCLS@ @SASLFLAGS@
>  DEFS = @DEFS@ -DARGUS_SYSLOG
>
>  # Standard CFLAGS
> --- common/argus_util.c~	Mon Jul 10 21:12:52 2006
> +++ common/argus_util.c	Mon Jul 10 21:14:02 2006
> @@ -55,7 +55,10 @@
>  #if defined(__NetBSD__)
>  #include <machine/limits.h>
>  #endif
> +#if defined(__FreeBSD__) /* should work for NetBSD too */
> +#include <sys/limits.h>
> +#endif
>
> --- radium/Makefile.in~	Fri Aug 18 16:18:24 2006
> +++ radium/Makefile.in	Sat Sep 16 15:52:33 2006
> @@ -44,7 +44,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I. -I../include -I../common @V_INCLS@
> +INCLS = -I. -I../include -I../common @V_INCLS@ @SASLFLAGS@
>  DEFS = @DEFS@
>  COMPATLIB = @COMPATLIB@ @LIB_SASL@
>
> --- ragrep/Makefile.in~	Wed Jun 14 02:01:35 2006
> +++ ragrep/Makefile.in	Sat Sep 16 15:53:46 2006
> @@ -38,7 +38,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../common  
> @V_INCLS@
> +INCLS = -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../common  
> @V_INCLS@ @SASLFLAGS@
>  DEFS = @DEFS@
>  COMPATLIB = @COMPATLIB@ @LIB_SASL@
>
> --- ratop/Makefile.in~	Sat Sep 16 15:49:28 2006
> +++ ratop/Makefile.in	Sat Sep 16 15:49:05 2006
> @@ -45,7 +45,7 @@
>
>  CC = @CC@
>  CCOPT = @V_CCOPT@
> -INCLS = -I. -I../include -I../common @V_INCLS@
> +INCLS = -I. -I../include -I../common @V_INCLS@ @SASLFLAGS@
>  DEFS = @DEFS@
>  COMPATLIB = @COMPATLIB@ @LIB_SASL@
>  CURSESLIB = @CURSESLIB@
> --- configure~	Sat Sep 16 15:39:09 2006
> +++ configure	Sat Sep 16 15:40:27 2006
> @@ -5909,7 +5909,7 @@
>
>        if test -d ${with_sasl}; then
>            ac_cv_sasl_where_lib=${with_sasl}/lib
> -          ac_cv_sasl_where_inc=${with_sasl}/include
> +          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
>
>            SASLFLAGS="-I$ac_cv_sasl_where_inc"
>            LIB_SASL="-L$ac_cv_sasl_where_lib"




-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://pairlist1.pair.net/pipermail/argus/attachments/20061030/787dc786/attachment.html>