Update to the latest stable version.

Submitted by:	maintainer

18 files changed, 112 insertions, 98 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 1a670b61dccb..6318b53741b7 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	syslog-ng
 # Date created:		22 April 2000
-# Whom:			Vince Valenti <vince@bendnet.com>
+# Whom:			Vince Valenti <vince@blue-box.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	1.4.17
+PORTVERSION=	1.6.0.r1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.hu/downloads/syslog-ng/1.4/
+MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/1.6/src/
+DISTNAME=	${PORTNAME}-1.6.0rc1
 
-MAINTAINER=	vince@bendnet.com
+MAINTAINER=	vince@blue-box.net
 COMMENT=	A powerfull syslogd replacement
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libol.a:${PORTSDIR}/devel/libol
@@ -23,6 +24,10 @@ USE_REINPLACE=	yes
 
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
+.if defined(WITH_TCP_WRAPPERS)
+CONFIGURE_ARGS+=--enable-tcp-wrapper
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
 
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 6d45b5e896ae..d6a8f63c8103 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1 +1 @@
-MD5 (syslog-ng-1.4.17.tar.gz) = dc1e520c96cf290d237711bcee14f8ed
+MD5 (syslog-ng-1.6.0rc1.tar.gz) = 9deb2c4401ded0fa1c3484339abd285b
diff --git a/sysutils/syslog-ng/files/patch-ab b/sysutils/syslog-ng/files/patch-ab
deleted file mode 100644
index c3462cd8f8e4..000000000000
--- a/sysutils/syslog-ng/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure	Wed Apr 19 12:46:10 2000
-+++ configure	Thu May 18 12:22:27 2000
-@@ -2638,3 +2638,3 @@
- else
--	CFLAGS="-O2 -Wall $LIBOL_CFLAGS -D_GNU_SOURCE"
-+	CFLAGS="${CFLAGS} -Wall $LIBOL_CFLAGS -D_GNU_SOURCE"
- 	YFLAGS="-d"
-
diff --git a/sysutils/syslog-ng/files/patch-ac b/sysutils/syslog-ng/files/patch-ac
deleted file mode 100644
index 73a1dd446917..000000000000
--- a/sysutils/syslog-ng/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/syslog-names.c.orig	Thu Apr 19 21:15:46 2001
-+++ src/syslog-names.c	Thu Apr 19 21:19:19 2001
-@@ -56,7 +56,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-cfg-lex.l b/sysutils/syslog-ng/files/patch-cfg-lex.l
new file mode 100644
index 000000000000..d711d347c238
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-cfg-lex.l
@@ -0,0 +1,11 @@
+--- src/cfg-lex.l.orig	Wed Mar  5 13:14:04 2003
++++ src/cfg-lex.l	Wed Mar  5 13:14:13 2003
+@@ -80,7 +80,7 @@
+ 	{ "dir_owner",		KW_DIR_OWNER },
+ 	{ "dir_group",		KW_DIR_GROUP },
+         { "dir_perm",           KW_DIR_PERM },
+-        { "template",           KW_FILE_TEMPLATE },
++/*        { "template",           KW_FILE_TEMPLATE },*/
+         { "template-escape",	KW_TEMPLATE_ESCAPE },
+         { "template_escape",	KW_TEMPLATE_ESCAPE },
+  	{ "keep-alive",         KW_KEEP_ALIVE },
diff --git a/sysutils/syslog-ng/files/patch-syslog-names.c b/sysutils/syslog-ng/files/patch-syslog-names.c
new file mode 100644
index 000000000000..7f1f7f8d18fe
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-syslog-names.c
@@ -0,0 +1,20 @@
+--- 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-aa b/sysutils/syslog-ng/files/patch-syslog-ng.h
index 8588b581e235..82338e393163 100644
--- a/sysutils/syslog-ng/files/patch-aa
+++ b/sysutils/syslog-ng/files/patch-syslog-ng.h
@@ -1,16 +1,15 @@
---- src/syslog-ng.h.orig	Tue Feb 22 09:50:29 2000
-+++ src/syslog-ng.h	Wed Apr 26 17:42:07 2000
+--- 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     "/etc/syslog-ng/syslog-ng.conf"
+ #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
 -#define PATH_PIDFILE            "/var/run/syslog-ng.pid"
-+#define PATH_SYSLOG_NG_CONF     "__PREFIX__/etc/syslog-ng/syslog-ng.conf"
 +#define PATH_PIDFILE            "/var/run/syslog.pid"
  #endif
-
+ 
  #define ST_QUIT                 16
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 0986ac9620a5..f598ca1d2755 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -21,6 +21,7 @@ destination security { file("/var/log/security"); };
 destination maillog { file("/var/log/maillog"); };
 destination lpd-errs { file("/var/log/lpd-errs"); };
 destination cron { file("/var/log/cron"); };
+destination consolelog { file("/var/log/console.log"); };
 destination all { file("/var/log/all.log"); };
 destination newscrit { file("/var/log/news/news.crit"); };
 destination newserr { file("/var/log/news/news.err"); };
@@ -28,7 +29,6 @@ destination newsnotice { file("/var/log/news/news.notice"); };
 destination slip { file("/var/log/slip.log"); };
 destination ppp { file("/var/log/ppp.log"); };
 destination console { file("/dev/console"); };
-destination root { usertty("root"); };
 destination allusers { usertty("*"); };
 #destination loghost { udp("loghost" port(514)); };
 
@@ -37,6 +37,7 @@ destination allusers { usertty("*"); };
 #
 filter f_auth { facility(auth); };
 filter f_authpriv { facility(authpriv); };
+filter f_console { facility(console); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
 filter f_ftp { facility(ftp); };
@@ -112,28 +113,19 @@ log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); };
 log { source(src); filter(f_cron); destination(cron); };
 
 #
-# *.err							root
-#
-log { source(src); filter(f_err); destination(root); };
-
-#
-# *.notice;news.err					root
-#
-log { source(src); filter(f_notice); destination(root); };
-log { source(src); filter(f_news); filter(f_err); destination(root); };
-
-#
-# *.alert						root
+# *.emerg						*
 #
-log { source(src); filter(f_alert); destination(root); };
+log { source(src); filter(f_emerg); destination(allusers); };
 
 #
-# *.emerg						*
+# uncomment this to log all writes to /dev/console to /var/log/console.log
+# console.info						/var/log/console.log
 #
-log { source(src); filter(f_emerg); destination(allusers); };
+#log { source(src); filter(f_console); filter(f_info); destination(consolelog); };
 
 #
 # uncomment this to enable logging of all log messages to /var/log/all.log
+# touch /var/log/all.log and chmod it to mode 600 before it will work
 # *.*							/var/log/all.log
 #
 #log { source(src); destination(all); };
diff --git a/sysutils/syslog-ng/pkg-descr b/sysutils/syslog-ng/pkg-descr
index 83c643681e23..99d4182ac377 100644
--- a/sysutils/syslog-ng/pkg-descr
+++ b/sysutils/syslog-ng/pkg-descr
@@ -4,7 +4,7 @@ syslogd.  Features include:
   - ability to filter messages based on content using regular expressions
   - forwarding logs on TCP
 
-WWW: http://www.balabit.hu/en/downloads/syslog-ng/
+WWW: http://www.balabit.com/products/syslog_ng/
 
 -Vince Valenti
-vince@bendnet.com
+vince@blue-box.net
diff --git a/sysutils/syslog-ng1/Makefile b/sysutils/syslog-ng1/Makefile
index 1a670b61dccb..6318b53741b7 100644
--- a/sysutils/syslog-ng1/Makefile
+++ b/sysutils/syslog-ng1/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	syslog-ng
 # Date created:		22 April 2000
-# Whom:			Vince Valenti <vince@bendnet.com>
+# Whom:			Vince Valenti <vince@blue-box.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	1.4.17
+PORTVERSION=	1.6.0.r1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.hu/downloads/syslog-ng/1.4/
+MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/1.6/src/
+DISTNAME=	${PORTNAME}-1.6.0rc1
 
-MAINTAINER=	vince@bendnet.com
+MAINTAINER=	vince@blue-box.net
 COMMENT=	A powerfull syslogd replacement
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libol.a:${PORTSDIR}/devel/libol
@@ -23,6 +24,10 @@ USE_REINPLACE=	yes
 
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
+.if defined(WITH_TCP_WRAPPERS)
+CONFIGURE_ARGS+=--enable-tcp-wrapper
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
 
diff --git a/sysutils/syslog-ng1/distinfo b/sysutils/syslog-ng1/distinfo
index 6d45b5e896ae..d6a8f63c8103 100644
--- a/sysutils/syslog-ng1/distinfo
+++ b/sysutils/syslog-ng1/distinfo
@@ -1 +1 @@
-MD5 (syslog-ng-1.4.17.tar.gz) = dc1e520c96cf290d237711bcee14f8ed
+MD5 (syslog-ng-1.6.0rc1.tar.gz) = 9deb2c4401ded0fa1c3484339abd285b
diff --git a/sysutils/syslog-ng1/files/patch-ab b/sysutils/syslog-ng1/files/patch-ab
deleted file mode 100644
index c3462cd8f8e4..000000000000
--- a/sysutils/syslog-ng1/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure	Wed Apr 19 12:46:10 2000
-+++ configure	Thu May 18 12:22:27 2000
-@@ -2638,3 +2638,3 @@
- else
--	CFLAGS="-O2 -Wall $LIBOL_CFLAGS -D_GNU_SOURCE"
-+	CFLAGS="${CFLAGS} -Wall $LIBOL_CFLAGS -D_GNU_SOURCE"
- 	YFLAGS="-d"
-
diff --git a/sysutils/syslog-ng1/files/patch-ac b/sysutils/syslog-ng1/files/patch-ac
deleted file mode 100644
index 73a1dd446917..000000000000
--- a/sysutils/syslog-ng1/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/syslog-names.c.orig	Thu Apr 19 21:15:46 2001
-+++ src/syslog-names.c	Thu Apr 19 21:19:19 2001
-@@ -56,7 +56,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-ng1/files/patch-cfg-lex.l b/sysutils/syslog-ng1/files/patch-cfg-lex.l
new file mode 100644
index 000000000000..d711d347c238
--- /dev/null
+++ b/sysutils/syslog-ng1/files/patch-cfg-lex.l
@@ -0,0 +1,11 @@
+--- src/cfg-lex.l.orig	Wed Mar  5 13:14:04 2003
++++ src/cfg-lex.l	Wed Mar  5 13:14:13 2003
+@@ -80,7 +80,7 @@
+ 	{ "dir_owner",		KW_DIR_OWNER },
+ 	{ "dir_group",		KW_DIR_GROUP },
+         { "dir_perm",           KW_DIR_PERM },
+-        { "template",           KW_FILE_TEMPLATE },
++/*        { "template",           KW_FILE_TEMPLATE },*/
+         { "template-escape",	KW_TEMPLATE_ESCAPE },
+         { "template_escape",	KW_TEMPLATE_ESCAPE },
+  	{ "keep-alive",         KW_KEEP_ALIVE },
diff --git a/sysutils/syslog-ng1/files/patch-syslog-names.c b/sysutils/syslog-ng1/files/patch-syslog-names.c
new file mode 100644
index 000000000000..7f1f7f8d18fe
--- /dev/null
+++ b/sysutils/syslog-ng1/files/patch-syslog-names.c
@@ -0,0 +1,20 @@
+--- 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-ng1/files/patch-aa b/sysutils/syslog-ng1/files/patch-syslog-ng.h
index 8588b581e235..82338e393163 100644
--- a/sysutils/syslog-ng1/files/patch-aa
+++ b/sysutils/syslog-ng1/files/patch-syslog-ng.h
@@ -1,16 +1,15 @@
---- src/syslog-ng.h.orig	Tue Feb 22 09:50:29 2000
-+++ src/syslog-ng.h	Wed Apr 26 17:42:07 2000
+--- 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     "/etc/syslog-ng/syslog-ng.conf"
+ #define PATH_SYSLOG_NG_CONF     PATH_SYSCONFDIR "/syslog-ng.conf"
 -#define PATH_PIDFILE            "/var/run/syslog-ng.pid"
-+#define PATH_SYSLOG_NG_CONF     "__PREFIX__/etc/syslog-ng/syslog-ng.conf"
 +#define PATH_PIDFILE            "/var/run/syslog.pid"
  #endif
-
+ 
  #define ST_QUIT                 16
diff --git a/sysutils/syslog-ng1/files/syslog-ng.conf.sample b/sysutils/syslog-ng1/files/syslog-ng.conf.sample
index 0986ac9620a5..f598ca1d2755 100644
--- a/sysutils/syslog-ng1/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng1/files/syslog-ng.conf.sample
@@ -21,6 +21,7 @@ destination security { file("/var/log/security"); };
 destination maillog { file("/var/log/maillog"); };
 destination lpd-errs { file("/var/log/lpd-errs"); };
 destination cron { file("/var/log/cron"); };
+destination consolelog { file("/var/log/console.log"); };
 destination all { file("/var/log/all.log"); };
 destination newscrit { file("/var/log/news/news.crit"); };
 destination newserr { file("/var/log/news/news.err"); };
@@ -28,7 +29,6 @@ destination newsnotice { file("/var/log/news/news.notice"); };
 destination slip { file("/var/log/slip.log"); };
 destination ppp { file("/var/log/ppp.log"); };
 destination console { file("/dev/console"); };
-destination root { usertty("root"); };
 destination allusers { usertty("*"); };
 #destination loghost { udp("loghost" port(514)); };
 
@@ -37,6 +37,7 @@ destination allusers { usertty("*"); };
 #
 filter f_auth { facility(auth); };
 filter f_authpriv { facility(authpriv); };
+filter f_console { facility(console); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
 filter f_ftp { facility(ftp); };
@@ -112,28 +113,19 @@ log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); };
 log { source(src); filter(f_cron); destination(cron); };
 
 #
-# *.err							root
-#
-log { source(src); filter(f_err); destination(root); };
-
-#
-# *.notice;news.err					root
-#
-log { source(src); filter(f_notice); destination(root); };
-log { source(src); filter(f_news); filter(f_err); destination(root); };
-
-#
-# *.alert						root
+# *.emerg						*
 #
-log { source(src); filter(f_alert); destination(root); };
+log { source(src); filter(f_emerg); destination(allusers); };
 
 #
-# *.emerg						*
+# uncomment this to log all writes to /dev/console to /var/log/console.log
+# console.info						/var/log/console.log
 #
-log { source(src); filter(f_emerg); destination(allusers); };
+#log { source(src); filter(f_console); filter(f_info); destination(consolelog); };
 
 #
 # uncomment this to enable logging of all log messages to /var/log/all.log
+# touch /var/log/all.log and chmod it to mode 600 before it will work
 # *.*							/var/log/all.log
 #
 #log { source(src); destination(all); };
diff --git a/sysutils/syslog-ng1/pkg-descr b/sysutils/syslog-ng1/pkg-descr
index 83c643681e23..99d4182ac377 100644
--- a/sysutils/syslog-ng1/pkg-descr
+++ b/sysutils/syslog-ng1/pkg-descr
@@ -4,7 +4,7 @@ syslogd.  Features include:
   - ability to filter messages based on content using regular expressions
   - forwarding logs on TCP
 
-WWW: http://www.balabit.hu/en/downloads/syslog-ng/
+WWW: http://www.balabit.com/products/syslog_ng/
 
 -Vince Valenti
-vince@bendnet.com
+vince@blue-box.net