Update (replace) syslog-ng version 1 with syslog-ng version 3.

Previous history for syslog-ng version 3 can be found in sysutils/syslog-ng3.

Suggested by:	syslog-ng upline and syslog-ng version 1 maintainer.
Approved by:	syslog-ng version 1 maintainer and syslog-ng version 3 maintainer

10 files changed, 178 insertions, 86 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 57e54791a7f..37209252589 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,73 +1,138 @@
 # New ports collection makefile for:	syslog-ng
-# Date created:		22 April 2000
-# Whom:			Vince Valenti <vince@blue-box.net>
+# Date created:		10 november 1006
+# Whom:			Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	1.6.12
-PORTREVISION=	1
+PORTVERSION=	3.2.4
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
+PKGNAMESUFFIX=	3
+DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
 
-MAINTAINER=	lme@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A powerful syslogd replacement
 
-FORBIDDEN=	Vulnerable since 2008-11-18, http://portaudit.freebsd.org/75f2382e-b586-11dd-95f9-00e0815b8da8.html
-EXPIRATION_DATE=	2011-10-14
+CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0124-9]-[0-9]* \
+		syslog-ng[0-9]-devel-[0-9]*
 
-GNU_CONFIGURE=	yes
-PKGMESSAGE=	${WRKDIR}/MESSAGE
-USE_RC_SUBR=	syslog-ng.sh
+OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
+		PORTS_SSL "Build with OpenSSL support (from ports)" off \
+		TCP_WRAPPERS "Build with TCP Wrappers" off \
+		SQL "Build with database (libdbi) support" off \
+		SPOOF "Build with spoof source support" off \
+		IPV6 "Build with IPV6 support" on \
+		PCRE "Build with PCRE support" on
 
-OPTIONS=	TCP_WRAPPERS "Enable TCP wrapper support" off \
-		SPOOF_SOURCE "Enable spoof-source support" off
+.include <bsd.port.options.mk>
 
-SUB_FILES=	pkg-message
+LIB_DEPENDS=	evtlog.0:${PORTSDIR}/sysutils/eventlog
 
+MAN1=		loggen.1 pdbtool.1 syslog-ng-ctl.1
 MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
+USE_RC_SUBR=	syslog-ng.sh
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20
+SUB_FILES=	pkg-message
+
+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
+		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
+CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
+		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+
+.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
+BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
+.endif
+
+.if defined(WITH_SYS_SSL) || defined(WITH_PORTS_SSL)
+USE_OPENSSL=            yes
+CONFIGURE_ARGS+=        --enable-ssl
+CONFIGURE_ENV+=         OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+                        OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
+.else
+CONFIGURE_ARGS+=        --disable-ssl
+.endif
+
+.if defined(WITH_PORTS_SSL)
+WITH_OPENSSL_PORT=      yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_TCP_WRAPPERS)
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
+.else
+CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
-.if defined(WITH_SPOOF_SOURCE)
-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
-CONFIGURE_ENV=	CFLAGS+="`${LIBNET_CONFIG} --cflags`" \
-		CPPFLAGS+="`${LIBNET_CONFIG} --defines`" \
-		LDFLAGS+="`${LIBNET_CONFIG} --libs`"
+.if defined(WITH_SPOOF)
+BUILD_DEPENDS=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet-devel
+LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet115-config
 CONFIGURE_ARGS+=	--enable-spoof-source
-BUILD_DEPENDS+=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+.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
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
+.else
+CONFIGURE_ARGS+=	--disable-pcre
+.endif
+
+.if defined(WITH_SQL)
+LIB_DEPENDS+=		dbi.1:${PORTSDIR}/databases/libdbi
+CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
+CONFIGURE_ARGS+=	--enable-sql
+PLIST_FILES+=		lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so
+.else
+CONFIGURE_ARGS+=	--disable-sql
+.endif
+
+.if ${OSVERSION} >= 900034
+CONFIGURE_ARGS+=        --disable-linux-caps
 .endif
 
 post-patch:
-	@${REINPLACE_CMD}  \
-		-e 's:libnet-config:libnet11-config:g' \
-		-e 's|int foo(void)||' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's:libnet-config:libnet115-config:g' ${WRKSRC}/configure
+	@${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 .if ${OSVERSION} >= 900007
 	@${REINPLACE_CMD} \
 		-e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \
-		${WRKSRC}/configure ${WRKSRC}/src/afuser.c \
-		${WRKSRC}/src/utils.c ${WRKSRC}/src/utils.h
+		-e 's|ut_name|ut_user|' \
+		${WRKSRC}/configure ${WRKSRC}/modules/afuser/afuser.c \
+		${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
-		${DOCSDIR} ${DOCSDIR}/sgml
-.for f in AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README README.spoof
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/sgml/${PORTNAME}.* ${DOCSDIR}/sgml
+			${PREFIX}/share/doc/syslog-ng \
+			${PREFIX}/share/doc/syslog-ng/sgml
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/syslog-ng
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/syslog-ng
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/syslog-ng
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng
 .endif
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng
-	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
-		${PREFIX}/etc/syslog-ng
+	@if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \
+		${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/syslog-ng.conf ]; then \
+		${CP} ${PREFIX}/etc/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng.conf; \
+	fi
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 0a72aa76ec1..7da063ca32a 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-1.6.12.tar.gz) = 4f46f8ba0e96b3fa7657c84fbef104027c8c713d482fbd6357fc21be3768ae6c
-SIZE (syslog-ng-1.6.12.tar.gz) = 717903
+SHA256 (syslog-ng_3.2.4.tar.gz) = e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
+SIZE (syslog-ng_3.2.4.tar.gz) = 1435115
diff --git a/sysutils/syslog-ng/files/patch-scl-Makefile.in b/sysutils/syslog-ng/files/patch-scl-Makefile.in
new file mode 100644
index 00000000000..567af03179e
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-scl-Makefile.in
@@ -0,0 +1,11 @@
+--- scl/Makefile.in.orig	2011-01-15 08:15:10.000000000 -0800
++++ scl/Makefile.in	2011-01-20 21:16:20.000000000 -0800
+@@ -200,7 +200,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SCL_SUBDIRS = system pacct syslogconf
+-SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf
++SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf.dist
+ EXTRA_DIST = $(SCL_CONFIGS) $(SCL_SUBDIRS)
+ scldir = $(datadir)/include/scl
+ all: all-am
diff --git a/sysutils/syslog-ng/files/patch-syslog-names.c b/sysutils/syslog-ng/files/patch-syslog-names.c
deleted file mode 100644
index 7f1f7f8d18f..00000000000
--- a/sysutils/syslog-ng/files/patch-syslog-names.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/syslog-names.c.orig	Wed Mar  5 12:16:57 2003
-+++ src/syslog-names.c	Wed Mar  5 12:34:40 2003
-@@ -47,6 +47,7 @@
- #ifdef LOG_AUTHPRIV
- 	{ "authpriv", LOG_AUTHPRIV },
- #endif
-+	{ "console", LOG_CONSOLE },
- 	{ "cron", LOG_CRON },
- 	{ "daemon", LOG_DAEMON },
- #ifdef LOG_FTP
-@@ -56,7 +57,8 @@
- 	{ "lpr", LOG_LPR },
- 	{ "mail", LOG_MAIL },
- 	{ "news", LOG_NEWS },
--	{ "security", LOG_AUTH },           /* DEPRECATED */
-+	{ "ntp", LOG_NTP },
-+	{ "security", LOG_SECURITY },
- 	{ "syslog", LOG_SYSLOG },
- 	{ "user", LOG_USER },
- 	{ "uucp", LOG_UUCP },
diff --git a/sysutils/syslog-ng/files/patch-syslog-ng.h b/sysutils/syslog-ng/files/patch-syslog-ng.h
deleted file mode 100644
index 82338e39316..00000000000
--- a/sysutils/syslog-ng/files/patch-syslog-ng.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/syslog-ng.h.orig	Fri Apr 26 02:43:54 2002
-+++ src/syslog-ng.h	Wed Mar  5 12:08:02 2003
-@@ -32,10 +32,10 @@
- 
- #if WITH_DEBUG
- #define PATH_SYSLOG_NG_CONF     "syslog-ng.conf"
--#define PATH_PIDFILE            "syslog-ng.pid"
-+#define PATH_PIDFILE            "syslog.pid"
- #else
- #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
--#define PATH_PIDFILE            "/var/run/syslog-ng.pid"
-+#define PATH_PIDFILE            "/var/run/syslog.pid"
- #endif
- 
- #define ST_QUIT                 16
diff --git a/sysutils/syslog-ng/files/pkg-message.in b/sysutils/syslog-ng/files/pkg-message.in
index f6ffaaabe8f..2b558266089 100644
--- a/sysutils/syslog-ng/files/pkg-message.in
+++ b/sysutils/syslog-ng/files/pkg-message.in
@@ -2,8 +2,12 @@
 syslog-ng is now installed!  To replace FreeBSD's standard syslogd
 (/usr/sbin/syslogd), complete these steps:
 
-1. Create a configuration file named %%PREFIX%%/etc/syslog-ng/syslog-ng.conf
-   (a sample named syslog-ng.conf.sample has been included)
+1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf
+   (a sample named syslog-ng.conf.sample has been included in
+   %%PREFIX%%/etc). Note that this is a change in 2.0.2
+   version, previous ones put the config file in
+   %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update
+   move that file in the right place
 
 2. Configure syslog-ng to start automatically by adding the following
    to /etc/rc.conf:
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index c2059c4165d..a58743dad62 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,3 +1,5 @@
+@version:3.2
+
 #
 # This sample configuration file is essentially equilivent to the stock
 # FreeBSD /etc/syslog.conf file.
@@ -6,7 +8,7 @@
 #
 # options
 #
-options { long_hostnames(off); sync(0); };
+options { long_hostnames(off); flush_lines(0); };
 
 #
 # sources
@@ -43,7 +45,7 @@ destination allusers { usertty("*"); };
 filter f_auth { facility(auth); };
 filter f_authpriv { facility(authpriv); };
 filter f_not_authpriv { not facility(authpriv); };
-filter f_console { facility(console); };
+#filter f_console { facility(console); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
 filter f_ftp { facility(ftp); };
diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.sh.in
index 6f43b4217ea..1aa03e96135 100644
--- a/sysutils/syslog-ng/files/syslog-ng.sh.in
+++ b/sysutils/syslog-ng/files/syslog-ng.sh.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote cleanvar ldconfig
 # BEFORE:  SERVERS
 
 #
@@ -24,7 +24,7 @@ name=syslog_ng
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/syslog-ng
-required_files=%%PREFIX%%/etc/syslog-ng/syslog-ng.conf
+required_files=%%PREFIX%%/etc/syslog-ng.conf
 extra_commands=reload
 
 if checkyesno syslog_ng_purgeklog; then
diff --git a/sysutils/syslog-ng/pkg-descr b/sysutils/syslog-ng/pkg-descr
index 99d4182ac37..7ad66383cff 100644
--- a/sysutils/syslog-ng/pkg-descr
+++ b/sysutils/syslog-ng/pkg-descr
@@ -1,4 +1,4 @@
-syslog-ng (Syslog New Generation) is a powerful replacement for the standard
+syslog-ng3 (Syslog New Generation) is a powerful replacement for the standard
 syslogd.  Features include:
 
   - ability to filter messages based on content using regular expressions
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 6ca3b6c2a31..09704c5898a 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -1,17 +1,62 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
-etc/syslog-ng/syslog-ng.conf.sample
+etc/modules.conf
+etc/scl.conf
+@exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
+@unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.sample; then rm -f %D/etc/syslog-ng.conf; fi
+etc/syslog-ng.conf.dist
+etc/syslog-ng.conf.sample
+bin/update-patterndb
+bin/loggen
+bin/pdbtool
+lib/libsyslog-ng.la
+lib/libsyslog-ng.so
+lib/libsyslog-ng.so.0
+lib/syslog-ng/libaffile.la
+lib/syslog-ng/libaffile.so
+lib/syslog-ng/libafprog.la
+lib/syslog-ng/libafprog.so
+lib/syslog-ng/libafsocket.so
+lib/syslog-ng/libafsocket-notls.la
+lib/syslog-ng/libafsocket-notls.so
+lib/syslog-ng/libafuser.la
+lib/syslog-ng/libafuser.so
+lib/syslog-ng/libbasicfuncs.la
+lib/syslog-ng/libbasicfuncs.so
+lib/syslog-ng/libconfgen.la
+lib/syslog-ng/libconfgen.so
+lib/syslog-ng/libconvertfuncs.la
+lib/syslog-ng/libconvertfuncs.so
+lib/syslog-ng/libcsvparser.la
+lib/syslog-ng/libcsvparser.so
+lib/syslog-ng/libdbparser.la
+lib/syslog-ng/libdbparser.so
+lib/syslog-ng/libdummy.la
+lib/syslog-ng/libdummy.so
+lib/syslog-ng/libsyslogformat.la
+lib/syslog-ng/libsyslogformat.so
 sbin/syslog-ng
+sbin/syslog-ng-ctl
+share/include/scl/pacct/plugin.conf
+share/include/scl/syslogconf/README
+share/include/scl/syslogconf/convert-syslogconf.awk
+share/include/scl/syslogconf/plugin.conf
+share/include/scl/system/generate-system-source.sh
+share/include/scl/system/plugin.conf
+share/xsd/patterndb-1.xsd
+share/xsd/patterndb-2.xsd
+share/xsd/patterndb-3.xsd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/PORTS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.spoof
-%%PORTDOCS%%%%DOCSDIR%%/sgml/syslog-ng.xml
-%%PORTDOCS%%%%DOCSDIR%%/sgml/syslog-ng.html.tar.gz
-%%PORTDOCS%%%%DOCSDIR%%/sgml/syslog-ng.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/syslog-ng
+@dirrm share/xsd
+@dirrm share/include/scl/system
+@dirrm share/include/scl/syslogconf
+@dirrm share/include/scl/pacct
+@dirrm share/include/scl
+@dirrm share/include
+@dirrm lib/syslog-ng
+@dirrm etc/patterndb.d