syslog-ng3 fixes and fixes

Wed May 5 13:29:55 UTC 2010

There are a couple of niggling little issues but otherwise looks good. I'll 
try to get started on it at noon today.

-- 
Cheers,
Cy Schubert
<Cy.Schubert at komquats.com>

In message <4BE13FCB.3060805 at fang.fa.gau.hu>, Peter Czanik writes:
> This is a multi-part message in MIME format.
> 
> --Boundary_(ID_yYKcKH83wcTBP+FOC5DDpw)
> Content-type: text/plain; charset=ISO-8859-2
> Content-transfer-encoding: 7BIT
> 
> Hello,
> 
> Attached is a diff, which updates the port to syslog-ng version 3.1.1,
> adds new features and fixes a number of bugs:
> 
> - using options now actually works (had to change to use .include
> <bsd.port.options.mk>)
> - compiling SSL works (only with openssl from ports, as ssl in base
> system does not provide pkg-config files, which configure looks for...)
> - all features can be switched from options menu
> - added database support
> 
> They worked for me, but I don't have yet long experience in FreeBSD port
> maintenance. Please test my patches and commit them.
> 
> 3.1 brings a number of bugfixes compared to 3.0 and some new features.
> Here is a list from the ChangeLog:
> 
>         New features:
>         * Support for patterndb v2 and v3 format, along with a bunch of new
>           parsers: ANYSTRING, IPv6, IPvANY and FLOAT.
> 
>         * Added a new "pdbtool" utility to manage patterndb files: convert
>           them from v1 or v2 format, merge mulitple patterndb files into one
>           and look up matching patterns given a specific message.
> 
>         * Support for message tags: tags can be assigned to log messages as
>           they enter syslog-ng: either by the source driver or via patterndb.
>           Later it these tags can be used for efficient filtering.
> 
>         * Added support for rewriting structured data.
> 
>         * Macros and name-value pairs got a little tighter integration,
>           in filters where syslog-ng 3.0 was limited to only use name-value
>           pairs, with 3.1 you can also use macros.
> 
>         * Enhanced dynamic name-value performance by a factor of three.
> 
>         * Some parsers got additional features: NUMBER is now able to parse
>           hexadecimal numbers, ESTRING is now able to search for multiple
>           characters as the end of the string.
> 
>         * Added non-standard and non-portable facility codes (range 10-15),
>           decouple syslog-ng facility name information from the system used
>           to compile syslog-ng on.
> 
>         * Added pcre support in the binary packages of syslog-ng.
> 
>         An updated administrator's guide is available on the BalaBit
>         documentation page at:
> 
>                 http://www.balabit.com/support/documentation/
> 
> 
> Bye,
> CzP
> 
> --Boundary_(ID_yYKcKH83wcTBP+FOC5DDpw)
> Content-type: text/x-patch; name=syslog-ng3_30_to_31.diff
> Content-transfer-encoding: 7BIT
> Content-disposition: attachment; filename=syslog-ng3_30_to_31.diff
> 
> diff -ru syslog-ng3.old/Makefile syslog-ng3/Makefile
> --- syslog-ng3.old/Makefile	2010-05-05 11:29:11.000000000 +0200
> +++ syslog-ng3/Makefile	2010-05-04 22:32:29.000000000 +0200
> @@ -6,7 +6,7 @@
>  #
>  
>  PORTNAME=	syslog-ng
> -PORTVERSION=	3.0.3
> +PORTVERSION=	3.1.1
>  PORTREVISION=	3
>  CATEGORIES=	sysutils
>  MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/source
> s/$(PORTVERSION)/source/
> @@ -16,12 +16,20 @@
>  MAINTAINER=	cy at FreeBSD.org
>  COMMENT=	A powerful syslogd replacement
>  
> -OPTIONS=	SSL "Build with OpenSSL support (requires >= 7.x)" on \
> -		TCP_WRAPPERS "Build with TCP Wrappers" off 
> +OPTIONS=	SSL "Build with OpenSSL support (from ports)" off \
> +		TCP_WRAPPERS "Build with TCP Wrappers" off \
> +		SPOOF "Build with spoof source support" on \
> +		IPV6 "Build with IPV6 support" on \
> +		PCRE "Build with PCRE support" on \
> +		SQL "Build with database (libdbi) support" off
> +
> +.include <bsd.port.options.mk>
>  
>  BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
> +BUILD_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
>  LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
>  
> +MAN1=		pdbtool.1
>  MAN5=		syslog-ng.conf.5
>  MAN8=		syslog-ng.8
>  
> @@ -29,23 +37,54 @@
>  GNU_CONFIGURE=	yes
>  USE_GNOME=	glib20
>  SUB_FILES=	pkg-message
> -USE_OPENSSL=	yes
> -
>  
>  LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>  
>  CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
>  		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
> -CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` ${CFLAGS}" \
> -		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}" 
> +CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}inclu
> de ${CFLAGS}" \
> +		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
>  
> -.if defined (WITH_SSL)
> -CONFIGURE_ENV+=	OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
> -		OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
> +.if defined(WITH_SSL)
> +USE_OPENSSL=		yes
> +WITH_OPENSSL_PORT=	yes
> +CONFIGURE_ARGS+=	--enable-ssl
> +CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
> +			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
> +.else
> +CONFIGURE_args+=	--disable-ssl
>  .endif
>  
>  .if defined(WITH_TCP_WRAPPERS)
> -CONFIGURE_ARGS+=--enable-tcp-wrapper
> +CONFIGURE_ARGS+=	--enable-tcp-wrapper
> +.else
> +CONFIGURE_ARGS+=	--disable-tcp-wrapper
> +.endif
> +
> +.if defined(WITH_SPOOF)
> +CONFIGURE_ARGS+=	--enable-spoof-source
> +.else
> +CONFIGURE_ARGS+=	--disable-spoof-source
> +.endif
> +
> +.if defined(WITH_IPV6)
> +CONFIGURE_ARGS+=	--enable-ipv6
> +.else
> +CONFIGURE_ARGS+=	--disable-ipv6
> +.endif
> +
> +.if defined(WITH_PCRE)
> +CONFIGURE_ARGS+=	--enable-pcre
> +.else
> +CONFIGURE_ARGS+=	--disable-pcre
> +.endif
> +
> +.if defined(WITH_SQL)
> +LIB_DEPENDS=		dbi.0:${PORTSDIR}/databases/libdbi
> +CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
> +CONFIGURE_ARGS+=	--enable-sql
> +.else
> +CONFIGURE_ARGS+=	--disable-sql
>  .endif
>  
>  .include <bsd.port.pre.mk>
> @@ -61,7 +100,6 @@
>  		${WRKSRC}/src/utils.c ${WRKSRC}/src/utils.h
>  .endif
>  
> -
>  post-install:
>  .if !defined(NOPORTDOCS)
>  	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
> diff -ru syslog-ng3.old/distinfo syslog-ng3/distinfo
> --- syslog-ng3.old/distinfo	2010-05-05 11:29:11.000000000 +0200
> +++ syslog-ng3/distinfo	2010-05-04 22:11:33.000000000 +0200
> @@ -1,3 +1,3 @@
> -MD5 (syslog-ng_3.0.3.tar.gz) = b8b3c9af28696bce48ceca0de6444426
> -SHA256 (syslog-ng_3.0.3.tar.gz) = bf6e9f84747ff4a7d2181f67716d434b924da3eee7
> f199ad5f3c526cbb121bb8
> -SIZE (syslog-ng_3.0.3.tar.gz) = 546397
> +MD5 (syslog-ng_3.1.1.tar.gz) = 4fdc64ff0ad964dc811a746228609412
> +SHA256 (syslog-ng_3.1.1.tar.gz) = 4ad01ddecb7845604df22fc31b8704da8fc30334d2
> f383b8637eb50a581c983e
> +SIZE (syslog-ng_3.1.1.tar.gz) = 700577
> diff -ru syslog-ng3.old/pkg-plist syslog-ng3/pkg-plist
> --- syslog-ng3.old/pkg-plist	2010-05-05 11:29:11.000000000 +0200
> +++ syslog-ng3/pkg-plist	2010-05-04 22:11:33.000000000 +0200
> @@ -1,7 +1,9 @@
>  @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
>  etc/syslog-ng.conf.sample
>  bin/loggen
> +bin/pdbtool
>  sbin/syslog-ng
> +sbin/syslog-ng-ctl
>  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>  %%PORTDOCS%%%%DOCSDIR%%/COPYING
>  %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> 
> --Boundary_(ID_yYKcKH83wcTBP+FOC5DDpw)--