Syslog-ng tries to fill the gaps original syslogd's were lacking:

        * powerful configurability
	* filtering based on message content
	* message integrity, message encryption (not yet implemented in 1.4.x)
	* portability
	* better network forwarding

8 files changed, 213 insertions, 0 deletions

diff --git a/sysutils/syslog-ng/DESCR b/sysutils/syslog-ng/DESCR
new file mode 100644
index 00000000000..b3e192d6e5c
--- /dev/null
+++ b/sysutils/syslog-ng/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption (not yet implemented in 1.4.x)
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng/MESSAGE.NetBSD b/sysutils/syslog-ng/MESSAGE.NetBSD
new file mode 100644
index 00000000000..ee9fde75be0
--- /dev/null
+++ b/sysutils/syslog-ng/MESSAGE.NetBSD
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+
+You will need to set the following in /etc/rc.conf:
+
+	syslogd=NO
+	syslogng=YES
+
+There is a lot of work done by the standard NetBSD rc.d scripts
+to setup daemons in chroot environments.  Due to the way that
+syslog-ng deals with chroot programs this work is effectively by-passed.
+If you have any chroot daemons please ensure that syslog-ng is setup
+to work correctly with them.
+
+===========================================================================
diff --git a/sysutils/syslog-ng/MESSAGE.common b/sysutils/syslog-ng/MESSAGE.common
new file mode 100644
index 00000000000..3cc651a069c
--- /dev/null
+++ b/sysutils/syslog-ng/MESSAGE.common
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE.common,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+
+You will want to generate your own syslog-ng.conf from an existing
+customised syslog.conf before using syslog-ng. The ${PREFIX}/bin/syslog2ng
+script can be used to do this.  The resulting output should be copied to
+${PKG_SYSCONFDIR}/syslog-ng.conf
+
+===========================================================================
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
new file mode 100644
index 00000000000..da2a774f429
--- /dev/null
+++ b/sysutils/syslog-ng/Makefile
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+
+DISTNAME=	syslog-ng-1.6.11
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/1.6/src/
+
+MAINTAINER=	adrianp@NetBSD.org
+HOMEPAGE=	http://www.balabit.com/products/syslog_ng/
+COMMENT=	Syslog-ng tries to fill the gaps original syslogd's were lacking
+
+GNU_CONFIGURE=		YES
+RCD_SCRIPTS=		syslogng
+PKG_SYSCONFSUBDIR=	syslog-ng
+
+CONFIGURE_ARGS+=	--enable-tcp-wrapper
+
+EGDIR=			${PREFIX}/share/examples/syslog-ng
+DOCDIR=			${PREFIX}/share/doc/syslog-ng
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	doc/syslog-ng.8 doc/syslog-ng.conf.5 contrib/syslog2ng
+SUBST_SED.conf=		-e "s|/etc/syslog-ng|${PKG_SYSCONFDIR}|g"
+SUBST_SED.conf+=	-e "s|/usr/bin/awk|${AWK}|g"
+SUBST_MESSAGE.conf=	Fixing configuration file paths.
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../sysutils/libol/buildlink3.mk"
+
+BUILDLINK_API_DEPENDS.libol+=	libol>=0.3.0
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.syslog-ng
+PKG_SUPPORTED_OPTIONS=	spoof
+
+.include "../../mk/bsd.options.mk"
+
+#
+# spoof the original source address of forwarded syslog packets
+#
+.if !empty(PKG_OPTIONS:Mspoof)
+CONFIGURE_ARGS+=	--enable-spoof-source
+.include "../../devel/libnet11/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.1.2.1
+.endif
+
+pre-build:
+	cd ${WRKSRC}/doc/sgml && \
+		${PAX} -O -zrf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/syslog-ng
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
+
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.spoof ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.demo ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.solaris ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${PREFIX}/bin
+
+	${INSTALL_DATA} ${WRKSRC}/doc/sgml/syslog-ng.html/*.html ${DOCDIR}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST
new file mode 100644
index 00000000000..1cb29ad6f2c
--- /dev/null
+++ b/sysutils/syslog-ng/PLIST
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+bin/syslog2ng
+man/man5/syslog-ng.conf.5
+man/man8/syslog-ng.8
+sbin/syslog-ng
+share/doc/${PKGBASE}/book1.html
+share/doc/${PKGBASE}/destinations.html
+share/doc/${PKGBASE}/intro.html
+share/doc/${PKGBASE}/logpath.html
+share/doc/${PKGBASE}/msgroute.html
+share/doc/${PKGBASE}/reference.html
+share/doc/${PKGBASE}/tuning.html
+share/doc/${PKGBASE}/index.html
+share/doc/${PKGBASE}/x731.html
+share/doc/${PKGBASE}/x771.html
+share/doc/${PKGBASE}/x903.html
+share/doc/${PKGBASE}/x909.html
+share/doc/${PKGBASE}/x172.html
+share/doc/${PKGBASE}/x361.html
+share/doc/${PKGBASE}/x97.html
+share/doc/${PKGBASE}/INSTALL
+share/doc/${PKGBASE}/README
+share/doc/${PKGBASE}/README.spoof
+share/doc/${PKGBASE}/syslog-ng.conf.doc
+share/examples/rc.d/syslogng
+share/examples/syslog-ng/syslog-ng.conf.demo
+share/examples/syslog-ng/syslog-ng.conf.sample
+share/examples/syslog-ng/syslog-ng.conf.solaris
+@dirrm share/examples/syslog-ng
+@dirrm share/doc/syslog-ng
+@dirrm share/doc/html/syslog-ng
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
new file mode 100644
index 00000000000..6dc22ddc6f7
--- /dev/null
+++ b/sysutils/syslog-ng/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+
+SHA1 (syslog-ng-1.6.11.tar.gz) = acbee602fd4cb6a1ca40238742642413cd6f1787
+RMD160 (syslog-ng-1.6.11.tar.gz) = 2ddd5eaae12dbcef4b4e67f83d01a3bab8b2cce0
+Size (syslog-ng-1.6.11.tar.gz) = 712166 bytes
+SHA1 (patch-ac) = 73b60fa4cf2cce6821873c51dba6b5327ee08f07
diff --git a/sysutils/syslog-ng/files/syslogng.sh b/sysutils/syslog-ng/files/syslogng.sh
new file mode 100644
index 00000000000..4b0e6d8552b
--- /dev/null
+++ b/sysutils/syslog-ng/files/syslogng.sh
@@ -0,0 +1,34 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: syslogng.sh,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+#
+
+# PROVIDE: syslogd
+# REQUIRE: mountcritremote sysdb wscons
+# BEFORE:  SERVERS
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="syslogng"
+rcvar=${name}
+ngname="syslog-ng"
+command="@PREFIX@/sbin/${ngname}"
+pidfile="@VARBASE@/run/${ngname}.pid"
+required_files="@PKG_SYSCONFDIR@/${ngname}.conf"
+extra_commands="reload checkconfig"
+reload_cmd="syslogng_reload"
+checkconfig_cmd="syslogng_checkconfig"
+command_args="-p ${pidfile} -f ${required_files}"
+
+syslogng_reload() {
+	kill -HUP `cat ${pidfile}`
+}
+
+syslogng_checkconfig() {
+	${command} -s -f ${required_files}
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/syslog-ng/patches/patch-ac b/sysutils/syslog-ng/patches/patch-ac
new file mode 100644
index 00000000000..ea3ff5b3362
--- /dev/null
+++ b/sysutils/syslog-ng/patches/patch-ac
@@ -0,0 +1,43 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/05/14 19:56:05 adrianp Exp $
+
+# add NetBSD support and fix some paths
+
+--- contrib/syslog2ng.orig	Thu Jun 19 14:24:03 2003
++++ contrib/syslog2ng	Thu Jun 19 14:24:13 2003
+@@ -5,18 +5,24 @@
+ # Translator from syslog.conf to syslog-ng.conf
+ # by Jonathan W. Marks <j-marks@uiuc.edu>
+ #
+-# Rev 2
++# Rev 2.1
+ 
+ BEGIN {
+ 	# Handle the various platforms- determine proper log device
+-	"/bin/uname -s" | getline sysname;
+-	close("/bin/uname -s");
++	"/usr/bin/uname -s" | getline sysname;
++	close("/usr/bin/uname -s");
+ 	if (sysname == "SunOS") {
+ 		LOGDEVTYPE="sun-streams";
++		LOGDEVPATH="/dev/log";
+ 	} else if (sysname == "AIX") {
+ 		LOGDEVTYPE="unix-dgram";
++		LOGDEVPATH="/dev/log";
+ 	} else if (sysname == "Linux") {
+ 		LOGDEVTYPE="unix-stream";
++		LOGDEVPATH="/dev/log";
++	} else if (sysname == "NetBSD") {
++		LOGDEVTYPE="unix-dgram";
++		LOGDEVPATH="/var/run/log";
+ 	} else {
+ 		print "!!! Unsupported system: " sysname ".";
+ 		exit 1;
+@@ -29,7 +35,7 @@
+ 
+ 	print \
+ "source local {\n" \
+-"	" LOGDEVTYPE "(\"/dev/log\");\n" \
++"	" LOGDEVTYPE "(\"" LOGDEVPATH "\");\n" \
+ "	udp(ip(0.0.0.0) port(514));\n" \
+ "	internal();\n" \
+ "};\n";