Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (6253e0e1e64a4af905dbb198d2f5f00c385dfbec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (6253e0e1e64a4af905dbb198d2f5f00c385dfbec)
  • Date: Fri, 19 Mar 2010 03:13:32 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

utils/rsyslog/BUILD | 2 ++
utils/rsyslog/CONFIGURE | 15 +++++++++++++++
utils/rsyslog/DEPENDS | 16 +++++++++++++++-
utils/rsyslog/DETAILS | 20 ++++++++++----------
utils/rsyslog/HISTORY | 12 ++++++++++++
utils/rsyslog/PREPARE | 2 +-
6 files changed, 55 insertions(+), 12 deletions(-)

New commits:
commit 6253e0e1e64a4af905dbb198d2f5f00c385dfbec
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

rsyslog: v3stable => 3.22.1, v4stable => 4.6.1, v5stable => 5.4.0, devel
=> 5.5.2
renamed stable to v3stable, v4beta to v4stable, and v5beta to v5stable to
coincide with upstream names
Added CONFIGURE options and some more optional depends.

diff --git a/utils/rsyslog/BUILD b/utils/rsyslog/BUILD
new file mode 100755
index 0000000..86531cf
--- /dev/null
+++ b/utils/rsyslog/BUILD
@@ -0,0 +1,2 @@
+OPTS="${OPTS} ${RSYSLOG_OPTS}" &&
+default_build
diff --git a/utils/rsyslog/CONFIGURE b/utils/rsyslog/CONFIGURE
index d552fc9..11604b8 100755
--- a/utils/rsyslog/CONFIGURE
+++ b/utils/rsyslog/CONFIGURE
@@ -1 +1,16 @@
config_query JAVATEST "Do you want to enable some tests written in java?" n
+config_query_option RSYSLOG_OPTS 'Integrate klog functionality?' y \
+ '--enable-klog' \
+ '--disable-klog' &&
+config_query_option RSYSLOG_OPTS 'Enable networking support?' y \
+ '--enable-inet' \
+ '--disable-inet' &&
+config_query_option RSYSLOG_OPTS 'Enable mail support?' n \
+ '--enable-mail' \
+ '--disable-mail' &&
+config_query_option RSYSLOG_OPTS 'Enable diagnostic tools?' n \
+ '--enable-diagtools' \
+ '--disable-diagtools' &&
+config_query_option RSYSLOG_TOPS 'Compile text input module (provides the
ability to convert any standard text file into a syslog message)?' n \
+ '--enable-imfile' \
+ '--disable-imfile'
diff --git a/utils/rsyslog/DEPENDS b/utils/rsyslog/DEPENDS
index f3b2a0b..3a72135 100755
--- a/utils/rsyslog/DEPENDS
+++ b/utils/rsyslog/DEPENDS
@@ -40,4 +40,18 @@ optional_depends mysql \
optional_depends postgresql \
"--enable-pgsql" \
"--disable-pgsql" \
- "for PostgreSQL backend support"
+ "for PostgreSQL backend support" &&
+optional_depends krb5 \
+ "--enable-gssapi-krb5" \
+ "--disable-gssapi-krb5" \
+ "for GSSAPI Kerberos 5 support" &&
+optional_depends valgrind \
+ "--enable-valgrind" \
+ "--disable-valgrind" \
+ "for valgrind support settings" &&
+if [[ ${RSYSLOG_BRANCH} == "v5stable" ]] || [[ ${RSYSLOG_BRANCH} == "devel"
]]; then
+ optional_depends JDK \
+ "--enable-gui" \
+ "--disable-gui" \
+ "to build GUI"
+fi
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index a287877..485d0c3 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,20 +1,20 @@
SPELL=rsyslog

if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
- VERSION=5.3.0
+ VERSION=5.5.2
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:9b74489bb28a9b0bf5aa3be708ea4a0bfd8daf482649aa22cfb7cc56a798248c9070f3e70c8c3f360c3a63c948a7da9d311fc9b206055e510362e08d89a8e6a5
-elif [[ "${RSYSLOG_BRANCH}" == "v4beta" ]]; then
- VERSION=4.5.3
+
SOURCE_HASH=sha512:3a95eca64f97322f36723fb8c602e86e54eb0f9d942696b5ff3428774a2741e102cc54562db7a515f2b2da52c85b9138ec63c0fd506f8374e57c21bbf1cc257c
+elif [[ "${RSYSLOG_BRANCH}" == "v4stable" ]]; then
+ VERSION=4.6.1
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:b6d050dbc35b80a8ed2532607b714febcfb7c32bd5de300e07253a6971880c628778b355f4ac0d12fdc579b82310d1a68e3741c11cc31699627f8fe20b7d0f1a
-elif [[ "${RSYSLOG_BRANCH}" == "v5beta" ]]; then
- VERSION=5.1.5
-
SOURCE_HASH=sha512:75d238a64de78afc5e6d232481b20df5fda9d1bbcce4de3765b27a5da24c98ebe8b75f6b68927940fedc5da7d2487e66d7aaf8be0929006ab6dac25ac47f68b6
+
SOURCE_HASH=sha512:17ebf2e4901753d15c52665c18f89be75057138d4ce180b550fe35e8871c538cd892eaf6079c816b59cb94bdd11820d33a454ff01e21ee8d5ee63d7aa08bc1af
+elif [[ "${RSYSLOG_BRANCH}" == "v5stable" ]]; then
+ VERSION=5.4.0
+
SOURCE_HASH=sha512:3c34b55817d44787fc872f89d356ec4a248992047f563dc432ba46e4c22ae04f97f5b95df64eec3fb3cecdeafd2b315750dcc33ea200f2e7985b43301d850ad3
else
- VERSION=4.4.1
+ VERSION=3.22.1
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:aeb800717ab1d7372123443f68a48fdba484fcf4022ca695a0efb86a20f645f3c7c10a847569ecb1239a71b940ce76bc55e34791de175541224a3d8fd7a3d6f2
+
SOURCE_HASH=sha512:a80582230aa5888bfc25ca2e0717c3ac699b78e2746b178f1dc3b9e72eae777ff603973d76eb78d8277b6f4c3fc5fc270117a3842335ec6f0b4b352ee29a3c5e
fi

SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 1db3b77..bb6f340 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,15 @@
+2010-03-19 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PREPARE, DETAILS: renamed v4beta to v4stable, v5beta to v5stable,
and stable to v3stable
+ * DETAILS: updated v3stable to 3.22.1
+ updated RSYSLOG_BRANCH="v5stable" to 5.4.0
+ changed blabla
+ updated devel to 5.5.2
+ updated v5stable to 5.4.0
+ updated v4stable to 4.6.1
+ * CONFIGURE: added options to compile with klog support, mail
support, network support, imfile support, and diagnostic tools
+ * DEPENDS: added optional depends on krb5, valgrind, and JDK.
+ * BUILD: added, to include CONFIGURE OPTS
+
2009-09-20 Peng Chang (Charles) <chp AT sourcemage.org>
* PREPARE: renamed beta to v4beta, added v5beta branch
* DETAILS: stable => 4.4.1, v4beta => 4.5.3, v5beta => 5.1.5,
diff --git a/utils/rsyslog/PREPARE b/utils/rsyslog/PREPARE
index 56462ee..f45cac2 100755
--- a/utils/rsyslog/PREPARE
+++ b/utils/rsyslog/PREPARE
@@ -1 +1 @@
-config_query_list RSYSLOG_BRANCH "Build which branch of rsyslog?" stable
v4beta v5beta devel
+config_query_list RSYSLOG_BRANCH "Build which branch of rsyslog?" v3stable
v4stable v5stable devel




Archive powered by MHonArc 2.6.24.

Top of Page