Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bbdcf4449448215de68ba3826bc8de962e229fcf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bbdcf4449448215de68ba3826bc8de962e229fcf)
  • Date: Tue, 17 Jun 2008 16:14:11 -0500

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

utils/rsyslog/DEPENDS | 14 ++++++--------
utils/rsyslog/DETAILS | 1 +
utils/rsyslog/HISTORY | 4 ++++
utils/rsyslog/init.d/rsyslog | 8 +++++++-
utils/rsyslog/init.d/rsyslog.conf | 2 ++
5 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit bbdcf4449448215de68ba3826bc8de962e229fcf
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/rsyslog: PATCHLEVEL=1 to propagate changes

commit 51526681c4bfc89ee3b8902bdb45419254e618c5
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/rsyslog: gnutls dependency only applies to devel

commit 862cef974e73ea53b283a72a299f959287fc18df
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

util/rsyslog: made the config location configurable on the init script

commit 1ba867e26906f3691d95f6d346e22003b23cf027
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

utils/rsyslog: remove conditional depend on logrotate

diff --git a/utils/rsyslog/DEPENDS b/utils/rsyslog/DEPENDS
index edfc72c..0f0cc57 100755
--- a/utils/rsyslog/DEPENDS
+++ b/utils/rsyslog/DEPENDS
@@ -1,18 +1,16 @@
depends make &&
depends pkgconfig &&

-if [[ "${RSYSLOG_LOGROTATE}" == "y" ]]; then
- depends logrotate
-fi &&
-
optional_depends zlib \
"--enable-zlib" \
"--disable-zlib" \
"for gzipped network logging support" &&
-optional_depends gnutls \
- "--enable-gnutls" \
- "--disable-gnutls" \
- "TLS encryption for TCP communication" &&
+if [[ ${RSYSLOG_BRANCH} == "devel"
+ optional_depends gnutls \
+ "--enable-gnutls" \
+ "--disable-gnutls" \
+ "TLS encryption for TCP communication"
+fi &&
optional_depends pcre \
"--enable-regexp" \
"--disable-regexp" \
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index a9f595d..32db275 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -6,6 +6,7 @@ else
VERSION=3.16.1

SOURCE_HASH=sha512:de5b56630ba8c4b97daca7ae8fdb3c098a6a338749931edd4171d7231fcaf4fb03ada91d3c8c87a74ef4adcc337cfae004160a3385d3e81bb3a66f15741c9351
fi
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://download.rsyslog.com/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 0ef8515..feb5e41 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,6 +1,10 @@
2008-06-17 Elisamuel Resto <ryuji AT sourcemage.org>
* Spell committed to test from phantom
(http://dbnet.ath.cx/git/phantom/)
+ * DEPENDS: removed logrotate conditional depend (remnant of move)
+ * init.d/rsyslog(.conf): made the config location configurable
+ * DEPENDS: gnutls dependency only applies to the devel branch
+ * DETAILS: PATCHLEVEL=1 so changes get moved

2008-06-11 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated devel version to 3.19.7
diff --git a/utils/rsyslog/init.d/rsyslog b/utils/rsyslog/init.d/rsyslog
index 37bc87b..95da125 100644
--- a/utils/rsyslog/init.d/rsyslog
+++ b/utils/rsyslog/init.d/rsyslog
@@ -1,10 +1,16 @@
#!/bin/bash

+. /etc/sysconfig/rsyslog
+
PIDFILE=/var/run/rsyslogd.pid
PROGRAM=/usr/sbin/rsyslogd
-ARGS="-c3 -i /var/run/rsyslogd.pid -f /etc/rsyslog.conf"
+ARGS="-c3"
RUNLEVEL=S
NEEDS="+local_fs"
PROVIDES=syslog

+if ! [[ -z ${RSYSLOG_CONFIG} ]]; then
+ ARGS="${ARGS} -f ${RSYSLOG_CONFIG}"
+fi
+
. /etc/init.d/smgl_init
diff --git a/utils/rsyslog/init.d/rsyslog.conf
b/utils/rsyslog/init.d/rsyslog.conf
new file mode 100644
index 0000000..613bb6f
--- /dev/null
+++ b/utils/rsyslog/init.d/rsyslog.conf
@@ -0,0 +1,2 @@
+# Full path to configuration file (and its filename)
+RSYSLOG_CONFIG="/etc/rsyslog.conf"



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (bbdcf4449448215de68ba3826bc8de962e229fcf), Elisamuel Resto, 06/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page