Date: Mon, 7 Dec 2009 22:06:40 GMT From: Benjamin Lee <ben@b1c1l1.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/141255: sysutils/syslog-ng3 has bad syslog-ng.conf.sample Message-ID: <200912072206.nB7M6el8035191@www.freebsd.org> Resent-Message-ID: <200912072210.nB7MA39k043102@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141255
>Category: ports
>Synopsis: sysutils/syslog-ng3 has bad syslog-ng.conf.sample
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 07 22:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Benjamin Lee
>Release: 8.0-RELEASE
>Organization:
>Environment:
FreeBSD eclipse.b1c1l1.com 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:48:17 UTC 2009 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The sysutils/syslog-ng3 provides a bad syslog-ng.conf.sample.
Additionally, it is installed to the wrong location (/usr/local/etc/syslog-ng rather than /usr/local/etc).
>How-To-Repeat:
1. Install sysutils/syslog-ng3
2. cp /usr/local/etc/syslog-ng/syslog-ng.conf.sample /usr/local/etc/syslog-ng.conf
3. /usr/local/etc/rc.d/syslog-ng start
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN syslog-ng3.orig/Makefile syslog-ng3/Makefile
--- syslog-ng3.orig/Makefile 2009-09-22 20:53:46.000000000 -0700
+++ syslog-ng3/Makefile 2009-12-07 13:58:33.000000000 -0800
@@ -64,9 +64,8 @@
${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng
.endif
- @if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \
- ${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
@${CAT} ${PKGMESSAGE}
diff -ruN syslog-ng3.orig/files/pkg-message.in syslog-ng3/files/pkg-message.in
--- syslog-ng3.orig/files/pkg-message.in 2009-07-13 15:13:25.000000000 -0700
+++ syslog-ng3/files/pkg-message.in 2009-12-07 13:56:12.000000000 -0800
@@ -4,7 +4,7 @@
1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf
(a sample named syslog-ng.conf.sample has been included in
- %%PREFIX%%/etc/syslog-ng). Note that this is a change in 2.0.2
+ %%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
diff -ruN syslog-ng3.orig/files/syslog-ng.conf.sample syslog-ng3/files/syslog-ng.conf.sample
--- syslog-ng3.orig/files/syslog-ng.conf.sample 2009-07-13 15:13:25.000000000 -0700
+++ syslog-ng3/files/syslog-ng.conf.sample 2009-12-07 13:55:01.000000000 -0800
@@ -1,3 +1,5 @@
+@version:3.0
+
#
# 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 @@
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 -ruN syslog-ng3.orig/pkg-plist syslog-ng3/pkg-plist
--- syslog-ng3.orig/pkg-plist 2009-07-13 15:13:25.000000000 -0700
+++ syslog-ng3/pkg-plist 2009-12-07 14:02:14.000000000 -0800
@@ -1,5 +1,5 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
-etc/syslog-ng/syslog-ng.conf.sample
+etc/syslog-ng.conf.sample
bin/loggen
sbin/syslog-ng
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -9,4 +9,3 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/syslog-ng
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912072206.nB7M6el8035191>