sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8c770097b819292dae5ef0e71d5dcf8b7b7b937b)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8c770097b819292dae5ef0e71d5dcf8b7b7b937b)
Date: Tue, 10 Jan 2017 06:57:25 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/syslog-ng/BUILD | 4 +---
utils/syslog-ng/CONFIGURE | 3 +++
utils/syslog-ng/DEPENDS | 29 ++++++++++++++---------------
utils/syslog-ng/DETAILS | 12 ++++++------
utils/syslog-ng/HISTORY | 11 +++++++++++
utils/syslog-ng/PRE_BUILD | 4 ++++
utils/syslog-ng/init.d/syslog-ng | 10 ++++++++++
7 files changed, 49 insertions(+), 24 deletions(-)

New commits:
commit 8c770097b819292dae5ef0e71d5dcf8b7b7b937b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/syslog-ng: version 3.9.1

diff --git a/utils/syslog-ng/BUILD b/utils/syslog-ng/BUILD
index c6bfbbd..81c09e3 100755
--- a/utils/syslog-ng/BUILD
+++ b/utils/syslog-ng/BUILD
@@ -1,6 +1,4 @@
-OPTS="--enable-dynamic-linking $OPTS" &&
-
-#sedit "s/-O2/$CFLAGS/" configure
+OPTS+=" --enable-dynamic-linking ${SYSLOG_NG_OPTS}" &&

./configure --build=$BUILD \
--prefix=${TRACK_ROOT}/usr \
diff --git a/utils/syslog-ng/CONFIGURE b/utils/syslog-ng/CONFIGURE
new file mode 100755
index 0000000..1dde392
--- /dev/null
+++ b/utils/syslog-ng/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option SYSLOG_NG_OPTS "Enable IPv6 support?" n \
+ "--enable-ipv6" \
+ "--disable-ipv6"
diff --git a/utils/syslog-ng/DEPENDS b/utils/syslog-ng/DEPENDS
index 58f38e8..d8db1ff 100755
--- a/utils/syslog-ng/DEPENDS
+++ b/utils/syslog-ng/DEPENDS
@@ -1,21 +1,20 @@
+depends autoconf &&
+depends autoconf-archive &&
+depends automake &&
+depends bison &&
+depends curl &&
depends eventlog &&
+depends flex &&
depends glib2 &&
-depends gnupg &&
-depends which &&
+depends ivykis '--with-ivykis=system' &&
depends libnet &&
+depends pcre &&
depends pkgconfig &&
+depends SSL &&
optional_depends libdbi-drivers \
'' \
'' \
'log to a SQL database' &&
-optional_depends SSL \
- '--enable-ssl' \
- '--disable-ssl' \
- 'SSL support' &&
-optional_depends pcre \
- '--enable-pcre' \
- '--disable-pcre' \
- 'regular expression support' &&
optional_depends libcap \
'--enable-linux-caps' \
'--disable-linux-caps' \
@@ -25,10 +24,10 @@ optional_depends tcp_wrappers \
'--disable-tcp-wrapper' \
'tcp-wrapper support' &&
optional_depends json-c \
- '--enable-json' \
- '--disable-json' \
+ '--enable-json=yes --with-jsonc=system' \
+ '--enable-json=no --with-jsonc=xno' \
'JSON support' &&
optional_depends PYTHON \
- '--enable-amqp' \
- '--disable-amqp' \
- 'AMQP support'
+ '--enable-python' \
+ '--disable-python' \
+ 'Python support'
diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS
index 36e9474..d46b190 100755
--- a/utils/syslog-ng/DETAILS
+++ b/utils/syslog-ng/DETAILS
@@ -1,10 +1,10 @@
SPELL=syslog-ng
- VERSION=3.6.4
-
SOURCE_HASH=sha512:9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1
- SOURCE=${SPELL}_${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.balabit.com/downloads/files/syslog-ng/sources/$VERSION/source/$SOURCE
- WEB_SITE=http://www.balabit.hu
+ VERSION=3.9.1
+
SOURCE_HASH=sha512:c4122ca7b6bfa827bbf822ea6dc6279d2fb8a8f38b8d42c6a9dddf684f8b9ec715f74d4350fa4e25f42194c3848fc5a1108477d2318fa47127977fdd5ab9503a
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${SPELL}-${VERSION}
+ SOURCE_URL[0]=https://github.com/balabit/${SPELL}/archive/${SOURCE}
+ WEB_SITE=http://www.balabit.com
LICENSE[0]=GPL
ENTERED=20020203
KEYWORDS="utils logger"
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 591e498..c085785 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,14 @@
+2017-01-10 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.9.1, SOURCE_URL[0] is GitHub, adjusted SOURCE and
+ SOURCE_DIRECTORY, updated WEB_SITE
+ * BUILD: modified to accept CONFIGURE's options
+ * CONFIGURE: added IPv6 option
+ * DEPENDS: added autoconf, autoconf-archive, automake, bison curl,
flex
+ and ivykis; removed gnupg and which; pcre and SSL are required now;
+ adjusted flags for json-c and PYTHON
+ * PRE_BUILD: added for bootstrapping
+ * init.d/syslog-ng: added reload() and stop() functions
+
2015-08-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.6.4

diff --git a/utils/syslog-ng/PRE_BUILD b/utils/syslog-ng/PRE_BUILD
new file mode 100755
index 0000000..1fa4c90
--- /dev/null
+++ b/utils/syslog-ng/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+skip_submodules=yes ./autogen.sh
diff --git a/utils/syslog-ng/init.d/syslog-ng
b/utils/syslog-ng/init.d/syslog-ng
index dee534a..b3c347a 100644
--- a/utils/syslog-ng/init.d/syslog-ng
+++ b/utils/syslog-ng/init.d/syslog-ng
@@ -5,4 +5,14 @@ RUNLEVEL=S
NEEDS="+local_fs"
PROVIDES=syslog

+reload() {
+ /sbin/syslog-ng-ctl reload
+ evaluate_retval
+}
+
+stop() {
+ /sbin/syslog-ng-ctl stop
+ evaluate_retval
+}
+
. /etc/init.d/smgl_init

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8c770097b819292dae5ef0e71d5dcf8b7b7b937b), Pavel Vinogradov, 01/10/2017