[Lunar-commits] <moonbase-other> rsyslog: version bumped to 7.4.6.

[Stefan Wold]

commit 267ac3cca3d2913ff543c03d8857bdfcefa37b8a
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 08 Dec 2013 02:37:31 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/267ac3cca3d2913ff543c03d8857bdfcefa37b8a

rsyslog: version bumped to 7.4.6.
---
  utils/rsyslog/BUILD   | +6/-13    
  utils/rsyslog/DEPENDS | +2/-0     
  utils/rsyslog/DETAILS | +3/-9     
  3 files changed, 11 insertions(+), 22 deletions(-)

--- a/utils/rsyslog/BUILD
+++ b/utils/rsyslog/BUILD
@@ -3,38 +3,31 @@
   #It seems like someone missed -lz here...
   sedit "s:\(librsyslog_la_LIBADD = \$(DL_LIBS) \$(RT_LIBS)\):\1 \$(ZLIB_LIBS):" runtime/Makefile.in
 
-  OPTS+=" --enable-pthreads    \
-          --enable-regexp      \
+  OPTS+=" --enable-regexp      \
           --enable-largefile   \
           --enable-klog        \
           --enable-inet        \
           --enable-imfile      \
-          --enable-imtemplate  \
           --enable-mail        \
           --enable-fsstnd      \
           --enable-rsyslogd    \
-          --enable-unix        \
           --enable-rsyslogrt   \
           --enable-rsyslogd    \
-          --disable-rfc3195"  &&
+          --disable-rfc3195    \
+          --enable-cached-man-pages"  &&
 
   default_build  &&
 
   if [ ! -f /etc/rsyslog.conf ]; then
-     install -m 644 $SOURCE_CACHE/$SOURCE2 /etc/rsyslog.conf
-  fi &&
-  if [ ! -f /etc/config.d/rsyslog ]; then
-     install -m 644 $SOURCE_CACHE/$SOURCE3 /etc/config.d/rsyslog
+     install -m 644 rsyslog.conf /etc/rsyslog.conf
   fi &&
 
   mkdir -p /usr/share/doc/rsyslog/scripts/{mysql,pqsql} &&
   install -m 644 plugins/ommysql/createDB.sql /usr/share/doc/rsyslog/scripts/mysql/ &&
   install -m 644 plugins/ompgsql/createDB.sql /usr/share/doc/rsyslog/scripts/pqsql/ &&
 
-  if [[ -d /usr/lib/systemd/system ]]; then
-     rm -f /usr/lib/systemd/system/syslog.service &&
-     ln -sf /usr/lib/systemd/system/rsyslog.service /usr/lib/systemd/system/syslog.service
-  fi &&
+  rm -f /usr/lib/systemd/system/syslog.service
+  ln -sf /usr/lib/systemd/system/rsyslog.service /usr/lib/systemd/system/syslog.service  &&
 
   gather_docs doc/rsyslog-example.conf
 
--- a/utils/rsyslog/DEPENDS
+++ b/utils/rsyslog/DEPENDS
@@ -1,3 +1,5 @@
+depends  libee
+
 optional_depends zlib              \
                  "--enable-zlib"   \
                  "--disable-zlib"  \
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,18 +1,12 @@
           MODULE=rsyslog
-         VERSION=5.10.0
+         VERSION=7.4.6
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE2=$MODULE.conf-0.2
-         SOURCE3=$MODULE.config.d-0.2
       SOURCE_URL=http://www.rsyslog.com/files/download/$MODULE
-     SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:8cc93749654faec36b245fa1ec9625d8ad7610d7
-     SOURCE2_VFY=sha1:340f692141df8915eccd6a47b13554a845690f9b
-     SOURCE3_VFY=sha1:219b5ceb8661534dd8064296852df6bd933f2233
+      SOURCE_VFY=sha1:22c87393bccee280efc73c1de5c50593b9ad8fbb
         WEB_SITE=http://www.rsyslog.com
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20080731
-         UPDATED=20121011
+         UPDATED=20131110
            SHORT="An enhanced multi-threaded syslogd"
 
 cat <<EOF