diff options
| -rw-r--r-- | system/syslog-ng/README.SLACKWARE | 8 | ||||
| -rw-r--r-- | system/syslog-ng/doinst.sh | 2 | ||||
| -rw-r--r-- | system/syslog-ng/syslog-ng.SlackBuild | 16 | ||||
| -rw-r--r-- | system/syslog-ng/syslog-ng.conf | 6 | ||||
| -rw-r--r-- | system/syslog-ng/syslog-ng.info | 6 |
5 files changed, 23 insertions, 15 deletions
diff --git a/system/syslog-ng/README.SLACKWARE b/system/syslog-ng/README.SLACKWARE index 2373bbae2c32..61d7d45fd732 100644 --- a/system/syslog-ng/README.SLACKWARE +++ b/system/syslog-ng/README.SLACKWARE @@ -11,10 +11,10 @@ Make syslog-ng start automatically on boot, without modifications to rc.M: cd /etc/rc.d && ln -sf rc.syslog-ng rc.syslog cd /usr/sbin && ln -sf syslog-ng syslogd -To make transition even easier, i converted syslog.conf from sysklogd -package to syslog-ng.conf format. You can find it in /etc/syslog-ng. +To make transition even easier, I converted syslog.conf from sysklogd +package to syslog-ng.conf format. You can find it in /etc/syslog-ng. -Another thing worth mentioning here is rc.syslog-ng, wich is written to +Another thing worth mentioning here is rc.syslog-ng, which is written to also emulate syslogd. On a successful start/stop it will copy/remove -syslog-ng.pid to /var/run/syslogd.pid so that rc.inet1 doesn't atempt +syslog-ng.pid to /var/run/syslogd.pid so that rc.inet1 doesn't attempt running rc.syslog for a second time. diff --git a/system/syslog-ng/doinst.sh b/system/syslog-ng/doinst.sh index 7664e6748bda..352c64c5c28c 100644 --- a/system/syslog-ng/doinst.sh +++ b/system/syslog-ng/doinst.sh @@ -23,6 +23,8 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.syslog-ng.new +config etc/syslog-ng/modules.conf.new +config etc/syslog-ng/scl.conf.new config etc/syslog-ng/syslog-ng.conf.new config etc/logrotate.d/syslog-ng.new diff --git a/system/syslog-ng/syslog-ng.SlackBuild b/system/syslog-ng/syslog-ng.SlackBuild index 0bf97650ae56..5e7688251b0a 100644 --- a/system/syslog-ng/syslog-ng.SlackBuild +++ b/system/syslog-ng/syslog-ng.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for syslog-ng -# Copyright 2010, mario <mario@slackverse.org> +# Copyright 2010-2012, mario <mario@slackverse.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=syslog-ng -VERSION=${VERSION:-3.0.7} +VERSION=${VERSION:-3.3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,21 +91,27 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# We use our own configuration and keep original as sample +mv $PKG/etc/syslog-ng/syslog-ng.conf $PKG/etc/syslog-ng/syslog-ng.conf.example + +# Append .new to config files +for i in $PKG/etc/syslog-ng/*.conf ; do mv $i $i.new ; done + # Copy init script install -D -m0755 -oroot -groot $CWD/rc.syslog-ng $PKG/etc/rc.d/rc.syslog-ng.new -# Copy sample configuration and logrotate script +# Install our own configuration and logrotate script install -D -m0644 -oroot -groot $CWD/syslog-ng.conf $PKG/etc/syslog-ng/syslog-ng.conf.new install -D -m0644 -oroot -groot $CWD/syslog-ng.logrotate $PKG/etc/logrotate.d/syslog-ng.new # Remove empty directory -rm -rf $PKG/usr/libexec +rmdir $PKG/usr/libexec # This is for syslog-ng.persist file, we don't want it in /var mkdir -p $PKG/var/lib/syslog-ng mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS VERSION $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE diff --git a/system/syslog-ng/syslog-ng.conf b/system/syslog-ng/syslog-ng.conf index d5744c43e032..e49dfd062cde 100644 --- a/system/syslog-ng/syslog-ng.conf +++ b/system/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.0 +@version: 3.3 # Default syslog-ng configuration for Slackware # For info about the format of this file, see "man syslog-ng.conf" @@ -7,9 +7,9 @@ options { flush_lines (0); time_reopen (10); - log_fifo_size (2048); + log_fifo_size (10240); log_msg_size (8192); - long_hostnames (no); + chain_hostnames (no); use_dns (no); use_fqdn (no); create_dirs (no); diff --git a/system/syslog-ng/syslog-ng.info b/system/syslog-ng/syslog-ng.info index 6831db881df1..ac10ff8113d8 100644 --- a/system/syslog-ng/syslog-ng.info +++ b/system/syslog-ng/syslog-ng.info @@ -1,8 +1,8 @@ PRGNAM="syslog-ng" -VERSION="3.0.7" +VERSION="3.3.4" HOMEPAGE="http://www.balabit.com/" -DOWNLOAD="http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.0.7/source/syslog-ng_3.0.7.tar.gz" -MD5SUM="f0a8cdee76e7c4ff7ad6e53da799d3a7" +DOWNLOAD="http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.3.4/source/syslog-ng_3.3.4.tar.gz" +MD5SUM="8e1bc6bb55a6545dcf0329b982c82a44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="mario" |