[ptxdist] [PATCH] iproute2: update version and minor improvements

[ptxdist] [PATCH] iproute2: update version and minor improvements

[Clemens Gruber]

Update to iproute2 4.7.0, which includes Alexander Aring's patch to fix
the xtables build failure.
Replaced the description of tc with some (modified) lines from the
manpage.
Let libmng be used if it is enabled in ptxdist.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/iproute2.in   |  5 +++--
 rules/iproute2.make | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/rules/iproute2.in b/rules/iproute2.in
index dadad03..888b595 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -135,7 +135,8 @@ config IPROUTE2_TC
 	bool
 	prompt "tc"
 	help
-	  In Quality Of Service (QOS) and Class Of Service (COS)
-	  scenarios used for traffic controlling
+	  tc is used to configure Traffic Control in the Linux Kernel, which
+	  consists of Shaping, Scheduling, Policing and Dropping.
+	  Processing of traffic is controlled by qdiscs, classes and filters.
 
 endif
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 9e9e899..8e62f8f 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 4.6.0
-IPROUTE2_MD5		:= d015e437e4f744d51d3a1a53341826d5
+IPROUTE2_VERSION	:= 4.7.0
+IPROUTE2_MD5		:= d4b205830cdc2702f8a0cbd6232129cd
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
 IPROUTE2_SUFFIX		:= tar.xz
 IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -46,7 +46,9 @@ $(STATEDIR)/iproute2.prepare:
 ifndef PTXCONF_GLOBAL_SELINUX
 	@echo 'HAVE_SELINUX:=n'		>> $(IPROUTE2_DIR)/Config
 endif
+ifndef PTXCONF_LIBMNL
 	@echo 'HAVE_MNL:=n'		>> $(IPROUTE2_DIR)/Config
+endif
 ifndef PTXCONF_IPROUTE2_ARPD
 	@echo 'HAVE_BERKELEY_DB:=n'	>> $(IPROUTE2_DIR)/Config
 endif
@@ -97,18 +99,20 @@ $(STATEDIR)/iproute2.targetinstall:
 	done
 
 ifdef PTXCONF_IPROUTE2_TC
+	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/normal.dist)
 	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/pareto.dist)
 	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/paretonormal.dist)
 	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/experimental.dist)
 endif
 
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/ematch_map)
+	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
+	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/nl_protos)
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_dsfield)
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_protos)
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_realms)
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_scopes)
 	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_tables)
-	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
 
 	@$(call install_finish, iproute2)
 
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libfastjson: new package

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libfastjson.in   |  8 ++++++
 rules/libfastjson.make | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 rules/libfastjson.in
 create mode 100644 rules/libfastjson.make

diff --git a/rules/libfastjson.in b/rules/libfastjson.in
new file mode 100644
index 0000000..b555544
--- /dev/null
+++ b/rules/libfastjson.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config LIBFASTJSON
+	bool
+	prompt "libfastjson"
+	help
+	  libfastjson is a small and fast C library with most essential
+	  JSON handling functions.
diff --git a/rules/libfastjson.make b/rules/libfastjson.make
new file mode 100644
index 0000000..901f4dd
--- /dev/null
+++ b/rules/libfastjson.make
@@ -0,0 +1,69 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pqgruber.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBFASTJSON) += libfastjson
+
+#
+# Paths and names
+#
+LIBFASTJSON_VERSION	:= 0.99.4
+LIBFASTJSON_MD5		:= 5a24c9adcd0bf5307c972de5e9ea4ce9
+LIBFASTJSON		:= libfastjson-$(LIBFASTJSON_VERSION)
+LIBFASTJSON_SUFFIX	:= tar.gz
+LIBFASTJSON_URL		:= https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
+LIBFASTJSON_SOURCE	:= $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
+LIBFASTJSON_DIR		:= $(BUILDDIR)/$(LIBFASTJSON)
+#LIBFASTJSON_BUILD_OOT	:= YES
+LIBFASTJSON_LICENSE	:= MIT
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libfastjson.extract: $(STATEDIR)/autogen-tools
+
+$(STATEDIR)/libfastjson.extract:
+	@$(call targetinfo)
+	@$(call clean, $(LIBFASTJSON_DIR))
+	@$(call extract, LIBFASTJSON)
+	cd $(LIBFASTJSON_DIR) && [ -f configure ] || sh autogen.sh
+	@$(call patchin, LIBFASTJSON)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBFASTJSON_CONF_TOOL	:= autoconf
+LIBFASTJSON_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libfastjson.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libfastjson)
+	@$(call install_fixup, libfastjson, PRIORITY, optional)
+	@$(call install_fixup, libfastjson, SECTION, base)
+	@$(call install_fixup, libfastjson, AUTHOR, "Clemens Gruber <clemens.gruber@pqgruber.com>")
+	@$(call install_fixup, libfastjson, DESCRIPTION, missing)
+
+	@$(call install_lib, libfastjson, 0, 0, 0644, libfastjson)
+
+	@$(call install_finish, libfastjson)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] rsyslog: major update

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 projectroot/etc/rsyslog.conf | 33 +++++++++++++++++++-----
 rules/rsyslog.in             | 20 +++++++++++----
 rules/rsyslog.make           | 61 +++++++-------------------------------------
 3 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
index 94115e4..979b3ec 100644
--- a/projectroot/etc/rsyslog.conf
+++ b/projectroot/etc/rsyslog.conf
@@ -1,11 +1,32 @@
 # Begin /etc/rsyslog.conf
 
-$ModLoad immark # provides --MARK-- message capability
-$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog # provides kernel logging support (previously done by rklogd)
+#module(load="imjournal" # provides access to the systemd journal
+module(load="imkmsg")    # provides structured kernel logging support
+#module(load="immark")   # provides --MARK-- message capability
+module(load="imuxsock")  # provides support for local system logging
 
-daemon.* -/var/log/daemon.log
-kern.* -/var/log/kern.log
-user.* -/var/log/user.log
+# Use traditional timestamp format.
+# To enable high precision timestamps, comment out the following line.
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# Where to place spool and state files
+#$WorkDirectory /var/spool/rsyslog
+
+# Include all config files from /etc/rsyslog.d/
+#$IncludeConfig /etc/rsyslog.d/*.conf
+
+# First some standard log files.  Log by facility.
+#auth,authpriv.*			/var/log/auth.log
+#*.*;auth,authpriv.none		-/var/log/syslog
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+user.*				-/var/log/user.log
+
+# And some "catch-all" log files.
+#*.=debug;\
+#	auth,authpriv.none	-/var/log/debug
+#*.=info;*.=notice;*.=warn;\
+#	auth,authpriv.none;\
+#	daemon.none;		-/var/log/messages
 
 # End /etc/rsyslog.conf
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index eab69d6..7eb7896 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -8,12 +8,13 @@ menuconfig RSYSLOG
 	select GCCLIBS_GCC_S
 	select ZLIB
 	select LIBESTR
-	select JSON_C
+	select LIBFASTJSON
 	select LIBNET		if RSYSLOG_OMUDPSPOOF
 	select SYSTEMD		if RSYSLOG_SYSTEMD
 	prompt "rsyslog                       "
 	help
-	  FIXME
+	  rsyslog is a reliable system and kernel logging daemon with
+	  modular design and high speed message processing.
 
 if RSYSLOG
 
@@ -29,15 +30,16 @@ config RSYSLOG_SYSTEMD_UNIT
 
 config RSYSLOG_REGEXP
 	bool
-	# 8.8.0 fail to build without regex support
+	# 8.21.0 failed to build without regex support
 	default y
 	prompt "regular expression support" if BROKEN
 
 config RSYSLOG_INET
 	bool
-	# 8.8.0 fail to run without inet support
 	default y
-	prompt "networking support" if BROKEN
+	prompt "networking support"
+
+comment "modules   ---"
 
 config RSYSLOG_IMDIAG
 	bool
@@ -80,6 +82,10 @@ config RSYSLOG_IMUXSOCK
 	default y
 	prompt "unix domain socket input module"
 
+config RSYSLOG_MMJSONPARSE
+	bool
+	prompt "jsonparse message modification module"
+
 config RSYSLOG_OMPROG
 	bool
 	prompt "program output module"
@@ -96,6 +102,10 @@ config RSYSLOG_OMUXSOCK
 	bool
 	prompt "unix domain socket output module"
 
+config RSYSLOG_PMCISCOIOS
+	bool
+	prompt "cisco ios parser module"
+
 config RSYSLOG_PMLASTMSG
 	bool
 	prompt "lastmsg parser module"
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index 95a315b..a3d1160 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
+# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pgruber.com>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
 #
 # Paths and names
 #
-RSYSLOG_VERSION	:= 8.8.0
-RSYSLOG_MD5	:= 188088dc496fb0a121edb8816d1fac83
+RSYSLOG_VERSION	:= 8.21.0
+RSYSLOG_MD5	:= f9b89a192090cd56f80c2ff930b5fd30
 RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
 RSYSLOG_SUFFIX	:= tar.gz
 RSYSLOG_URL	:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
@@ -39,75 +40,28 @@ RSYSLOG_LICENSE_FILES := \
 RSYSLOG_CONF_TOOL	:= autoconf
 RSYSLOG_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--runstatedir=/run \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
-	--disable-gssapi-krb5 \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
 	--enable-kmsg \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
-	--disable-jemalloc \
-	--enable-unlimited-select \
-	--disable-debug \
-	--disable-rtinst \
-	--disable-debugless \
-	--disable-valgrind \
-	--disable-memcheck \
-	--disable-diagtools \
-	--disable-usertools \
-	--disable-mysql \
-	--disable-pgsql \
-	--disable-libdbi \
-	--disable-snmp \
 	--disable-uuid \
-	--disable-elasticsearch \
-	--disable-gnutls \
 	--disable-libgcrypt \
-	--enable-rsyslogrt \
-	--enable-rsyslogd \
-	--disable-mysql-tests \
-	--disable-mail \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
-	--disable-mmnormalize \
-	--disable-mmjsonparse \
-	--disable-mmaudit \
-	--disable-mmanon \
-	--disable-mmutf8fix \
-	--disable-mmcount \
-	--disable-mmsequence \
-	--disable-mmfields \
-	--disable-mmpstrucdata \
-	--disable-mmrfc5424addhmac \
-	--disable-relp \
-	--disable-guardtime \
 	--disable-liblogging-stdlog \
-	--disable-rfc3195 \
-	--disable-testbench \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \
-	--disable-imsolaris \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPTCP)-imptcp \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPSTATS)-impstats \
+	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
+	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
-	--disable-pmcisconames \
-	--disable-pmciscoios \
-	--disable-pmaixforwardedfrom \
-	--disable-pmsnare \
-	--disable-omruleset \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \
-	--disable-mmsnmptrapd \
-	--disable-omhdfs \
-	--disable-omkafka \
-	--disable-ommongodb \
-	--disable-imzmq3 \
-	--disable-imczmq \
-	--disable-omzmq3 \
-	--disable-omczmq \
-	--disable-omrabbitmq \
-	--disable-omhiredis \
 	--disable-generate-man-pages
 
 ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
@@ -139,6 +93,7 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT)	+= omstdout
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= omjournal
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF)	+= omudpspoof
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK)	+= omuxsock
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS)	+= pmciscoios
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG)	+= pmlastmsg
 
 # ----------------------------------------------------------------------------
@@ -171,6 +126,8 @@ endif
 		$(call install_copy, rsyslog, 0, 0, 0644, -, \
 			/usr/lib/rsyslog/$$plugin.so); \
 	done
+	$(call install_copy, rsyslog, 0, 0, 0644, -, \
+		/usr/lib/rsyslog/imkmsg.so)
 
 	@$(call install_finish, rsyslog)
 
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] procps-ng: bump version

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/procps.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/procps.make b/rules/procps.make
index b08991b..dbc6799 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
 #
 # Paths and names
 #
-PROCPS_VERSION	:= 3.3.11
-PROCPS_MD5	:= 6cc5b94c1c5b8cbc89ad345a7b522f74
+PROCPS_VERSION	:= 3.3.12
+PROCPS_MD5	:= 957e42e8b193490b2111252e4a2b443c
 PROCPS		:= procps-ng-$(PROCPS_VERSION)
 PROCPS_SUFFIX	:= tar.xz
 PROCPS_URL	:= $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] e2fsprogs: bump version

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/e2fsprogs.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 01a23f3..232d59e 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.43.1
-E2FSPROGS_MD5		:= 1775f3f0eed9dee1c5f39e08d1964a97
+E2FSPROGS_VERSION	:= 1.43.3
+E2FSPROGS_MD5		:= ec0cd4faac71b2fcf9f73733e4d50ead
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libfastjson: new package

[Michael Olbrich]

On Mon, Sep 26, 2016 at 09:33:33PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  rules/libfastjson.in   |  8 ++++++
>  rules/libfastjson.make | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 77 insertions(+)
>  create mode 100644 rules/libfastjson.in
>  create mode 100644 rules/libfastjson.make
> 
> diff --git a/rules/libfastjson.in b/rules/libfastjson.in
> new file mode 100644
> index 0000000..b555544
> --- /dev/null
> +++ b/rules/libfastjson.in
> @@ -0,0 +1,8 @@
> +## SECTION=system_libraries
> +
> +config LIBFASTJSON
> +	bool
> +	prompt "libfastjson"
> +	help
> +	  libfastjson is a small and fast C library with most essential
> +	  JSON handling functions.
> diff --git a/rules/libfastjson.make b/rules/libfastjson.make
> new file mode 100644
> index 0000000..901f4dd
> --- /dev/null
> +++ b/rules/libfastjson.make
> @@ -0,0 +1,69 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pqgruber.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBFASTJSON) += libfastjson
> +
> +#
> +# Paths and names
> +#
> +LIBFASTJSON_VERSION	:= 0.99.4
> +LIBFASTJSON_MD5		:= 5a24c9adcd0bf5307c972de5e9ea4ce9
> +LIBFASTJSON		:= libfastjson-$(LIBFASTJSON_VERSION)
> +LIBFASTJSON_SUFFIX	:= tar.gz
> +LIBFASTJSON_URL		:= https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
> +LIBFASTJSON_SOURCE	:= $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
> +LIBFASTJSON_DIR		:= $(BUILDDIR)/$(LIBFASTJSON)
> +#LIBFASTJSON_BUILD_OOT	:= YES

remove this line.

> +LIBFASTJSON_LICENSE	:= MIT
> +
> +# ----------------------------------------------------------------------------
> +# Extract
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libfastjson.extract: $(STATEDIR)/autogen-tools
> +
> +$(STATEDIR)/libfastjson.extract:
> +	@$(call targetinfo)
> +	@$(call clean, $(LIBFASTJSON_DIR))
> +	@$(call extract, LIBFASTJSON)
> +	cd $(LIBFASTJSON_DIR) && [ -f configure ] || sh autogen.sh
> +	@$(call patchin, LIBFASTJSON)
> +	@$(call touch)


remove the extract stage. Just add a patches/libfastjson-0.99.4/autogen.sh
link. That will handle it all. Including the correct dependencies.

> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +LIBFASTJSON_CONF_TOOL	:= autoconf
> +LIBFASTJSON_CONF_OPT	:= $(CROSS_AUTOCONF_USR)

remove this line.

Michael

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libfastjson.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libfastjson)
> +	@$(call install_fixup, libfastjson, PRIORITY, optional)
> +	@$(call install_fixup, libfastjson, SECTION, base)
> +	@$(call install_fixup, libfastjson, AUTHOR, "Clemens Gruber <clemens.gruber@pqgruber.com>")
> +	@$(call install_fixup, libfastjson, DESCRIPTION, missing)
> +
> +	@$(call install_lib, libfastjson, 0, 0, 0644, libfastjson)
> +
> +	@$(call install_finish, libfastjson)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.10.0
> 
> 
> _______________________________________________
> 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

Re: [ptxdist] [PATCH] rsyslog: major update

[Michael Olbrich]

On Mon, Sep 26, 2016 at 09:33:34PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  projectroot/etc/rsyslog.conf | 33 +++++++++++++++++++-----
>  rules/rsyslog.in             | 20 +++++++++++----
>  rules/rsyslog.make           | 61 +++++++-------------------------------------
>  3 files changed, 51 insertions(+), 63 deletions(-)
> 
> diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
> index 94115e4..979b3ec 100644
> --- a/projectroot/etc/rsyslog.conf
> +++ b/projectroot/etc/rsyslog.conf
> @@ -1,11 +1,32 @@
>  # Begin /etc/rsyslog.conf
>  
> -$ModLoad immark # provides --MARK-- message capability
> -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
> -$ModLoad imklog # provides kernel logging support (previously done by rklogd)
> +#module(load="imjournal" # provides access to the systemd journal
> +module(load="imkmsg")    # provides structured kernel logging support
> +#module(load="immark")   # provides --MARK-- message capability
> +module(load="imuxsock")  # provides support for local system logging
>  
> -daemon.* -/var/log/daemon.log
> -kern.* -/var/log/kern.log
> -user.* -/var/log/user.log
> +# Use traditional timestamp format.
> +# To enable high precision timestamps, comment out the following line.
> +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
> +
> +# Where to place spool and state files
> +#$WorkDirectory /var/spool/rsyslog
> +
> +# Include all config files from /etc/rsyslog.d/
> +#$IncludeConfig /etc/rsyslog.d/*.conf
> +
> +# First some standard log files.  Log by facility.
> +#auth,authpriv.*			/var/log/auth.log
> +#*.*;auth,authpriv.none		-/var/log/syslog
> +daemon.*			-/var/log/daemon.log
> +kern.*				-/var/log/kern.log
> +user.*				-/var/log/user.log
> +
> +# And some "catch-all" log files.
> +#*.=debug;\
> +#	auth,authpriv.none	-/var/log/debug
> +#*.=info;*.=notice;*.=warn;\
> +#	auth,authpriv.none;\
> +#	daemon.none;		-/var/log/messages
>  
>  # End /etc/rsyslog.conf
> diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> index eab69d6..7eb7896 100644
> --- a/rules/rsyslog.in
> +++ b/rules/rsyslog.in
> @@ -8,12 +8,13 @@ menuconfig RSYSLOG
>  	select GCCLIBS_GCC_S
>  	select ZLIB
>  	select LIBESTR
> -	select JSON_C
> +	select LIBFASTJSON
>  	select LIBNET		if RSYSLOG_OMUDPSPOOF
>  	select SYSTEMD		if RSYSLOG_SYSTEMD
>  	prompt "rsyslog                       "
>  	help
> -	  FIXME
> +	  rsyslog is a reliable system and kernel logging daemon with
> +	  modular design and high speed message processing.
>  
>  if RSYSLOG
>  
> @@ -29,15 +30,16 @@ config RSYSLOG_SYSTEMD_UNIT
>  
>  config RSYSLOG_REGEXP
>  	bool
> -	# 8.8.0 fail to build without regex support
> +	# 8.21.0 failed to build without regex support
>  	default y
>  	prompt "regular expression support" if BROKEN
>  
>  config RSYSLOG_INET
>  	bool
> -	# 8.8.0 fail to run without inet support
>  	default y
> -	prompt "networking support" if BROKEN
> +	prompt "networking support"
> +
> +comment "modules   ---"
>  
>  config RSYSLOG_IMDIAG
>  	bool
> @@ -80,6 +82,10 @@ config RSYSLOG_IMUXSOCK
>  	default y
>  	prompt "unix domain socket input module"
>  
> +config RSYSLOG_MMJSONPARSE
> +	bool
> +	prompt "jsonparse message modification module"
> +
>  config RSYSLOG_OMPROG
>  	bool
>  	prompt "program output module"
> @@ -96,6 +102,10 @@ config RSYSLOG_OMUXSOCK
>  	bool
>  	prompt "unix domain socket output module"
>  
> +config RSYSLOG_PMCISCOIOS
> +	bool
> +	prompt "cisco ios parser module"
> +
>  config RSYSLOG_PMLASTMSG
>  	bool
>  	prompt "lastmsg parser module"
> diff --git a/rules/rsyslog.make b/rules/rsyslog.make
> index 95a315b..a3d1160 100644
> --- a/rules/rsyslog.make
> +++ b/rules/rsyslog.make
> @@ -1,6 +1,7 @@
>  # -*-makefile-*-
>  #
>  # Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
> +# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pgruber.com>
>  #
>  # See CREDITS for details about who has contributed to this project.
>  #
> @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
>  #
>  # Paths and names
>  #
> -RSYSLOG_VERSION	:= 8.8.0
> -RSYSLOG_MD5	:= 188088dc496fb0a121edb8816d1fac83
> +RSYSLOG_VERSION	:= 8.21.0
> +RSYSLOG_MD5	:= f9b89a192090cd56f80c2ff930b5fd30
>  RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
>  RSYSLOG_SUFFIX	:= tar.gz
>  RSYSLOG_URL	:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
> @@ -39,75 +40,28 @@ RSYSLOG_LICENSE_FILES := \
>  RSYSLOG_CONF_TOOL	:= autoconf
>  RSYSLOG_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--runstatedir=/run \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
> -	--disable-gssapi-krb5 \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
>  	--enable-kmsg \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
> -	--disable-jemalloc \
> -	--enable-unlimited-select \
> -	--disable-debug \
> -	--disable-rtinst \
> -	--disable-debugless \
> -	--disable-valgrind \
> -	--disable-memcheck \
> -	--disable-diagtools \
> -	--disable-usertools \
> -	--disable-mysql \
> -	--disable-pgsql \
> -	--disable-libdbi \
> -	--disable-snmp \
>  	--disable-uuid \
> -	--disable-elasticsearch \
> -	--disable-gnutls \
>  	--disable-libgcrypt \
> -	--enable-rsyslogrt \
> -	--enable-rsyslogd \
> -	--disable-mysql-tests \
> -	--disable-mail \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
> -	--disable-mmnormalize \
> -	--disable-mmjsonparse \
> -	--disable-mmaudit \
> -	--disable-mmanon \
> -	--disable-mmutf8fix \
> -	--disable-mmcount \
> -	--disable-mmsequence \
> -	--disable-mmfields \
> -	--disable-mmpstrucdata \
> -	--disable-mmrfc5424addhmac \
> -	--disable-relp \
> -	--disable-guardtime \
>  	--disable-liblogging-stdlog \
> -	--disable-rfc3195 \
> -	--disable-testbench \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \
> -	--disable-imsolaris \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPTCP)-imptcp \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPSTATS)-impstats \
> +	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
> +	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
> -	--disable-pmcisconames \
> -	--disable-pmciscoios \
> -	--disable-pmaixforwardedfrom \
> -	--disable-pmsnare \
> -	--disable-omruleset \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \
> -	--disable-mmsnmptrapd \
> -	--disable-omhdfs \
> -	--disable-omkafka \
> -	--disable-ommongodb \
> -	--disable-imzmq3 \
> -	--disable-imczmq \
> -	--disable-omzmq3 \
> -	--disable-omczmq \
> -	--disable-omrabbitmq \
> -	--disable-omhiredis \

don't remove configure options that still exist.

>  	--disable-generate-man-pages
>  
>  ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
> @@ -139,6 +93,7 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT)	+= omstdout
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= omjournal
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF)	+= omudpspoof
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK)	+= omuxsock
> +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS)	+= pmciscoios
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG)	+= pmlastmsg
>  
>  # ----------------------------------------------------------------------------
> @@ -171,6 +126,8 @@ endif
>  		$(call install_copy, rsyslog, 0, 0, 0644, -, \
>  			/usr/lib/rsyslog/$$plugin.so); \
>  	done
> +	$(call install_copy, rsyslog, 0, 0, 0644, -, \
> +		/usr/lib/rsyslog/imkmsg.so)

No. Add this with RSYSLOG_PLUGINS-y above. Note: the list is sorted by
plugin name.

Michael

>  
>  	@$(call install_finish, rsyslog)
>  
> -- 
> 2.10.0
> 
> 
> _______________________________________________
> 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

Re: [ptxdist] [PATCH] rsyslog: major update

[Clemens Gruber]

Hi,

On Tue, Sep 27, 2016 at 08:37:58AM +0200, Michael Olbrich wrote:
> On Mon, Sep 26, 2016 at 09:33:34PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > ---
> >  projectroot/etc/rsyslog.conf | 33 +++++++++++++++++++-----
> >  rules/rsyslog.in             | 20 +++++++++++----
> >  rules/rsyslog.make           | 61 +++++++-------------------------------------
> >  3 files changed, 51 insertions(+), 63 deletions(-)
> > 
> > diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
> > index 94115e4..979b3ec 100644
> > --- a/projectroot/etc/rsyslog.conf
> > +++ b/projectroot/etc/rsyslog.conf
> > @@ -1,11 +1,32 @@
> >  # Begin /etc/rsyslog.conf
> >  
> > -$ModLoad immark # provides --MARK-- message capability
> > -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
> > -$ModLoad imklog # provides kernel logging support (previously done by rklogd)
> > +#module(load="imjournal" # provides access to the systemd journal
> > +module(load="imkmsg")    # provides structured kernel logging support
> > +#module(load="immark")   # provides --MARK-- message capability
> > +module(load="imuxsock")  # provides support for local system logging
> >  
> > -daemon.* -/var/log/daemon.log
> > -kern.* -/var/log/kern.log
> > -user.* -/var/log/user.log
> > +# Use traditional timestamp format.
> > +# To enable high precision timestamps, comment out the following line.
> > +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
> > +
> > +# Where to place spool and state files
> > +#$WorkDirectory /var/spool/rsyslog
> > +
> > +# Include all config files from /etc/rsyslog.d/
> > +#$IncludeConfig /etc/rsyslog.d/*.conf
> > +
> > +# First some standard log files.  Log by facility.
> > +#auth,authpriv.*			/var/log/auth.log
> > +#*.*;auth,authpriv.none		-/var/log/syslog
> > +daemon.*			-/var/log/daemon.log
> > +kern.*				-/var/log/kern.log
> > +user.*				-/var/log/user.log
> > +
> > +# And some "catch-all" log files.
> > +#*.=debug;\
> > +#	auth,authpriv.none	-/var/log/debug
> > +#*.=info;*.=notice;*.=warn;\
> > +#	auth,authpriv.none;\
> > +#	daemon.none;		-/var/log/messages
> >  
> >  # End /etc/rsyslog.conf
> > diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> > index eab69d6..7eb7896 100644
> > --- a/rules/rsyslog.in
> > +++ b/rules/rsyslog.in
> > @@ -8,12 +8,13 @@ menuconfig RSYSLOG
> >  	select GCCLIBS_GCC_S
> >  	select ZLIB
> >  	select LIBESTR
> > -	select JSON_C
> > +	select LIBFASTJSON
> >  	select LIBNET		if RSYSLOG_OMUDPSPOOF
> >  	select SYSTEMD		if RSYSLOG_SYSTEMD
> >  	prompt "rsyslog                       "
> >  	help
> > -	  FIXME
> > +	  rsyslog is a reliable system and kernel logging daemon with
> > +	  modular design and high speed message processing.
> >  
> >  if RSYSLOG
> >  
> > @@ -29,15 +30,16 @@ config RSYSLOG_SYSTEMD_UNIT
> >  
> >  config RSYSLOG_REGEXP
> >  	bool
> > -	# 8.8.0 fail to build without regex support
> > +	# 8.21.0 failed to build without regex support
> >  	default y
> >  	prompt "regular expression support" if BROKEN
> >  
> >  config RSYSLOG_INET
> >  	bool
> > -	# 8.8.0 fail to run without inet support
> >  	default y
> > -	prompt "networking support" if BROKEN
> > +	prompt "networking support"
> > +
> > +comment "modules   ---"
> >  
> >  config RSYSLOG_IMDIAG
> >  	bool
> > @@ -80,6 +82,10 @@ config RSYSLOG_IMUXSOCK
> >  	default y
> >  	prompt "unix domain socket input module"
> >  
> > +config RSYSLOG_MMJSONPARSE
> > +	bool
> > +	prompt "jsonparse message modification module"
> > +
> >  config RSYSLOG_OMPROG
> >  	bool
> >  	prompt "program output module"
> > @@ -96,6 +102,10 @@ config RSYSLOG_OMUXSOCK
> >  	bool
> >  	prompt "unix domain socket output module"
> >  
> > +config RSYSLOG_PMCISCOIOS
> > +	bool
> > +	prompt "cisco ios parser module"
> > +
> >  config RSYSLOG_PMLASTMSG
> >  	bool
> >  	prompt "lastmsg parser module"
> > diff --git a/rules/rsyslog.make b/rules/rsyslog.make
> > index 95a315b..a3d1160 100644
> > --- a/rules/rsyslog.make
> > +++ b/rules/rsyslog.make
> > @@ -1,6 +1,7 @@
> >  # -*-makefile-*-
> >  #
> >  # Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
> > +# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pgruber.com>
> >  #
> >  # See CREDITS for details about who has contributed to this project.
> >  #
> > @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
> >  #
> >  # Paths and names
> >  #
> > -RSYSLOG_VERSION	:= 8.8.0
> > -RSYSLOG_MD5	:= 188088dc496fb0a121edb8816d1fac83
> > +RSYSLOG_VERSION	:= 8.21.0
> > +RSYSLOG_MD5	:= f9b89a192090cd56f80c2ff930b5fd30
> >  RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
> >  RSYSLOG_SUFFIX	:= tar.gz
> >  RSYSLOG_URL	:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
> > @@ -39,75 +40,28 @@ RSYSLOG_LICENSE_FILES := \
> >  RSYSLOG_CONF_TOOL	:= autoconf
> >  RSYSLOG_CONF_OPT	:= \
> >  	$(CROSS_AUTOCONF_USR) \
> > +	--runstatedir=/run \
> >  	$(GLOBAL_LARGE_FILE_OPTION) \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
> > -	--disable-gssapi-krb5 \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
> >  	--enable-kmsg \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
> > -	--disable-jemalloc \
> > -	--enable-unlimited-select \
> > -	--disable-debug \
> > -	--disable-rtinst \
> > -	--disable-debugless \
> > -	--disable-valgrind \
> > -	--disable-memcheck \
> > -	--disable-diagtools \
> > -	--disable-usertools \
> > -	--disable-mysql \
> > -	--disable-pgsql \
> > -	--disable-libdbi \
> > -	--disable-snmp \
> >  	--disable-uuid \
> > -	--disable-elasticsearch \
> > -	--disable-gnutls \
> >  	--disable-libgcrypt \
> > -	--enable-rsyslogrt \
> > -	--enable-rsyslogd \
> > -	--disable-mysql-tests \
> > -	--disable-mail \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
> > -	--disable-mmnormalize \
> > -	--disable-mmjsonparse \
> > -	--disable-mmaudit \
> > -	--disable-mmanon \
> > -	--disable-mmutf8fix \
> > -	--disable-mmcount \
> > -	--disable-mmsequence \
> > -	--disable-mmfields \
> > -	--disable-mmpstrucdata \
> > -	--disable-mmrfc5424addhmac \
> > -	--disable-relp \
> > -	--disable-guardtime \
> >  	--disable-liblogging-stdlog \
> > -	--disable-rfc3195 \
> > -	--disable-testbench \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \
> > -	--disable-imsolaris \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPTCP)-imptcp \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPSTATS)-impstats \
> > +	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
> > +	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
> > -	--disable-pmcisconames \
> > -	--disable-pmciscoios \
> > -	--disable-pmaixforwardedfrom \
> > -	--disable-pmsnare \
> > -	--disable-omruleset \
> >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \
> > -	--disable-mmsnmptrapd \
> > -	--disable-omhdfs \
> > -	--disable-omkafka \
> > -	--disable-ommongodb \
> > -	--disable-imzmq3 \
> > -	--disable-imczmq \
> > -	--disable-omzmq3 \
> > -	--disable-omczmq \
> > -	--disable-omrabbitmq \
> > -	--disable-omhiredis \
> 
> don't remove configure options that still exist.

I removed them because they all default to disabled. Do you still want
to keep them redundantly?


> 
> >  	--disable-generate-man-pages
> >  
> >  ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
> > @@ -139,6 +93,7 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT)	+= omstdout
> >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= omjournal
> >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF)	+= omudpspoof
> >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK)	+= omuxsock
> > +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS)	+= pmciscoios
> >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG)	+= pmlastmsg
> >  
> >  # ----------------------------------------------------------------------------
> > @@ -171,6 +126,8 @@ endif
> >  		$(call install_copy, rsyslog, 0, 0, 0644, -, \
> >  			/usr/lib/rsyslog/$$plugin.so); \
> >  	done
> > +	$(call install_copy, rsyslog, 0, 0, 0644, -, \
> > +		/usr/lib/rsyslog/imkmsg.so)
> 
> No. Add this with RSYSLOG_PLUGINS-y above. Note: the list is sorted by
> plugin name.

This I did because imkmsg was in contrib and not in plugins, but that
probably does not matter. I'll send a v2 with this in RSYSLOG_PLUGINS-y.

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] rsyslog: major update

[Ladislav Michl]

Hi,

On Tue, Sep 27, 2016 at 02:35:11PM +0200, Clemens Gruber wrote:
> On Tue, Sep 27, 2016 at 08:37:58AM +0200, Michael Olbrich wrote:
> > On Mon, Sep 26, 2016 at 09:33:34PM +0200, Clemens Gruber wrote:
[snip]
...
> > > -	--disable-omczmq \
> > > -	--disable-omrabbitmq \
> > > -	--disable-omhiredis \
> > 
> > don't remove configure options that still exist.
> 
> I removed them because they all default to disabled. Do you still want
> to keep them redundantly?

It has more to do with safety than redundancy as defaults can change
over time, so keeping explicitely disabled options is common practice
over ptxdist codebase.

	ladis

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] iproute2: update version and minor improvements

[Michael Olbrich]

On Mon, Sep 26, 2016 at 09:33:32PM +0200, Clemens Gruber wrote:
> Update to iproute2 4.7.0, which includes Alexander Aring's patch to fix
> the xtables build failure.
> Replaced the description of tc with some (modified) lines from the
> manpage.
> Let libmng be used if it is enabled in ptxdist.
> 
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  rules/iproute2.in   |  5 +++--
>  rules/iproute2.make | 10 +++++++---
>  2 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/iproute2.in b/rules/iproute2.in
> index dadad03..888b595 100644
> --- a/rules/iproute2.in
> +++ b/rules/iproute2.in
> @@ -135,7 +135,8 @@ config IPROUTE2_TC
>  	bool
>  	prompt "tc"
>  	help
> -	  In Quality Of Service (QOS) and Class Of Service (COS)
> -	  scenarios used for traffic controlling
> +	  tc is used to configure Traffic Control in the Linux Kernel, which
> +	  consists of Shaping, Scheduling, Policing and Dropping.
> +	  Processing of traffic is controlled by qdiscs, classes and filters.
>  
>  endif
> diff --git a/rules/iproute2.make b/rules/iproute2.make
> index 9e9e899..8e62f8f 100644
> --- a/rules/iproute2.make
> +++ b/rules/iproute2.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
>  #
>  # Paths and names
>  #
> -IPROUTE2_VERSION	:= 4.6.0
> -IPROUTE2_MD5		:= d015e437e4f744d51d3a1a53341826d5
> +IPROUTE2_VERSION	:= 4.7.0
> +IPROUTE2_MD5		:= d4b205830cdc2702f8a0cbd6232129cd

Hmm, somthing is wrong here. The upstream version is 4.4.0

>  IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
>  IPROUTE2_SUFFIX		:= tar.xz
>  IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
> @@ -46,7 +46,9 @@ $(STATEDIR)/iproute2.prepare:
>  ifndef PTXCONF_GLOBAL_SELINUX
>  	@echo 'HAVE_SELINUX:=n'		>> $(IPROUTE2_DIR)/Config
>  endif
> +ifndef PTXCONF_LIBMNL
>  	@echo 'HAVE_MNL:=n'		>> $(IPROUTE2_DIR)/Config
> +endif

This is wrong.
1. if libmnl is used, then a dependency is needed in iproute2.in
2. at least in version 4.4.0 libmnl is only used for tipc, which is never
installed.

Michael

>  ifndef PTXCONF_IPROUTE2_ARPD
>  	@echo 'HAVE_BERKELEY_DB:=n'	>> $(IPROUTE2_DIR)/Config
>  endif
> @@ -97,18 +99,20 @@ $(STATEDIR)/iproute2.targetinstall:
>  	done
>  
>  ifdef PTXCONF_IPROUTE2_TC
> +	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/normal.dist)
>  	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/pareto.dist)
>  	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/paretonormal.dist)
>  	@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/experimental.dist)
>  endif
>  
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/ematch_map)
> +	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
> +	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/nl_protos)
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_dsfield)
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_protos)
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_realms)
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_scopes)
>  	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_tables)
> -	@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
>  
>  	@$(call install_finish, iproute2)
>  
> -- 
> 2.10.0
> 
> 
> _______________________________________________
> 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

Re: [ptxdist] [PATCH] rsyslog: major update

[Michael Olbrich]

On Tue, Sep 27, 2016 at 02:35:11PM +0200, Clemens Gruber wrote:
> Hi,
> 
> On Tue, Sep 27, 2016 at 08:37:58AM +0200, Michael Olbrich wrote:
> > On Mon, Sep 26, 2016 at 09:33:34PM +0200, Clemens Gruber wrote:
> > > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > > ---
> > >  projectroot/etc/rsyslog.conf | 33 +++++++++++++++++++-----
> > >  rules/rsyslog.in             | 20 +++++++++++----
> > >  rules/rsyslog.make           | 61 +++++++-------------------------------------
> > >  3 files changed, 51 insertions(+), 63 deletions(-)
> > > 
> > > diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
> > > index 94115e4..979b3ec 100644
> > > --- a/projectroot/etc/rsyslog.conf
> > > +++ b/projectroot/etc/rsyslog.conf
> > > @@ -1,11 +1,32 @@
> > >  # Begin /etc/rsyslog.conf
> > >  
> > > -$ModLoad immark # provides --MARK-- message capability
> > > -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
> > > -$ModLoad imklog # provides kernel logging support (previously done by rklogd)
> > > +#module(load="imjournal" # provides access to the systemd journal
> > > +module(load="imkmsg")    # provides structured kernel logging support
> > > +#module(load="immark")   # provides --MARK-- message capability
> > > +module(load="imuxsock")  # provides support for local system logging
> > >  
> > > -daemon.* -/var/log/daemon.log
> > > -kern.* -/var/log/kern.log
> > > -user.* -/var/log/user.log
> > > +# Use traditional timestamp format.
> > > +# To enable high precision timestamps, comment out the following line.
> > > +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
> > > +
> > > +# Where to place spool and state files
> > > +#$WorkDirectory /var/spool/rsyslog
> > > +
> > > +# Include all config files from /etc/rsyslog.d/
> > > +#$IncludeConfig /etc/rsyslog.d/*.conf
> > > +
> > > +# First some standard log files.  Log by facility.
> > > +#auth,authpriv.*			/var/log/auth.log
> > > +#*.*;auth,authpriv.none		-/var/log/syslog
> > > +daemon.*			-/var/log/daemon.log
> > > +kern.*				-/var/log/kern.log
> > > +user.*				-/var/log/user.log
> > > +
> > > +# And some "catch-all" log files.
> > > +#*.=debug;\
> > > +#	auth,authpriv.none	-/var/log/debug
> > > +#*.=info;*.=notice;*.=warn;\
> > > +#	auth,authpriv.none;\
> > > +#	daemon.none;		-/var/log/messages
> > >  
> > >  # End /etc/rsyslog.conf
> > > diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> > > index eab69d6..7eb7896 100644
> > > --- a/rules/rsyslog.in
> > > +++ b/rules/rsyslog.in
> > > @@ -8,12 +8,13 @@ menuconfig RSYSLOG
> > >  	select GCCLIBS_GCC_S
> > >  	select ZLIB
> > >  	select LIBESTR
> > > -	select JSON_C
> > > +	select LIBFASTJSON
> > >  	select LIBNET		if RSYSLOG_OMUDPSPOOF
> > >  	select SYSTEMD		if RSYSLOG_SYSTEMD
> > >  	prompt "rsyslog                       "
> > >  	help
> > > -	  FIXME
> > > +	  rsyslog is a reliable system and kernel logging daemon with
> > > +	  modular design and high speed message processing.
> > >  
> > >  if RSYSLOG
> > >  
> > > @@ -29,15 +30,16 @@ config RSYSLOG_SYSTEMD_UNIT
> > >  
> > >  config RSYSLOG_REGEXP
> > >  	bool
> > > -	# 8.8.0 fail to build without regex support
> > > +	# 8.21.0 failed to build without regex support
> > >  	default y
> > >  	prompt "regular expression support" if BROKEN
> > >  
> > >  config RSYSLOG_INET
> > >  	bool
> > > -	# 8.8.0 fail to run without inet support
> > >  	default y
> > > -	prompt "networking support" if BROKEN
> > > +	prompt "networking support"
> > > +
> > > +comment "modules   ---"
> > >  
> > >  config RSYSLOG_IMDIAG
> > >  	bool
> > > @@ -80,6 +82,10 @@ config RSYSLOG_IMUXSOCK
> > >  	default y
> > >  	prompt "unix domain socket input module"
> > >  
> > > +config RSYSLOG_MMJSONPARSE
> > > +	bool
> > > +	prompt "jsonparse message modification module"
> > > +
> > >  config RSYSLOG_OMPROG
> > >  	bool
> > >  	prompt "program output module"
> > > @@ -96,6 +102,10 @@ config RSYSLOG_OMUXSOCK
> > >  	bool
> > >  	prompt "unix domain socket output module"
> > >  
> > > +config RSYSLOG_PMCISCOIOS
> > > +	bool
> > > +	prompt "cisco ios parser module"
> > > +
> > >  config RSYSLOG_PMLASTMSG
> > >  	bool
> > >  	prompt "lastmsg parser module"
> > > diff --git a/rules/rsyslog.make b/rules/rsyslog.make
> > > index 95a315b..a3d1160 100644
> > > --- a/rules/rsyslog.make
> > > +++ b/rules/rsyslog.make
> > > @@ -1,6 +1,7 @@
> > >  # -*-makefile-*-
> > >  #
> > >  # Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
> > > +# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pgruber.com>
> > >  #
> > >  # See CREDITS for details about who has contributed to this project.
> > >  #
> > > @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
> > >  #
> > >  # Paths and names
> > >  #
> > > -RSYSLOG_VERSION	:= 8.8.0
> > > -RSYSLOG_MD5	:= 188088dc496fb0a121edb8816d1fac83
> > > +RSYSLOG_VERSION	:= 8.21.0
> > > +RSYSLOG_MD5	:= f9b89a192090cd56f80c2ff930b5fd30
> > >  RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
> > >  RSYSLOG_SUFFIX	:= tar.gz
> > >  RSYSLOG_URL	:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
> > > @@ -39,75 +40,28 @@ RSYSLOG_LICENSE_FILES := \
> > >  RSYSLOG_CONF_TOOL	:= autoconf
> > >  RSYSLOG_CONF_OPT	:= \
> > >  	$(CROSS_AUTOCONF_USR) \
> > > +	--runstatedir=/run \
> > >  	$(GLOBAL_LARGE_FILE_OPTION) \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
> > > -	--disable-gssapi-krb5 \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
> > >  	--enable-kmsg \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
> > > -	--disable-jemalloc \
> > > -	--enable-unlimited-select \
> > > -	--disable-debug \
> > > -	--disable-rtinst \
> > > -	--disable-debugless \
> > > -	--disable-valgrind \
> > > -	--disable-memcheck \
> > > -	--disable-diagtools \
> > > -	--disable-usertools \
> > > -	--disable-mysql \
> > > -	--disable-pgsql \
> > > -	--disable-libdbi \
> > > -	--disable-snmp \
> > >  	--disable-uuid \
> > > -	--disable-elasticsearch \
> > > -	--disable-gnutls \
> > >  	--disable-libgcrypt \
> > > -	--enable-rsyslogrt \
> > > -	--enable-rsyslogd \
> > > -	--disable-mysql-tests \
> > > -	--disable-mail \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
> > > -	--disable-mmnormalize \
> > > -	--disable-mmjsonparse \
> > > -	--disable-mmaudit \
> > > -	--disable-mmanon \
> > > -	--disable-mmutf8fix \
> > > -	--disable-mmcount \
> > > -	--disable-mmsequence \
> > > -	--disable-mmfields \
> > > -	--disable-mmpstrucdata \
> > > -	--disable-mmrfc5424addhmac \
> > > -	--disable-relp \
> > > -	--disable-guardtime \
> > >  	--disable-liblogging-stdlog \
> > > -	--disable-rfc3195 \
> > > -	--disable-testbench \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \
> > > -	--disable-imsolaris \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPTCP)-imptcp \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMPSTATS)-impstats \
> > > +	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
> > > +	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
> > > -	--disable-pmcisconames \
> > > -	--disable-pmciscoios \
> > > -	--disable-pmaixforwardedfrom \
> > > -	--disable-pmsnare \
> > > -	--disable-omruleset \
> > >  	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \
> > > -	--disable-mmsnmptrapd \
> > > -	--disable-omhdfs \
> > > -	--disable-omkafka \
> > > -	--disable-ommongodb \
> > > -	--disable-imzmq3 \
> > > -	--disable-imczmq \
> > > -	--disable-omzmq3 \
> > > -	--disable-omczmq \
> > > -	--disable-omrabbitmq \
> > > -	--disable-omhiredis \
> > 
> > don't remove configure options that still exist.
> 
> I removed them because they all default to disabled. Do you still want
> to keep them redundantly?

Yes. These things should be explicit.

> > 
> > >  	--disable-generate-man-pages
> > >  
> > >  ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
> > > @@ -139,6 +93,7 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT)	+= omstdout
> > >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= omjournal
> > >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF)	+= omudpspoof
> > >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK)	+= omuxsock
> > > +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS)	+= pmciscoios
> > >  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG)	+= pmlastmsg
> > >  
> > >  # ----------------------------------------------------------------------------
> > > @@ -171,6 +126,8 @@ endif
> > >  		$(call install_copy, rsyslog, 0, 0, 0644, -, \
> > >  			/usr/lib/rsyslog/$$plugin.so); \
> > >  	done
> > > +	$(call install_copy, rsyslog, 0, 0, 0644, -, \
> > > +		/usr/lib/rsyslog/imkmsg.so)
> > 
> > No. Add this with RSYSLOG_PLUGINS-y above. Note: the list is sorted by
> > plugin name.
> 
> This I did because imkmsg was in contrib and not in plugins, but that
> probably does not matter. I'll send a v2 with this in RSYSLOG_PLUGINS-y.

It realy doesn't matter where it is in the source code. It's installed to
/usr/lib/rsyslog/ so it can be installed in the loop above.

Michael

-- 
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

Re: [ptxdist] [PATCH] iproute2: update version and minor improvements

[Clemens Gruber]

On Wed, Sep 28, 2016 at 10:56:00AM +0200, Michael Olbrich wrote:
> Hmm, somthing is wrong here. The upstream version is 4.4.0

As far as I know it is 4.7.0.
See: https://www.kernel.org/pub/linux/utils/net/iproute2/?C=M;O=D

> 
> >  IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
> >  IPROUTE2_SUFFIX		:= tar.xz
> >  IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
> > @@ -46,7 +46,9 @@ $(STATEDIR)/iproute2.prepare:
> >  ifndef PTXCONF_GLOBAL_SELINUX
> >  	@echo 'HAVE_SELINUX:=n'		>> $(IPROUTE2_DIR)/Config
> >  endif
> > +ifndef PTXCONF_LIBMNL
> >  	@echo 'HAVE_MNL:=n'		>> $(IPROUTE2_DIR)/Config
> > +endif
> 
> This is wrong.
> 1. if libmnl is used, then a dependency is needed in iproute2.in
> 2. at least in version 4.4.0 libmnl is only used for tipc, which is never
> installed.

1. But then we would require libmnl.. I wanted to only use it if it is
already required by something else.
2. OK I'll remove the libmnl stuff, it's not necessary.

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] rsyslog: major update

[Clemens Gruber]

On Wed, Sep 28, 2016 at 10:59:47AM +0200, Michael Olbrich wrote:
> Yes. These things should be explicit.

OK, but there are many of them and they were never on by default (would
not make much sense to enable all of those exotic database plugins by
default)
But anyway, I'll disable all of them explicitly and send a v2.

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] iproute2: update version and minor improvements

[Clemens Gruber]

On Wed, Sep 28, 2016 at 10:56:00AM +0200, Michael Olbrich wrote:
> Hmm, somthing is wrong here. The upstream version is 4.4.0

Now I know what you mean: My mistake, sorry.

Wow, many mistakes this time. Sorry for the waste of time!

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de