[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (89ddb1478b1a54c7d07b211c69d166c0a2eab850)

Elisamuel Resto scm at sourcemage.org
Fri Nov 28 04:49:28 EST 2008


GIT changes to master grimoire by Elisamuel Resto <ryuji at sourcemage.org>:

 utils/rsyslog/DETAILS             |    8 ++++----
 utils/rsyslog/HISTORY             |    7 ++++++-
 utils/rsyslog/init.d/rsyslog      |    2 +-
 utils/rsyslog/init.d/rsyslog.conf |    4 ++++
 4 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 89ddb1478b1a54c7d07b211c69d166c0a2eab850
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    utils/rsyslog: updated beta branch to 3.21.7; devel branch to 4.1.1; updated init and conf for 4.x and 3.x compat layer setting

diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index a9e7d79..ac7367c 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,10 +1,10 @@
            SPELL=rsyslog
 if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
-         VERSION=3.21.6
-     SOURCE_HASH=sha512:adbcdaa18b6d28ef6f44065dfcec93abcdeaa680abfa734b0b8787cc75ead59358b19e30dfa40883d0549d74c34c8c779aefbe48850c09375e46e95b3e680fe5
+         VERSION=4.1.1
+     SOURCE_HASH=sha512:dea6638336bae2eda3500d292dfc41880a6db0c9f38f6587009d5c6c8334da1ed12aa0326fc3cc14d65f7aa4e3b66b5dd7fcdb812509f4d02225094c94a6d490
 elif [[ "${RSYSLOG_BRANCH}" == "beta" ]]; then
-         VERSION=3.19.12
-     SOURCE_HASH=sha512:c04e2286e65f84e52f262338c71b19bdc9ec5f3c1966482d5dd6bbb9def5a2c4dbc6351d3b31e36eff537bec819ec4c5e36dada116a13ed9cf33c32aa3680e5b
+         VERSION=3.21.7
+     SOURCE_HASH=sha512:c61fbc3d88cd523da65f0b5482866662e7aba0cc521edad0c05f4902479560e863402dfa943e83795344da4814a4f59fe37d655d6ce18a77c5a61b80c2cc14e2
 else
          VERSION=3.20.0
      SOURCE_HASH=sha512:e691bdff27a75028b72059120ac7422863ed341be72eab898a809116009a1fd5344799f698c28c967a908aef46c773b79312d950040b73bb81eae87efe7a77d3
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index e746204..aebab01 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,4 +1,9 @@
-2008-11-08 ELisamuel Resto <ryuji at sourcemage.org>
+2008-11-28 Elisamuel Resto <ryuji at sourcemage.org>
+	* DETAILS: updated beta branch to 3.21.7; devel branch to 4.1.1
+	* init.d/rsyslog(.conf): updated for setting compat layer depending
+	  on installed version
+
+2008-11-08 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: updated stable branch to 3.20.0
 	* DEPENDS: stable now has gnutls support
 
diff --git a/utils/rsyslog/init.d/rsyslog b/utils/rsyslog/init.d/rsyslog
index 95da125..2900757 100644
--- a/utils/rsyslog/init.d/rsyslog
+++ b/utils/rsyslog/init.d/rsyslog
@@ -4,7 +4,7 @@
 
 PIDFILE=/var/run/rsyslogd.pid
 PROGRAM=/usr/sbin/rsyslogd
-ARGS="-c3"
+ARGS="-c${COMPAT}"
 RUNLEVEL=S
 NEEDS="+local_fs"
 PROVIDES=syslog
diff --git a/utils/rsyslog/init.d/rsyslog.conf b/utils/rsyslog/init.d/rsyslog.conf
index 613bb6f..b6e37de 100644
--- a/utils/rsyslog/init.d/rsyslog.conf
+++ b/utils/rsyslog/init.d/rsyslog.conf
@@ -1,2 +1,6 @@
+# Configuration compatibility
+VERSION=$(/usr/sbin/rsyslogd -v | head -n1 | gawk '{print $2}' | sed -e 's/,//')
+COMPAT=${VERSION:0:1}
+
 # Full path to configuration file (and its filename)
 RSYSLOG_CONFIG="/etc/rsyslog.conf"



More information about the SM-Commit mailing list