[Buildroot] [PATCH 1/7] libestr: bump to version 0.1.10

[Buildroot] [PATCH 1/7] libestr: bump to version 0.1.10

[Gustavo Zacarias]

Also add hash file.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libestr/libestr.hash | 2 ++
 package/libestr/libestr.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/libestr/libestr.hash

diff --git a/package/libestr/libestr.hash b/package/libestr/libestr.hash
new file mode 100644
index 0000000..e37cbb1
--- /dev/null
+++ b/package/libestr/libestr.hash
@@ -0,0 +1,2 @@
+# From http://libestr.adiscon.com/download/libestr-0-1-10/
+sha256	bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c	libestr-0.1.10.tar.gz
diff --git a/package/libestr/libestr.mk b/package/libestr/libestr.mk
index d5ff986..e9783d3 100644
--- a/package/libestr/libestr.mk
+++ b/package/libestr/libestr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBESTR_VERSION = 0.1.9
+LIBESTR_VERSION = 0.1.10
 LIBESTR_SITE = http://libestr.adiscon.com/files/download
 LIBESTR_LICENSE = LGPLv2.1+
 LIBESTR_LICENSE_FILES = COPYING
-- 
2.0.5

[Buildroot] [PATCH 2/7] liblogging: bump to version 1.0.5

[Gustavo Zacarias]

Also add hash file and drop upstream patch.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/liblogging/liblogging-01-stdarg.patch | 29 ---------------------------
 package/liblogging/liblogging.hash            |  2 ++
 package/liblogging/liblogging.mk              |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 package/liblogging/liblogging-01-stdarg.patch
 create mode 100644 package/liblogging/liblogging.hash

diff --git a/package/liblogging/liblogging-01-stdarg.patch b/package/liblogging/liblogging-01-stdarg.patch
deleted file mode 100644
index 081824a..0000000
--- a/package/liblogging/liblogging-01-stdarg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[PATCH] stdlog: va_list needs stdarg.h
-
-Otherwise we get compilation errors like:
-
-In file included from stdlogctl.c:32:0:
-stdlog.h:80:75: error: unknown type name 'va_list'
-In file included from stdlogctl.c:32:0:
-stdlog.h:81:131: error: unknown type name 'va_list'
-
-Simplified version of upstream fix:
-https://github.com/rsyslog/liblogging/commit/3bf42ae392c1a317f09711846ea1c7072ef45634
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- stdlog/stdlog.h |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: liblogging-1.0.2/stdlog/stdlog.h
-===================================================================
---- liblogging-1.0.2.orig/stdlog/stdlog.h
-+++ liblogging-1.0.2/stdlog/stdlog.h
-@@ -28,6 +28,7 @@
- #ifndef LIBLOGGING_STDLOG_H_INCLUDED
- #define LIBLOGGING_STDLOG_H_INCLUDED
- #include <stdint.h>
-+#include <stdarg.h>
- 
- /* options for stdlog_open() call */
- #define STDLOG_SIGSAFE 1	/* enforce signal-safe implementation */
diff --git a/package/liblogging/liblogging.hash b/package/liblogging/liblogging.hash
new file mode 100644
index 0000000..f5674a1
--- /dev/null
+++ b/package/liblogging/liblogging.hash
@@ -0,0 +1,2 @@
+# From http://www.liblogging.org/
+sha256	310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b	liblogging-1.0.5.tar.gz
diff --git a/package/liblogging/liblogging.mk b/package/liblogging/liblogging.mk
index 2e375ad..9ef2e28 100644
--- a/package/liblogging/liblogging.mk
+++ b/package/liblogging/liblogging.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBLOGGING_VERSION = 1.0.2
+LIBLOGGING_VERSION = 1.0.5
 LIBLOGGING_SITE = http://download.rsyslog.com/liblogging
 LIBLOGGING_LICENSE = BSD-2c
 LIBLOGGING_LICENSE_FILES = COPYING
-- 
2.0.5

[Buildroot] [PATCH 3/7] rsyslog: rename sysv initscript to S01logging

[Gustavo Zacarias]

Do it to avoid having duplicate and conflicting functionality with
busybox's S01logging.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rsyslog/{S01rsyslog => S01logging} | 0
 package/rsyslog/rsyslog.mk                 | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename package/rsyslog/{S01rsyslog => S01logging} (100%)

diff --git a/package/rsyslog/S01rsyslog b/package/rsyslog/S01logging
similarity index 100%
rename from package/rsyslog/S01rsyslog
rename to package/rsyslog/S01logging
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 688a335..27a72da 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -39,8 +39,8 @@ else
 endif
 
 define RSYSLOG_INSTALL_INIT_SYSV
-	$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
-		$(TARGET_DIR)/etc/init.d/S01rsyslog
+	$(INSTALL) -m 0755 -D package/rsyslog/S01logging \
+		$(TARGET_DIR)/etc/init.d/S01logging
 endef
 
 define RSYSLOG_INSTALL_INIT_SYSTEMD
-- 
2.0.5

[Buildroot] [PATCH 3/7] rsyslog: rename sysv initscript to S01logging

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 13 Jan 2015 20:16:58 -0300, Gustavo Zacarias wrote:
> Do it to avoid having duplicate and conflicting functionality with
> busybox's S01logging.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/rsyslog/{S01rsyslog => S01logging} | 0
>  package/rsyslog/rsyslog.mk                 | 4 ++--
>  2 files changed, 2 insertions(+), 2 deletions(-)
>  rename package/rsyslog/{S01rsyslog => S01logging} (100%)

To be honest, I wasn't really sure whether the right approach to handle
this issue was to rename the init script as you did, or to have rsyslog
explicitly remove S01logging when Busybox is enabled.

Since the rest of patch series was doing some cleanup on the renamed
S01logging, I decided to take your approach, but I must say I wasn't
entirely sure on how to handle this.

Comments from others are welcome, I don't consider the proposed
solution to be set in stone.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/7] rsyslog: rename sysv initscript to S01logging

[Gustavo Zacarias]

On 01/14/2015 04:30 PM, Thomas Petazzoni wrote:
> To be honest, I wasn't really sure whether the right approach to handle
> this issue was to rename the init script as you did, or to have rsyslog
> explicitly remove S01logging when Busybox is enabled.
> 
> Since the rest of patch series was doing some cleanup on the renamed
> S01logging, I decided to take your approach, but I must say I wasn't
> entirely sure on how to handle this.
> 
> Comments from others are welcome, I don't consider the proposed
> solution to be set in stone.

It's the best deterministic option we've got, rsyslog builds after
busybox (famous dependency trickery) but then again there's no clear
winner with sysklogd (the default shell dilemma).
We could throw an option for logger, but i think that would be crowding
things a little.
I'm not opposed to it or other solutions though.
Regards.

[Buildroot] [PATCH 3/7] rsyslog: rename sysv initscript to S01logging

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Wed, 14 Jan 2015 16:33:58 -0300, Gustavo Zacarias wrote:

> > Comments from others are welcome, I don't consider the proposed
> > solution to be set in stone.
> 
> It's the best deterministic option we've got, rsyslog builds after
> busybox (famous dependency trickery) but then again there's no clear
> winner with sysklogd (the default shell dilemma).
> We could throw an option for logger, but i think that would be crowding
> things a little.
> I'm not opposed to it or other solutions though.

Yeah, I agree, there's no immediately perfect solution that comes to
mind. Maybe we don't want to handle too much of these issues, and leave
it to the user to realize that building both rsyslog and syslogd is
stupid.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/7] rsyslog: clean up sysv initscript

[Gustavo Zacarias]

Fix indentation, remove redundant comment, print real start/stop status.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rsyslog/S01logging | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/package/rsyslog/S01logging b/package/rsyslog/S01logging
index 0c4bbc7..97d519a 100644
--- a/package/rsyslog/S01logging
+++ b/package/rsyslog/S01logging
@@ -1,38 +1,37 @@
 #!/bin/sh
-#
-# Starts rsyslog.
-#
 
 start() {
-	echo -n "Starting rsyslog daemon: "
-	umask 077
-	start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
-	echo "OK"
+  echo -n "Starting rsyslog daemon: "
+  umask 077
+  start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
+  [ $? = 0 ] && echo "OK" || echo "FAIL"
 }
+
 stop() {
-	echo -n "Stopping rsyslog daemon: "
-	start-stop-daemon -K -q -p /var/run/rsyslogd.pid
-	echo "OK"
+  echo -n "Stopping rsyslog daemon: "
+  start-stop-daemon -K -q -p /var/run/rsyslogd.pid
+  [ $? = 0 ] && echo "OK" || echo "FAIL"
 }
+
 restart() {
-	stop
-	start
+  stop
+  sleep 1
+  start
 }
 
 case "$1" in
   start)
-	start
-	;;
+    start
+    ;;
   stop)
-	stop
-	;;
+    stop
+    ;;
   restart|reload)
-	restart
-	;;
+    restart
+    ;;
   *)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
 esac
 
 exit $?
-
-- 
2.0.5

[Buildroot] [PATCH 4/7] rsyslog: clean up sysv initscript

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 13 Jan 2015 20:16:59 -0300, Gustavo Zacarias wrote:

>  start() {
> -	echo -n "Starting rsyslog daemon: "
> -	umask 077
> -	start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd
> -	echo "OK"
> +  echo -n "Starting rsyslog daemon: "
> +  umask 077

Do we really need this umask 077 ?

>  restart() {
> -	stop
> -	start
> +  stop
> +  sleep 1

And this sleep 1 ?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 4/7] rsyslog: clean up sysv initscript

[Gustavo Zacarias]

On 01/14/2015 04:31 PM, Thomas Petazzoni wrote:

> Do we really need this umask 077 ?

Leftover, i'll kill it.

> And this sleep 1 ?

Unfortunately yes, it seems rsyslogd doesn't exit immediately from the
tests i've made, otherwise i got restart problems in very few cases.
Regards.

[Buildroot] [PATCH 4/7] rsyslog: clean up sysv initscript

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Wed, 14 Jan 2015 16:35:46 -0300, Gustavo Zacarias wrote:

> > Do we really need this umask 077 ?
> 
> Leftover, i'll kill it.

Thanks.

> > And this sleep 1 ?
> 
> Unfortunately yes, it seems rsyslogd doesn't exit immediately from the
> tests i've made, otherwise i got restart problems in very few cases.

Argh, I hate this. But OK :)

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 5/7] rsyslog: doesn't need largefile/wchar

[Gustavo Zacarias]

This was added in 9b4696a4 but only partially removed in d89a2610
leading to a comment and the rsyslog option both being present in the
config menu if we're using a non-LFS toolchain.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rsyslog/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 69425f1..1f94104 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -11,6 +11,6 @@ config BR2_PACKAGE_RSYSLOG
 
 	  http://www.rsyslog.com
 
-comment "rsyslog needs a toolchain w/ largefile, wchar, threads"
+comment "rsyslog needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
-- 
2.0.5

[Buildroot] [PATCH 6/7] rsyslog: bump to version 8.7.0

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rsyslog/Config.in    | 5 +++--
 package/rsyslog/rsyslog.hash | 4 ++--
 package/rsyslog/rsyslog.mk   | 8 +++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 1f94104..d66132f 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -6,11 +6,12 @@ config BR2_PACKAGE_RSYSLOG
 	select BR2_PACKAGE_JSON_C
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # modules
 	help
 	  Rsyslog is a powerful and flexible syslog implementation
 
 	  http://www.rsyslog.com
 
-comment "rsyslog needs a toolchain w/ threads"
+comment "rsyslog needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash
index ed51326..4a0ae5a 100644
--- a/package/rsyslog/rsyslog.hash
+++ b/package/rsyslog/rsyslog.hash
@@ -1,2 +1,2 @@
-# From http://www.rsyslog.com/downloads/download-v7-stable/
-sha256	fc29d2d9cbf3396091dd0bab2eb6f847aed4a44ef73138a97ddf9447446125ee	rsyslog-7.6.7.tar.gz
+# From http://www.rsyslog.com/downloads/download-v8-stable/
+sha256	c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c	rsyslog-8.7.0.tar.gz
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 27a72da..fb5249c 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-RSYSLOG_VERSION = 7.6.7
+RSYSLOG_VERSION = 8.7.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
 RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0
 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
 RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf
-
-RSYSLOG_CONF_OPTS = --disable-testbench \
-		   --enable-cached-man-pages \
-		   --disable-generate-man-pages
+RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
+RSYSLOG_CONF_OPTS = --disable-generate-man-pages
 
 # Build after BusyBox
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-- 
2.0.5

[Buildroot] [PATCH 7/7] rsyslog: enable more basic features

[Gustavo Zacarias]

Enable all of the basic modules that don't require any dependencies.
Reasoning is simple, if someone wants rsyslog over a smaller busybox
logger or sysklogd it's probably looking for features.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rsyslog/rsyslog.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index fb5249c..f0e8a63 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -10,7 +10,12 @@ RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0
 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
 RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf
 RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
-RSYSLOG_CONF_OPTS = --disable-generate-man-pages
+RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
+	mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \
+	mail omprog omruleset omstdout omuxsock \
+	pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare
+RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
+		$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))
 
 # Build after BusyBox
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-- 
2.0.5

[Buildroot] [PATCH 7/7] rsyslog: enable more basic features

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 13 Jan 2015 20:17:02 -0300, Gustavo Zacarias wrote:

> +RSYSLOG_CONF_OPTS = --disable-generate-man-pages \
> +		$(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x))

Only one tab on the second line. I fixed that when applying.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/7] libestr: bump to version 0.1.10

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 13 Jan 2015 20:16:56 -0300, Gustavo Zacarias wrote:
> Also add hash file.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/libestr/libestr.hash | 2 ++
>  package/libestr/libestr.mk   | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>  create mode 100644 package/libestr/libestr.hash

I've applied the entire patch series, but I'll make a few comments on
certain patches.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com