system/rsyslog: Updated for version 7.2.6.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 15 insertions, 14 deletions

diff --git a/system/rsyslog/config/rc.rsyslogd b/system/rsyslog/config/rc.rsyslogd
index f12c369168f8..24add02dec94 100644
--- a/system/rsyslog/config/rc.rsyslogd
+++ b/system/rsyslog/config/rc.rsyslogd
@@ -23,8 +23,8 @@ create_xconsole()
 rsyslogd_start() {
   if [ -x /usr/sbin/rsyslogd ]; then
     echo "Starting rsyslogd daemon: "
-    echo "/usr/sbin/rsyslogd -c5 -i $pidfile1"
-    /usr/sbin/rsyslogd -c5 -i "$pidfile1"
+    echo "/usr/sbin/rsyslogd -i $pidfile1"
+    /usr/sbin/rsyslogd -i "$pidfile1"
     cp "$pidfile1" "$pidfile2"
   fi
 }
diff --git a/system/rsyslog/config/rsyslog.conf b/system/rsyslog/config/rsyslog.conf
index 952082291bf0..64b586ff9522 100644
--- a/system/rsyslog/config/rsyslog.conf
+++ b/system/rsyslog/config/rsyslog.conf
@@ -1,7 +1,7 @@
 #  /etc/rsyslog.conf	Configuration file for rsyslog.
 #
 #			For more information see
-#			/usr/doc/rsyslog-5.8.13/html/rsyslog_conf.html
+#			/usr/doc/rsyslog-@VERSION@/html/rsyslog_conf.html
 
 
 #################
@@ -83,7 +83,7 @@ cron.*							-/var/log/cron
 mail.*							-/var/log/maillog
 
 # Emergency level messages go to all users:
-*.emerg							*
+*.emerg							:omusrmsg:*
 
 # This log is for news and uucp errors:
 uucp,news.crit						-/var/log/spooler
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
index 94203ea032fa..47bc3a9d8683 100644
--- a/system/rsyslog/rsyslog.SlackBuild
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rsyslog
-VERSION=${VERSION:-5.8.13}
+VERSION=${VERSION:-7.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -87,6 +87,7 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/etc/rc.d/
 cat $CWD/config/rsyslog.conf > $PKG/etc/rsyslog.conf.new
+sed -i "s/@VERSION@/$VERSION/" $PKG/etc/rsyslog.conf.new
 cat $CWD/config/rc.rsyslogd > $PKG/etc/rc.d/rc.rsyslogd.new
 chmod 0755 $PKG/etc/rc.d/rc.rsyslogd.new
 
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
index d91015816c88..52a6dd06471b 100644
--- a/system/rsyslog/rsyslog.info
+++ b/system/rsyslog/rsyslog.info
@@ -1,10 +1,10 @@
 PRGNAM="rsyslog"
-VERSION="5.8.13"
+VERSION="7.2.6"
 HOMEPAGE="http://www.rsyslog.com/"
-DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-5.8.13.tar.gz"
-MD5SUM="8d228a8b622f90b320c95f38be7fc5bb"
+DOWNLOAD="http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.6.tar.gz"
+MD5SUM="2b2bfbc3f87fe85add651dc07a6f21ea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libestr libee json-c"
 MAINTAINER="Christophe Trussardi"
 EMAIL="chris@teria.org"
diff --git a/system/rsyslog/slack-desc b/system/rsyslog/slack-desc
index c66336b695b8..95e2bb7b4017 100644
--- a/system/rsyslog/slack-desc
+++ b/system/rsyslog/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 rsyslog: Rsyslog (enhanced syslogd)