[ptxdist] [PATCH 1/8] file: version bump 5.29 -> 5.30

[ptxdist] [PATCH 1/8] file: version bump 5.29 -> 5.30

[Clemens Gruber]

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

diff --git a/rules/file.make b/rules/file.make
index c3aaae554..027486ba1 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
 #
 # Paths and names
 #
-FILE_VERSION	:= 5.29
-FILE_MD5	:= b7b57b36b577c9cede2f2d1342203302
+FILE_VERSION	:= 5.30
+FILE_MD5	:= f35eaf05489ae566eafc4d26bb1dcd90
 FILE		:= file-$(FILE_VERSION)
 FILE_SUFFIX	:= tar.gz
 FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/8] flex: update 2.5.39 -> 2.6.3

[Clemens Gruber]

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

diff --git a/rules/flex.make b/rules/flex.make
index 803e25897..979ae09a3 100644
--- a/rules/flex.make
+++ b/rules/flex.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_FLEX) += flex
 #
 # Paths and names
 #
-FLEX_VERSION	:= 2.5.39
-FLEX_MD5	:= 477679c37ff8b28248a9b05f1da29a82
+FLEX_VERSION	:= 2.6.3
+FLEX_MD5	:= a5f65570cd9107ec8a8ec88f17b31bb1
 FLEX		:= flex-$(FLEX_VERSION)
-FLEX_SUFFIX	:= tar.xz
-FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
+FLEX_SUFFIX	:= tar.gz
+FLEX_URL	:= https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/$(FLEX).$(FLEX_SUFFIX)
 FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
 FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
 FLEX_LICENSE	:= BSD-2-Clause
@@ -36,7 +36,10 @@ FLEX_CONF_TOOL	:= autoconf
 FLEX_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-nls \
-	--disable-rpath
+	--disable-rpath \
+	--disable-warnings \
+	--disable-libfl \
+	--disable-bootstrap
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/8] flex: update 2.5.39 -> 2.6.3

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:17PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  rules/flex.make | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/flex.make b/rules/flex.make
> index 803e25897..979ae09a3 100644
> --- a/rules/flex.make
> +++ b/rules/flex.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_FLEX) += flex
>  #
>  # Paths and names
>  #
> -FLEX_VERSION	:= 2.5.39
> -FLEX_MD5	:= 477679c37ff8b28248a9b05f1da29a82
> +FLEX_VERSION	:= 2.6.3
> +FLEX_MD5	:= a5f65570cd9107ec8a8ec88f17b31bb1
>  FLEX		:= flex-$(FLEX_VERSION)
> -FLEX_SUFFIX	:= tar.xz
> -FLEX_URL	:= $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX))
> +FLEX_SUFFIX	:= tar.gz
> +FLEX_URL	:= https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/$(FLEX).$(FLEX_SUFFIX)
>  FLEX_SOURCE	:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX)
>  FLEX_DIR	:= $(BUILDDIR)/$(FLEX)
>  FLEX_LICENSE	:= BSD-2-Clause
> @@ -36,7 +36,10 @@ FLEX_CONF_TOOL	:= autoconf
>  FLEX_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-nls \
> -	--disable-rpath
> +	--disable-rpath \
> +	--disable-warnings \
> +	--disable-libfl \

I assume you did this for the host-flex, because the target flex package is
completely broken.

1. we only install libfl so it should be enabled.
2. The tests cannot be cross compiled, so we need to build with "-C src", I
   think.

Michael

> +	--disable-bootstrap
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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

[ptxdist] [PATCH 3/8] iproute2: version bump 4.9.0 -> 4.10.0

[Clemens Gruber]

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

diff --git a/rules/iproute2.make b/rules/iproute2.make
index 946247c3d..020dd4491 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 4.9.0
-IPROUTE2_MD5		:= 44a8371a4b2c40e48e4c9f98cbd41391
+IPROUTE2_VERSION	:= 4.10.0
+IPROUTE2_MD5		:= b94a2b0edefaeac124dc8f5d006931b9
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
 IPROUTE2_SUFFIX		:= tar.xz
 IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/8] iproute2: version bump 4.9.0 -> 4.10.0

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:18PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

The configure script changed. It sets HAVE_ELF instead of TC_CONFIG_ELF.
Either just replace it or add an option with a libelf dependency.
I think it's used for bpf stuff.

Michael

> ---
>  rules/iproute2.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/iproute2.make b/rules/iproute2.make
> index 946247c3d..020dd4491 100644
> --- a/rules/iproute2.make
> +++ b/rules/iproute2.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
>  #
>  # Paths and names
>  #
> -IPROUTE2_VERSION	:= 4.9.0
> -IPROUTE2_MD5		:= 44a8371a4b2c40e48e4c9f98cbd41391
> +IPROUTE2_VERSION	:= 4.10.0
> +IPROUTE2_MD5		:= b94a2b0edefaeac124dc8f5d006931b9
>  IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
>  IPROUTE2_SUFFIX		:= tar.xz
>  IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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

[ptxdist] [PATCH 4/8] libgpg-error: version bump 1.24 -> 1.26

[Clemens Gruber]

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

diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 370939141..362f7bc6a 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
 #
 # Paths and names
 #
-LIBGPG_ERROR_VERSION	:= 1.24
-LIBGPG_ERROR_MD5	:= feb42198c0aaf3b28eabe8f41a34b983
+LIBGPG_ERROR_VERSION	:= 1.26
+LIBGPG_ERROR_MD5	:= 97456709dbbcbb69354317ffe3e347cd
 LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SUFFIX	:= tar.bz2
 LIBGPG_ERROR_URL	:= \
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/8] libgpg-error: version bump 1.24 -> 1.26

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:19PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Thanks, applied,

Michael

> ---
>  rules/libgpg-error.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
> index 370939141..362f7bc6a 100644
> --- a/rules/libgpg-error.make
> +++ b/rules/libgpg-error.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
>  #
>  # Paths and names
>  #
> -LIBGPG_ERROR_VERSION	:= 1.24
> -LIBGPG_ERROR_MD5	:= feb42198c0aaf3b28eabe8f41a34b983
> +LIBGPG_ERROR_VERSION	:= 1.26
> +LIBGPG_ERROR_MD5	:= 97456709dbbcbb69354317ffe3e347cd
>  LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
>  LIBGPG_ERROR_SUFFIX	:= tar.bz2
>  LIBGPG_ERROR_URL	:= \
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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

[ptxdist] [PATCH 5/8] mosh: version bump 1.2.6 -> 1.3.0

[Clemens Gruber]

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

diff --git a/rules/mosh.make b/rules/mosh.make
index 3270f2722..6c29222f7 100644
--- a/rules/mosh.make
+++ b/rules/mosh.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MOSH) += mosh
 #
 # Paths and names
 #
-MOSH_VERSION	:= 1.2.6
-MOSH_MD5	:= bb4e24795bb135a754558176a981ee9e
+MOSH_VERSION	:= 1.3.0
+MOSH_MD5	:= d961276995936953bf2d5a794068b076
 MOSH		:= mosh-$(MOSH_VERSION)
 MOSH_SUFFIX	:= tar.gz
 MOSH_URL	:= https://mosh.mit.edu/$(MOSH).$(MOSH_SUFFIX)
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 5/8] mosh: version bump 1.2.6 -> 1.3.0

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:20PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Thanks, applied,

Michael

> ---
>  rules/mosh.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/mosh.make b/rules/mosh.make
> index 3270f2722..6c29222f7 100644
> --- a/rules/mosh.make
> +++ b/rules/mosh.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MOSH) += mosh
>  #
>  # Paths and names
>  #
> -MOSH_VERSION	:= 1.2.6
> -MOSH_MD5	:= bb4e24795bb135a754558176a981ee9e
> +MOSH_VERSION	:= 1.3.0
> +MOSH_MD5	:= d961276995936953bf2d5a794068b076
>  MOSH		:= mosh-$(MOSH_VERSION)
>  MOSH_SUFFIX	:= tar.gz
>  MOSH_URL	:= https://mosh.mit.edu/$(MOSH).$(MOSH_SUFFIX)
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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

[ptxdist] [PATCH 6/8] openssh: update 7.3p1 -> 7.5p1

[Clemens Gruber]

Update to 7.5p1 and refresh default sshd_config.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 projectroot/etc/ssh/sshd_config | 19 ++-----------------
 rules/openssh.make              | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/projectroot/etc/ssh/sshd_config b/projectroot/etc/ssh/sshd_config
index f53cb3d8f..7da4b2f26 100644
--- a/projectroot/etc/ssh/sshd_config
+++ b/projectroot/etc/ssh/sshd_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
+#	$OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -15,26 +15,15 @@
 #ListenAddress 0.0.0.0
 #ListenAddress ::
 
-# The default requires explicit activation of protocol 1
-#Protocol 2
-
-# HostKey for protocol version 1
-#HostKey /etc/ssh/ssh_host_key
-# HostKeys for protocol version 2
 HostKey /etc/ssh/ssh_host_rsa_key
 #HostKey /etc/ssh/ssh_host_dsa_key
 #HostKey /etc/ssh/ssh_host_ecdsa_key
 HostKey /etc/ssh/ssh_host_ed25519_key
 
-# Lifetime and size of ephemeral version 1 server key
-#KeyRegenerationInterval 1h
-#ServerKeyBits 1024
-
 # Ciphers and keying
 #RekeyLimit default none
 
 # Logging
-# obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
 #LogLevel INFO
 
@@ -46,7 +35,6 @@ PermitRootLogin yes
 #MaxAuthTries 6
 #MaxSessions 10
 
-#RSAAuthentication yes
 #PubkeyAuthentication yes
 
 # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
@@ -59,11 +47,9 @@ AuthorizedKeysFile	.ssh/authorized_keys
 #AuthorizedKeysCommandUser nobody
 
 # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#RhostsRSAAuthentication no
-# similar for protocol version 2
 #HostbasedAuthentication no
 # Change to yes if you don't trust ~/.ssh/known_hosts for
-# RhostsRSAAuthentication and HostbasedAuthentication
+# HostbasedAuthentication
 #IgnoreUserKnownHosts no
 # Don't read the user's ~/.rhosts and ~/.shosts files
 #IgnoreRhosts yes
@@ -107,7 +93,6 @@ AuthorizedKeysFile	.ssh/authorized_keys
 #PrintLastLog yes
 #TCPKeepAlive yes
 #UseLogin no
-UsePrivilegeSeparation sandbox		# Default for new installations.
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0
diff --git a/rules/openssh.make b/rules/openssh.make
index 198916366..b4b4d0b14 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -17,13 +17,14 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
 #
 # Paths and names
 #
-OPENSSH_VERSION	:= 7.3p1
-OPENSSH_MD5	:= dfadd9f035d38ce5d58a3bf130b86d08
+OPENSSH_VERSION	:= 7.5p1
+OPENSSH_MD5	:= 652fdc7d8392f112bef11cacf7e69e23
 OPENSSH		:= openssh-$(OPENSSH_VERSION)
 OPENSSH_SUFFIX	:= tar.gz
 OPENSSH_URL	:= \
-	http://openbsd.cs.fau.de/pub/OpenBSD/OpenSSH/portable/$(OPENSSH).$(OPENSSH_SUFFIX) \
-	http://ftp.halifax.rwth-aachen.de/openbsd/OpenSSH/portable/$(OPENSSH).$(OPENSSH_SUFFIX)
+	https://ftp.halifax.rwth-aachen.de/openbsd/OpenSSH/portable/$(OPENSSH).$(OPENSSH_SUFFIX) \
+	https://mirror.hs-esslingen.de/pub/OpenBSD/OpenSSH/portable/$(OPENSSH).$(OPENSSH_SUFFIX)
+
 OPENSSH_SOURCE	:= $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX)
 OPENSSH_DIR	:= $(BUILDDIR)/$(OPENSSH)
 OPENSSH_LICENSE	:= BSD, 2-term BSD, 3-term BSD, MIT, THE BEER-WARE LICENSE
@@ -46,6 +47,7 @@ OPENSSH_CONF_OPT	:= \
 	--libexecdir=/usr/sbin \
 	--sysconfdir=/etc/ssh \
 	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-pkcs11 \
 	--disable-strip \
 	--disable-etc-default-login \
 	--disable-lastlog \
@@ -57,9 +59,11 @@ OPENSSH_CONF_OPT	:= \
 	--disable-pututline \
 	--disable-pututxline \
 	--with-openssl \
+	--without-ssh1 \
 	--with-stackprotect \
 	--with-hardening \
 	--without-rpath \
+	--without-Werror \
 	--with-zlib=$(SYSROOT) \
 	--without-skey \
 	--without-ldns \
@@ -68,8 +72,11 @@ OPENSSH_CONF_OPT	:= \
 	--with-pie \
 	--without-ssl-engine \
 	--without-pam \
+	--with-privsep-user=nobody \
+	--with-sandbox=seccomp_filter \
 	--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \
-	--with-privsep-path=/var/run/sshd
+	--with-privsep-path=/var/run/sshd \
+	--without-md5-passwords
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 7/8] rsyslog: misc improvements and fixes

[Clemens Gruber]

json-c is no longer needed, rsyslog uses libfastjson from now on.
Make imkmsg, mmjsonparse and pmciscoios configurable.
Use --disable-unlimited-select as most other distros do and add missing
configure options.
Replace legacy configuration directives and do not load immark by
default.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 projectroot/etc/rsyslog.conf |  6 +++---
 rules/rsyslog.in             | 21 +++++++++++++++++----
 rules/rsyslog.make           | 12 ++++++++----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
index 94115e46d..a8c6945d4 100644
--- a/projectroot/etc/rsyslog.conf
+++ b/projectroot/etc/rsyslog.conf
@@ -1,8 +1,8 @@
 # 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="imuxsock") # provides support for local system logging (e.g. via logger command)
+module(load="imklog")   # provides kernel logging support (previously done by rklogd)
+#module(load"immark")   # provides --MARK-- message capability
 
 daemon.* -/var/log/daemon.log
 kern.* -/var/log/kern.log
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index 64f1063ea..f99c271eb 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -8,13 +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
 
@@ -30,13 +30,13 @@ config RSYSLOG_SYSTEMD_UNIT
 
 config RSYSLOG_REGEXP
 	bool
-	# 8.8.0 fail to build without regex support
+	# 8.25.0 fails 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
+	# 8.25.0 fails to run without inet support
 	default y
 	prompt "networking support" if BROKEN
 
@@ -53,6 +53,11 @@ config RSYSLOG_IMKLOG
 	default y
 	prompt "klog input module"
 
+config RSYSLOG_IMKMSG
+	bool
+	default n
+	prompt "kmsg input module (contrib)"
+
 config RSYSLOG_IMMARK
 	bool
 	default y
@@ -81,6 +86,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"
@@ -97,6 +106,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 c22875dd3..f33046041 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -43,11 +43,11 @@ RSYSLOG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
 	--disable-gssapi-krb5 \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
-	--enable-kmsg \
+	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKMSG)-kmsg \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
 	--disable-jemalloc \
-	--enable-unlimited-select \
+	--disable-unlimited-select \
 	--disable-debug \
 	--disable-debug-symbols \
 	--disable-rtinst \
@@ -62,6 +62,7 @@ RSYSLOG_CONF_OPT	:= \
 	--disable-snmp \
 	--disable-uuid \
 	--disable-elasticsearch \
+	--disable-elasticsearch-tests \
 	--disable-gnutls \
 	--disable-libgcrypt \
 	--enable-rsyslogrt \
@@ -72,7 +73,7 @@ RSYSLOG_CONF_OPT	:= \
 	--disable-mail \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
 	--disable-mmnormalize \
-	--disable-mmjsonparse \
+	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
 	--disable-mmgrok \
 	--disable-mmaudit \
 	--disable-mmanon \
@@ -100,7 +101,7 @@ RSYSLOG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
 	--disable-pmcisconames \
-	--disable-pmciscoios \
+	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
 	--disable-pmnull \
 	--disable-pmaixforwardedfrom \
 	--disable-pmsnare \
@@ -133,6 +134,7 @@ endif
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG)	+= imdiag
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE)	+= imfile
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG)	+= imklog
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKMSG)	+= imkmsg
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= imjournal
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMMARK)	+= immark
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPSTATS)	+= impstats
@@ -148,11 +150,13 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmstrmsrv
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmtcpclt
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmtcpsrv
 RSYSLOG_PLUGINS-y				+= lmzlibw
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_MMJSONPARSE)	+= mmjsonparse
 RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMPROG)	+= omprog
 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
 
 # ----------------------------------------------------------------------------
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 7/8] rsyslog: misc improvements and fixes

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:22PM +0200, Clemens Gruber wrote:
> json-c is no longer needed, rsyslog uses libfastjson from now on.
> Make imkmsg, mmjsonparse and pmciscoios configurable.
> Use --disable-unlimited-select as most other distros do and add missing
> configure options.
> Replace legacy configuration directives and do not load immark by
> default.
> 
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Thanks, applied,

Michael

> ---
>  projectroot/etc/rsyslog.conf |  6 +++---
>  rules/rsyslog.in             | 21 +++++++++++++++++----
>  rules/rsyslog.make           | 12 ++++++++----
>  3 files changed, 28 insertions(+), 11 deletions(-)
> 
> diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
> index 94115e46d..a8c6945d4 100644
> --- a/projectroot/etc/rsyslog.conf
> +++ b/projectroot/etc/rsyslog.conf
> @@ -1,8 +1,8 @@
>  # 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="imuxsock") # provides support for local system logging (e.g. via logger command)
> +module(load="imklog")   # provides kernel logging support (previously done by rklogd)
> +#module(load"immark")   # provides --MARK-- message capability
>  
>  daemon.* -/var/log/daemon.log
>  kern.* -/var/log/kern.log
> diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> index 64f1063ea..f99c271eb 100644
> --- a/rules/rsyslog.in
> +++ b/rules/rsyslog.in
> @@ -8,13 +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
>  
> @@ -30,13 +30,13 @@ config RSYSLOG_SYSTEMD_UNIT
>  
>  config RSYSLOG_REGEXP
>  	bool
> -	# 8.8.0 fail to build without regex support
> +	# 8.25.0 fails 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
> +	# 8.25.0 fails to run without inet support
>  	default y
>  	prompt "networking support" if BROKEN
>  
> @@ -53,6 +53,11 @@ config RSYSLOG_IMKLOG
>  	default y
>  	prompt "klog input module"
>  
> +config RSYSLOG_IMKMSG
> +	bool
> +	default n
> +	prompt "kmsg input module (contrib)"
> +
>  config RSYSLOG_IMMARK
>  	bool
>  	default y
> @@ -81,6 +86,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"
> @@ -97,6 +106,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 c22875dd3..f33046041 100644
> --- a/rules/rsyslog.make
> +++ b/rules/rsyslog.make
> @@ -43,11 +43,11 @@ RSYSLOG_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
>  	--disable-gssapi-krb5 \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
> -	--enable-kmsg \
> +	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKMSG)-kmsg \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
>  	--disable-jemalloc \
> -	--enable-unlimited-select \
> +	--disable-unlimited-select \
>  	--disable-debug \
>  	--disable-debug-symbols \
>  	--disable-rtinst \
> @@ -62,6 +62,7 @@ RSYSLOG_CONF_OPT	:= \
>  	--disable-snmp \
>  	--disable-uuid \
>  	--disable-elasticsearch \
> +	--disable-elasticsearch-tests \
>  	--disable-gnutls \
>  	--disable-libgcrypt \
>  	--enable-rsyslogrt \
> @@ -72,7 +73,7 @@ RSYSLOG_CONF_OPT	:= \
>  	--disable-mail \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
>  	--disable-mmnormalize \
> -	--disable-mmjsonparse \
> +	--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
>  	--disable-mmgrok \
>  	--disable-mmaudit \
>  	--disable-mmanon \
> @@ -100,7 +101,7 @@ RSYSLOG_CONF_OPT	:= \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
>  	--disable-pmcisconames \
> -	--disable-pmciscoios \
> +	--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
>  	--disable-pmnull \
>  	--disable-pmaixforwardedfrom \
>  	--disable-pmsnare \
> @@ -133,6 +134,7 @@ endif
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG)	+= imdiag
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE)	+= imfile
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG)	+= imklog
> +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKMSG)	+= imkmsg
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD)	+= imjournal
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMMARK)	+= immark
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPSTATS)	+= impstats
> @@ -148,11 +150,13 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmstrmsrv
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmtcpclt
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET)		+= lmtcpsrv
>  RSYSLOG_PLUGINS-y				+= lmzlibw
> +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_MMJSONPARSE)	+= mmjsonparse
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMPROG)	+= omprog
>  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
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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

[ptxdist] [PATCH 8/8] util-linux-ng: version bump 2.29 -> 2.29.2

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-__progname-redefinition-fix.patch                            | 0
 patches/{util-linux-2.29 => util-linux-2.29.2}/series                 | 0
 rules/util-linux-ng.make                                              | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{util-linux-2.29 => util-linux-2.29.2}/0001-__progname-redefinition-fix.patch (100%)
 rename patches/{util-linux-2.29 => util-linux-2.29.2}/series (100%)

diff --git a/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.29/series b/patches/util-linux-2.29.2/series
similarity index 100%
rename from patches/util-linux-2.29/series
rename to patches/util-linux-2.29.2/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 1682c2188..f83767e01 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
 #
 # Paths and names
 #
-UTIL_LINUX_NG_VERSION	:= 2.29
-UTIL_LINUX_NG_MD5	:= 07b6845f48a421ad5844aa9d58edb837
+UTIL_LINUX_NG_VERSION	:= 2.29.2
+UTIL_LINUX_NG_MD5	:= 63c40c2068fcbb7e1d5c1d281115d973
 UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
 UTIL_LINUX_NG_SUFFIX	:= tar.xz
 UTIL_LINUX_NG_BASENAME	:= v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
-- 
2.12.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 8/8] util-linux-ng: version bump 2.29 -> 2.29.2

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:23PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Thanks, applied,

Michael

> ---
>  .../0001-__progname-redefinition-fix.patch                            | 0
>  patches/{util-linux-2.29 => util-linux-2.29.2}/series                 | 0
>  rules/util-linux-ng.make                                              | 4 ++--
>  3 files changed, 2 insertions(+), 2 deletions(-)
>  rename patches/{util-linux-2.29 => util-linux-2.29.2}/0001-__progname-redefinition-fix.patch (100%)
>  rename patches/{util-linux-2.29 => util-linux-2.29.2}/series (100%)
> 
> diff --git a/patches/util-linux-2.29/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch
> similarity index 100%
> rename from patches/util-linux-2.29/0001-__progname-redefinition-fix.patch
> rename to patches/util-linux-2.29.2/0001-__progname-redefinition-fix.patch
> diff --git a/patches/util-linux-2.29/series b/patches/util-linux-2.29.2/series
> similarity index 100%
> rename from patches/util-linux-2.29/series
> rename to patches/util-linux-2.29.2/series
> diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
> index 1682c2188..f83767e01 100644
> --- a/rules/util-linux-ng.make
> +++ b/rules/util-linux-ng.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
>  #
>  # Paths and names
>  #
> -UTIL_LINUX_NG_VERSION	:= 2.29
> -UTIL_LINUX_NG_MD5	:= 07b6845f48a421ad5844aa9d58edb837
> +UTIL_LINUX_NG_VERSION	:= 2.29.2
> +UTIL_LINUX_NG_MD5	:= 63c40c2068fcbb7e1d5c1d281115d973
>  UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
>  UTIL_LINUX_NG_SUFFIX	:= tar.xz
>  UTIL_LINUX_NG_BASENAME	:= v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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 1/8] file: version bump 5.29 -> 5.30

[Michael Olbrich]

On Tue, Mar 28, 2017 at 11:47:16PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

Thanks, applied,

Michael

> ---
>  rules/file.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/file.make b/rules/file.make
> index c3aaae554..027486ba1 100644
> --- a/rules/file.make
> +++ b/rules/file.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
>  #
>  # Paths and names
>  #
> -FILE_VERSION	:= 5.29
> -FILE_MD5	:= b7b57b36b577c9cede2f2d1342203302
> +FILE_VERSION	:= 5.30
> +FILE_MD5	:= f35eaf05489ae566eafc4d26bb1dcd90
>  FILE		:= file-$(FILE_VERSION)
>  FILE_SUFFIX	:= tar.gz
>  FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
> -- 
> 2.12.1
> 
> 
> _______________________________________________
> 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