Skip to contentSkip to conversation

libestr: bump to version 0.1.10

PATCH New Gustavo Zacarias 2 participants 15 messages Jan 13, 2015 – Jan 14, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/7 libestr: bump to version 0.1.10

Also add hash file.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/libestr/libestr.hash | 2 ++
 package/libestr/libestr.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/libestr/libestr.hash
package/libestr/libestr.hash new file +2 -0
new file mode 100644
index 0000000..e37cbb1
@@ -0,0 +1,2 @@
+# From http://libestr.adiscon.com/download/libestr-0-1-10/
+sha256	bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c	libestr-0.1.10.tar.gz
package/libestr/libestr.mk +1 -1
index d5ff986..e9783d3 100644
@@ -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
Signature · 1 line
2.0.5
author
#1 lore raw

PATCH 2/7 liblogging: bump to version 1.0.5

Also add hash file and drop upstream patch.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 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
package/liblogging/liblogging-01-stdarg.patch deleted +0 -29
deleted file mode 100644
index 081824a..0000000
@@ -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 <[email protected]>
----
- 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 */
package/liblogging/liblogging.hash new file +2 -0
new file mode 100644
index 0000000..f5674a1
@@ -0,0 +1,2 @@
+# From http://www.liblogging.org/
+sha256	310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b	liblogging-1.0.5.tar.gz
package/liblogging/liblogging.mk +1 -1
index 2e375ad..9ef2e28 100644
@@ -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
Signature · 1 line
2.0.5
author
#2 lore raw

PATCH 3/7 rsyslog: rename sysv initscript to S01logging

In reply to Gustavo Zacarias

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

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/rsyslog/{S01rsyslog => S01logging} | 0
 package/rsyslog/rsyslog.mk                 | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename package/rsyslog/{S01rsyslog => S01logging} (100%)
package/rsyslog/S01logging renamed from package/rsyslog/S01rsyslog +0 -0
similarity index 100%
rename from package/rsyslog/S01rsyslog
rename to package/rsyslog/S01logging
package/rsyslog/rsyslog.mk +2 -2
index 688a335..27a72da 100644
@@ -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
Signature · 1 line
2.0.5
#3 lore raw

PATCH 3/7 rsyslog: rename sysv initscript to S01logging

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias

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

Signed-off-by Gustavo Zacarias <[email protected]>
---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#4 lore raw

PATCH 3/7 rsyslog: rename sysv initscript to S01logging

Quoted 10 lines · Thomas Petazzoni

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.

#5 lore raw

PATCH 3/7 rsyslog: rename sysv initscript to S01logging

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias
Quoted 2 lines

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#6 lore raw

PATCH 4/7 rsyslog: clean up sysv initscript

In reply to Gustavo Zacarias

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

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/rsyslog/S01logging | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)
package/rsyslog/S01logging +20 -21
index 0c4bbc7..97d519a 100644
@@ -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 $?
-
Signature · 1 line
2.0.5
#7 lore raw

PATCH 4/7 rsyslog: clean up sysv initscript

Dear Gustavo Zacarias,

package/rsyslog/S01logging line 5

Quoted 7 lines · Gustavo Zacarias

start() {

package/rsyslog/S01logging +2 -4
-	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 ?

package/rsyslog/S01logging line 18

Quoted 5 lines

restart() {

package/rsyslog/S01logging +2 -2
-	stop
-	start
+  stop
+  sleep 1

And this sleep 1 ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#8 lore raw

PATCH 4/7 rsyslog: clean up sysv initscript

Quoted 1 line · Thomas Petazzoni

Do we really need this umask 077 ?

Leftover, i'll kill it.

Quoted 1 line

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.

#9 lore raw

PATCH 4/7 rsyslog: clean up sysv initscript

Dear Gustavo Zacarias,

Quoted 3 lines · Gustavo Zacarias
Quoted 1 line

Do we really need this umask 077 ?

Leftover, i'll kill it.

Thanks.

Quoted 4 lines
Quoted 1 line

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#10 lore raw

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

In reply to 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 <[email protected]>
---
 package/rsyslog/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rsyslog/Config.in +2 -2
index 69425f1..1f94104 100644
@@ -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
Signature · 1 line
2.0.5
author
#11 lore raw

PATCH 6/7 rsyslog: bump to version 8.7.0

In reply to Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/rsyslog/Config.in    | 5 +++--
 package/rsyslog/rsyslog.hash | 4 ++--
 package/rsyslog/rsyslog.mk   | 8 +++-----
 3 files changed, 8 insertions(+), 9 deletions(-)
package/rsyslog/Config.in +3 -2
index 1f94104..d66132f 100644
@@ -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
package/rsyslog/rsyslog.hash +2 -2
index ed51326..4a0ae5a 100644
@@ -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
package/rsyslog/rsyslog.mk +3 -5
index 27a72da..fb5249c 100644
@@ -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)
Signature · 1 line
2.0.5
author
#12 lore raw

PATCH 7/7 rsyslog: enable more basic features

In reply to 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 <[email protected]>
---
 package/rsyslog/rsyslog.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/rsyslog/rsyslog.mk +6 -1
index fb5249c..f0e8a63 100644
@@ -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)
Signature · 1 line
2.0.5
#13 lore raw

PATCH 7/7 rsyslog: enable more basic features

Dear Gustavo Zacarias,

package/rsyslog/rsyslog.mk RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0 · line 18

Quoted 2 lines · Gustavo Zacarias
package/rsyslog/rsyslog.mk +2 -0
+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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#14 lore raw

PATCH 1/7 libestr: bump to version 0.1.10

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

Also add hash file.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 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

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