summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/syslog-ng/README12
-rw-r--r--system/syslog-ng/doinst.sh1
-rw-r--r--system/syslog-ng/rc.syslog-ng14
-rw-r--r--system/syslog-ng/syslog-ng.SlackBuild20
-rw-r--r--system/syslog-ng/syslog-ng.conf59
-rw-r--r--system/syslog-ng/syslog-ng.info10
6 files changed, 61 insertions, 55 deletions
diff --git a/system/syslog-ng/README b/system/syslog-ng/README
index 7c4daf1606..c1d95f44d2 100644
--- a/system/syslog-ng/README
+++ b/system/syslog-ng/README
@@ -2,13 +2,13 @@ The syslog-ng application is a flexible and highly scalable system logging
application that is ideal for creating centralized and trusted logging
solutions. This free, open-source version is an extremely well-developed,
high performance, stable system being the Linux/Unix world's most frequently
-used alternative central logging system. The application can operate in
-server or agent mode, and - apart from UDP - supports the reliable TCP and
-the encrypted TLS protocols. That way syslog-ng can be used to create
-flexible and reliable logging infrastructure even in heterogeneous
-environments.
+used alternative central logging system. The application can operate in server
+or agent mode, and - apart from UDP - supports the reliable TCP and the
+encrypted TLS protocols. That way syslog-ng can be used to create flexible
+and reliable logging infrastructure even in heterogeneous environments.
-libdbi is an optional dependency (enables SQL support).
+libdbi is an optional dependency (enables SQL support). GeoIP support can be
+enabled with: GEOIP=yes ./syslog-ng.SlackBuild
For more information on how to install and run syslog-ng, see README.SLACKWARE
that came with this package (which is also installed with the docs).
diff --git a/system/syslog-ng/doinst.sh b/system/syslog-ng/doinst.sh
index 352c64c5c2..4b459e5b27 100644
--- a/system/syslog-ng/doinst.sh
+++ b/system/syslog-ng/doinst.sh
@@ -23,7 +23,6 @@ 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/rc.syslog-ng b/system/syslog-ng/rc.syslog-ng
index 1d5511b648..61f4a2beee 100644
--- a/system/syslog-ng/rc.syslog-ng
+++ b/system/syslog-ng/rc.syslog-ng
@@ -1,8 +1,8 @@
#!/bin/sh
-# Start/stop/restart the syslog-ng daemon.
-# Specially tailored to emulate Slackware's stock syslogd/klogd.
#
-# Written by mario <mario@slackverse.org>.
+# Start/stop/restart the syslog-ng daemon
+# Drop-in replacement for a stock Slackware rc.syslog script
+# Written by Mario Preksavec <mario@slackware.hr>
syslog_start() {
if [ -x /usr/sbin/syslog-ng ]; then
@@ -14,9 +14,9 @@ syslog_start() {
echo "Starting syslog-ng daemon: /usr/sbin/syslog-ng"
/usr/sbin/syslog-ng -R /var/lib/syslog-ng/syslog-ng.persist
- # Create a fake syslogd.pid file for rc.M
+ # Link syslogd.pid for compatibility with other rc scripts
if [ -f /var/run/syslog-ng.pid ] && kill -0 $(cat /var/run/syslog-ng.pid) 2> /dev/null; then
- cp -a /var/run/syslog-ng.pid /var/run/syslogd.pid
+ ln -sf /var/run/syslog-ng.pid /var/run/syslogd.pid
fi
fi
}
@@ -25,8 +25,8 @@ syslog_stop() {
if [ -f /var/run/syslog-ng.pid ]; then
echo "Stopping syslog-ng daemon"
kill $(cat /var/run/syslog-ng.pid) 2> /dev/null && rm -f /var/run/syslog-ng.pid
- # Remove a fake pid file
- rm -f /var/run/syslogd.pid
+ # Unlink syslogd.pid
+ unlink /var/run/syslogd.pid
fi
killall syslog-ng 2> /dev/null
}
diff --git a/system/syslog-ng/syslog-ng.SlackBuild b/system/syslog-ng/syslog-ng.SlackBuild
index 987c78e27d..f9f61ef766 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-2012, mario <mario@slackverse.org>
+# Copyright 2010, 2012, 2013 Mario Preksavec, Zagreb, HR
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,7 +11,7 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=syslog-ng
-VERSION=${VERSION:-3.3.4}
+VERSION=${VERSION:-3.5.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -54,6 +54,13 @@ else
LIBDIRSUFFIX=""
fi
+# Build withhout GeoIP support by default
+GEOIP=${GEOIP:-no}
+case "$GEOIP" in
+ yes) GEOIP='--enable-geoip' ;;
+ *) GEOIP='--disable-geoip' ;;
+esac
+
set -e
rm -rf $PKG
@@ -80,6 +87,8 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-dynamic-linking \
+ --with-embedded-crypto \
+ $GEOIP \
--build=$ARCH-slackware-linux
make
@@ -104,14 +113,11 @@ install -D -m0755 -oroot -groot $CWD/rc.syslog-ng $PKG/etc/rc.d/rc.syslog-ng.new
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
-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 VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING 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 e49dfd062c..ac46d7a226 100644
--- a/system/syslog-ng/syslog-ng.conf
+++ b/system/syslog-ng/syslog-ng.conf
@@ -1,31 +1,32 @@
-@version: 3.3
+@version: 3.5
-# Default syslog-ng configuration for Slackware
+# Drop-in replacement for a stock Slackware syslog.conf
# For info about the format of this file, see "man syslog-ng.conf"
-# Converted from sysklogd (syslog.conf) by mario@slackverse.org
+# Written by Mario Preksavec <mario@slackware.hr>
options {
- flush_lines (0);
- time_reopen (10);
- log_fifo_size (10240);
- log_msg_size (8192);
- chain_hostnames (no);
- use_dns (no);
- use_fqdn (no);
- create_dirs (no);
- keep_hostname (yes);
+ flush_lines(0);
+ time_reopen(60);
+ log_fifo_size(10240);
+ log_msg_size(8192);
+ chain_hostnames(no);
+ use_dns(no);
+ use_fqdn(no);
+ create_dirs(yes);
+ keep_hostname(yes);
owner("root");
group("root");
perm(0640);
- stats_freq (0);
- check_hostname (yes);
- dns_cache (yes);
+ dir_perm(0755);
+ stats_freq(0);
+ check_hostname(yes);
+ dns_cache(no);
};
-source system {
+source s_system {
+ internal();
unix-dgram("/dev/log");
file("/proc/kmsg" program_override("kernel"));
- internal();
};
filter f_messages { level(info,notice) and not facility(authpriv,cron,mail,news); };
@@ -48,34 +49,34 @@ destination d_spooler { file("/var/log/spooler"); };
# Log anything 'info' or higher, but lower than 'warn'.
# Exclude authpriv, cron, mail, and news. These are logged elsewhere.
-log { source(system); filter(f_messages); destination(d_messages); };
+log { source(s_system); filter(f_messages); destination(d_messages); };
# Log anything 'warn' or higher.
# Exclude authpriv, cron, mail, and news. These are logged elsewhere.
-log { source(system); filter(f_syslog); destination(d_syslog); };
+log { source(s_system); filter(f_syslog); destination(d_syslog); };
# Debugging information is logged here.
-log { source(system); filter(f_debug); destination(d_debug); };
+log { source(s_system); filter(f_debug); destination(d_debug); };
# Private authentication message logging:
-log { source(system); filter(f_authpriv); destination(d_secure); };
+log { source(s_system); filter(f_authpriv); destination(d_secure); };
# Cron related logs:
-log { source(system); filter(f_cron); destination(d_cron); };
+log { source(s_system); filter(f_cron); destination(d_cron); };
# Mail related logs:
-log { source(system); filter(f_mail); destination(d_maillog); };
+log { source(s_system); filter(f_mail); destination(d_maillog); };
# Emergency level messages go to all users:
-log { source(system); filter(f_emerg); destination(d_usertty); };
+log { source(s_system); filter(f_emerg); destination(d_usertty); };
# This log is for news and uucp errors:
-log { source(system); filter(f_uucp); destination(d_spooler); };
+log { source(s_system); filter(f_uucp); destination(d_spooler); };
# Uncomment this to see kernel messages on the console.
#filter f_kern { facility(kern); };
#destination d_console { file("/dev/console"); };
-#log { source(system); filter(f_kern); destination(d_console); };
+#log { source(s_system); filter(f_kern); destination(d_console); };
# Uncomment these if you'd like INN to keep logs on everything.
# You won't need this if you don't run INN (the InterNetNews daemon).
@@ -85,6 +86,6 @@ log { source(system); filter(f_uucp); destination(d_spooler); };
#destination d_news_crit { file("/var/log/news/news.crit"); };
#destination d_news_err { file("/var/log/news/news.err"); };
#destination d_news_notice { file("/var/log/news/news.notice"); };
-#log { source(system); filter(f_news_crit); destination(d_news_crit); };
-#log { source(system); filter(f_news_err); destination(d_news_err); };
-#log { source(system); filter(f_news_notice); destination(f_news_notice); };
+#log { source(s_system); filter(f_news_crit); destination(d_news_crit); };
+#log { source(s_system); filter(f_news_err); destination(d_news_err); };
+#log { source(s_system); filter(f_news_notice); destination(f_news_notice); };
diff --git a/system/syslog-ng/syslog-ng.info b/system/syslog-ng/syslog-ng.info
index 422b70d36e..6256222b39 100644
--- a/system/syslog-ng/syslog-ng.info
+++ b/system/syslog-ng/syslog-ng.info
@@ -1,10 +1,10 @@
PRGNAM="syslog-ng"
-VERSION="3.3.4"
+VERSION="3.5.2"
HOMEPAGE="http://www.balabit.com/"
-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="http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.5.2/source/syslog-ng_3.5.2.tar.gz"
+MD5SUM="a54cbbe077363f112e5f6ff1ffd34fdb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="eventlog"
-MAINTAINER="mario"
-EMAIL="mario@slackverse.org"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"