* [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12
@ 2016-04-28 8:47 Steffen Trumtrar
2016-04-28 8:47 ` [ptxdist] [PATCH v2 2/2] syslogng: version bump 2.0.10 -> 3.7.3 Steffen Trumtrar
2016-05-17 6:32 ` [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Steffen Trumtrar @ 2016-04-28 8:47 UTC (permalink / raw)
To: ptxdist; +Cc: Steffen Trumtrar
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
rules/eventlog.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/eventlog.make b/rules/eventlog.make
index 198384b29542..bcadfa6c9f73 100644
--- a/rules/eventlog.make
+++ b/rules/eventlog.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_EVENTLOG) += eventlog
#
# Paths and names
#
-EVENTLOG_VERSION := 0.2.7
-EVENTLOG_MD5 := 51ac5bff610194ad57f3d632277bdf49
-EVENTLOG := eventlog-$(EVENTLOG_VERSION)
+EVENTLOG_VERSION := 0.2.12
+EVENTLOG_MD5 := f9c32814f78ea2629850f0440de5ff34
+EVENTLOG := eventlog_$(EVENTLOG_VERSION)
EVENTLOG_SUFFIX := tar.gz
-EVENTLOG_URL := http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/$(EVENTLOG).$(EVENTLOG_SUFFIX)
+EVENTLOG_URL := https://my.balabit.com/downloads/syslog-ng/sources/3.2.2/source/$(EVENTLOG).$(EVENTLOG_SUFFIX)
EVENTLOG_SOURCE := $(SRCDIR)/$(EVENTLOG).$(EVENTLOG_SUFFIX)
EVENTLOG_DIR := $(BUILDDIR)/$(EVENTLOG)
EVENTLOG_LICENSE := BSD-3-Clause
--
2.8.0.rc3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH v2 2/2] syslogng: version bump 2.0.10 -> 3.7.3
2016-04-28 8:47 [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Steffen Trumtrar
@ 2016-04-28 8:47 ` Steffen Trumtrar
2016-05-17 6:32 ` [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Steffen Trumtrar @ 2016-04-28 8:47 UTC (permalink / raw)
To: ptxdist; +Cc: Steffen Trumtrar
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
Changes in v2:
- replace SYSLOGNG_SYSTEMD_UNIT with SYSLOGNG_SYSTEMD
- add dependency for INITMETHOD_SYSTEMD
- use CROSS_AUTOCONF_USR instead of CROSS_AUTOCONF_ROOT
- allows nicer usage of install_copy
- change library path from /lib to /usr/lib
rules/syslogng.in | 37 +++++++++++++++++++++++++++++++++++++
rules/syslogng.make | 52 ++++++++++++++++++++++++++++++++--------------------
2 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 06e04c2a4f11..d4105649ade1 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -6,10 +6,13 @@ menuconfig SYSLOGNG
prompt "syslog-ng "
select EVENTLOG
select GLIB
+ select PYTHON if SYSLOGNG_PYTHON_DESTINATION
select LIBC_NSL
select LIBC_RT
select LIBNET if SYSLOGNG_SPOOF_SOURCE
+ select LIBPCRE
select TCPWRAPPER if SYSLOGNG_TCP_WRAPPER
+ select SYSTEMD if SYSLOGNG_SYSTEMD
help
The next generation syslog daemon.
@@ -36,6 +39,31 @@ config SYSLOGNG_SPOOF_SOURCE
destinations though the original message can be
received by TCP as well.
+config SYSLOGNG_AMQP_DESTINATION
+ bool
+ prompt "support the AMQP destination"
+ help
+ Enables the ability to publish AMQP messages.
+
+config SYSLOGNG_MONGODB_DESTINATION
+ bool
+ prompt "support the MongoDB destination"
+ help
+ Enables the ability to send messages to a MongoDB database.
+
+config SYSLOGNG_PYTHON_DESTINATION
+ bool
+ prompt "support the python destination"
+ help
+ Enables the ability to use inline python in the
+ syslog-ng configuration file.
+
+config SYSLOGNG_STOMP_DESTINATION
+ bool
+ prompt "support the STOMP destination"
+ help
+ Enables the ability to send STOMP messages to message brokers.
+
comment "runtime options ---"
config SYSLOGNG_CONFIG
@@ -48,6 +76,15 @@ config SYSLOGNG_CONFIG
ptxdist installation
("<PTXDIST>/projectroot/etc/syslog-ng.conf").
+config SYSLOGNG_SYSTEMD
+ bool
+ default y
+ prompt "Enable systemd support"
+ depends on INITMETHOD_SYSTEMD
+ help
+ Installs the systemd service file and enables support for the
+ systemd-journal
+
config SYSLOGNG_STARTSCRIPT
bool
default y
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 0cca16358504..2a735ac9c487 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2006 by Robert Schwebel
# 2008, 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2016 Pengutronix, Steffen Trumtrar <entwicklung@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -17,14 +18,15 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
#
# Paths and names
#
-SYSLOGNG_VERSION := 2.0.10
-SYSLOGNG_MD5 := 3f96ccf13dda0b9e150e511bcffde795
+SYSLOGNG_VERSION := 3.7.3
+SYSLOG_LIBVERSION := 3.7
+SYSLOGNG_MD5 := 803d61a713d6d41a973942d417fec999
SYSLOGNG := syslog-ng-$(SYSLOGNG_VERSION)
SYSLOGNG_SUFFIX := tar.gz
-SYSLOGNG_URL := http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
+SYSLOGNG_URL := https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
SYSLOGNG_SOURCE := $(SRCDIR)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
SYSLOGNG_DIR := $(BUILDDIR)/$(SYSLOGNG)
-SYSLOGNG_LICENSE := GPL-2.0+
+SYSLOGNG_LICENSE := GPL-2.0+, LGPL-2.1
# ----------------------------------------------------------------------------
# Prepare
@@ -37,26 +39,23 @@ SYSLOGNG_ENV := $(CROSS_ENV)
# autoconf
#
SYSLOGNG_AUTOCONF := \
- $(CROSS_AUTOCONF_ROOT) \
+ $(CROSS_AUTOCONF_USR) \
$(GLOBAL_IPV6_OPTION) \
--enable-dynamic-linking \
--disable-debug \
--disable-sun-streams \
- --disable-sun-door
-
-ifdef PTXCONF_SYSLOGNG_TCP_WRAPPER
-SYSLOGNG_AUTOCONF += --enable-tcp-wrapper
-else
-SYSLOGNG_AUTOCONF += --disable-tcp-wrapper
-endif
-
-ifdef PTXCONF_SYSLOGNG_SPOOF_SOURCE
-SYSLOGNG_AUTOCONF += \
- --enable-spoof-source \
+ --disable-sun-door \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_AMQP_DESTINATION)-amqp \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_MONGODB_DESTINATION)-mongodb \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_STOMP_DESTINATION)-stomp \
+ --$(call ptx/endis, PTXCONF_SYSLOGNG_TCP_WRAPPER)-tcp-wrapper \
+ --with-systemd-journal=system \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --localstatedir=/var/run \
--with-libnet=$(SYSROOT)/usr/bin
-else
-SYSLOGNG_AUTOCONF += --disable-spoof-source
-endif
# ----------------------------------------------------------------------------
# Target-Install
@@ -73,7 +72,9 @@ $(STATEDIR)/syslogng.targetinstall:
# # binary
@$(call install_copy, syslogng, 0, 0, 0755, -, \
- /sbin/syslog-ng)
+ /usr/sbin/syslog-ng)
+ @$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
+ @$(call install_tree, syslogng, 0, 0, -, /usr/lib/syslog-ng)
# # config
ifdef PTXCONF_SYSLOGNG_CONFIG
@@ -92,6 +93,17 @@ ifneq ($(call remove_quotes,$(PTXCONF_SYSLOGNG_BBINIT_LINK)),)
endif
endif
endif
+
+ifdef PTXCONF_INITMETHOD_SYSTEMD
+ifdef PTXCONF_SYSLOGNG_SYSTEMD
+ @$(call install_alternative, syslogng, 0, 0, 0644, \
+ /lib/systemd/system/syslog-ng.service)
+ @$(call install_link, syslogng, ../syslog-ng.service, \
+ /lib/systemd/system/multi-user.target.wants/syslog-ng.service)
+ @$(call install_link, syslogng, syslog.service, \
+ /lib/systemd/system/syslog.service)
+endif
+endif
@$(call install_finish, syslogng)
@$(call touch)
--
2.8.0.rc3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12
2016-04-28 8:47 [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Steffen Trumtrar
2016-04-28 8:47 ` [ptxdist] [PATCH v2 2/2] syslogng: version bump 2.0.10 -> 3.7.3 Steffen Trumtrar
@ 2016-05-17 6:32 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2016-05-17 6:32 UTC (permalink / raw)
To: ptxdist
On Thu, Apr 28, 2016 at 10:47:21AM +0200, Steffen Trumtrar wrote:
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Tnx, both applied.
Michael
> ---
> rules/eventlog.make | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/rules/eventlog.make b/rules/eventlog.make
> index 198384b29542..bcadfa6c9f73 100644
> --- a/rules/eventlog.make
> +++ b/rules/eventlog.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_EVENTLOG) += eventlog
> #
> # Paths and names
> #
> -EVENTLOG_VERSION := 0.2.7
> -EVENTLOG_MD5 := 51ac5bff610194ad57f3d632277bdf49
> -EVENTLOG := eventlog-$(EVENTLOG_VERSION)
> +EVENTLOG_VERSION := 0.2.12
> +EVENTLOG_MD5 := f9c32814f78ea2629850f0440de5ff34
> +EVENTLOG := eventlog_$(EVENTLOG_VERSION)
> EVENTLOG_SUFFIX := tar.gz
> -EVENTLOG_URL := http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/$(EVENTLOG).$(EVENTLOG_SUFFIX)
> +EVENTLOG_URL := https://my.balabit.com/downloads/syslog-ng/sources/3.2.2/source/$(EVENTLOG).$(EVENTLOG_SUFFIX)
> EVENTLOG_SOURCE := $(SRCDIR)/$(EVENTLOG).$(EVENTLOG_SUFFIX)
> EVENTLOG_DIR := $(BUILDDIR)/$(EVENTLOG)
> EVENTLOG_LICENSE := BSD-3-Clause
> --
> 2.8.0.rc3
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-17 6:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-28 8:47 [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Steffen Trumtrar
2016-04-28 8:47 ` [ptxdist] [PATCH v2 2/2] syslogng: version bump 2.0.10 -> 3.7.3 Steffen Trumtrar
2016-05-17 6:32 ` [ptxdist] [PATCH v2 1/2] eventlog: version bump 0.2.7 -> 0.2.12 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox