[Buildroot] [PATCH 1/3] libfastjson: new package

[Buildroot] [PATCH 1/3] libfastjson: new package

[Peter Korsgaard]

Libfastjson is a fork of json-c, and a dependency of newer versions of
rsyslog.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/Config.in                    |  1 +
 package/libfastjson/Config.in        | 16 ++++++++++++++++
 package/libfastjson/libfastjson.hash |  2 ++
 package/libfastjson/libfastjson.mk   | 15 +++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 package/libfastjson/Config.in
 create mode 100644 package/libfastjson/libfastjson.hash
 create mode 100644 package/libfastjson/libfastjson.mk

diff --git a/package/Config.in b/package/Config.in
index ff08f27..0431dec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1059,6 +1059,7 @@ menu "JSON/XML"
 	source "package/json-c/Config.in"
 	source "package/json-glib/Config.in"
 	source "package/jsoncpp/Config.in"
+	source "package/libfastjson/Config.in"
 	source "package/libjson/Config.in"
 	source "package/libroxml/Config.in"
 	source "package/libucl/Config.in"
diff --git a/package/libfastjson/Config.in b/package/libfastjson/Config.in
new file mode 100644
index 0000000..5a94113
--- /dev/null
+++ b/package/libfastjson/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBFASTJSON
+	bool "libfastjson"
+	# uses __sync_val_compare_and_swap_4
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	help
+	  Libfastjson - A fast json library for C
+
+	  Libfastjson is a fork from json-c. The aim of this project
+	  is not to provide a slightly modified clone of json-c.
+	  Its aim is to provide:
+
+	  - a small library with essential json handling functions
+	  - sufficiently good json support (not 100% standards compliant)
+	  - be very fast in processing
+
+	  https://github.com/rsyslog/libfastjson/
diff --git a/package/libfastjson/libfastjson.hash b/package/libfastjson/libfastjson.hash
new file mode 100644
index 0000000..8531dac
--- /dev/null
+++ b/package/libfastjson/libfastjson.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  fcdca0c4702362de3db3f02c8da05f985b54a9eccd618af41730409b75d10a8f  libfastjson-v0.99.2.tar.gz
diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk
new file mode 100644
index 0000000..ec5390c
--- /dev/null
+++ b/package/libfastjson/libfastjson.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libfastjson
+#
+################################################################################
+
+LIBFASTJSON_VERSION = v0.99.2
+LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,$(LIBFASTJSON_VERSION))
+LIBFASTJSON_INSTALL_STAGING = YES
+# From git
+LIBFASTJSON_AUTORECONF = YES
+LIBFASTJSON_LICENSE = MIT
+LIBFASTJSON_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
-- 
2.7.0

[Buildroot] [PATCH 2/3] rsyslog: bump version to 8.19.0

[Peter Korsgaard]

And drop patch now upstream. Rsyslog now uses libfastjson instead of json-c,
so adjust dependencies.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rsyslog/0001-musl-fcntl-h.patch | 30 ------------------------------
 package/rsyslog/Config.in               |  4 ++--
 package/rsyslog/rsyslog.hash            |  2 +-
 package/rsyslog/rsyslog.mk              |  4 ++--
 4 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 package/rsyslog/0001-musl-fcntl-h.patch

diff --git a/package/rsyslog/0001-musl-fcntl-h.patch b/package/rsyslog/0001-musl-fcntl-h.patch
deleted file mode 100644
index 5c2daee..0000000
--- a/package/rsyslog/0001-musl-fcntl-h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 835571774dc519dd2cff7ab1020cf298cc953a8f Mon Sep 17 00:00:00 2001
-From: Thordur Bjornsson <thorduri@secnorth.net>
-Date: Tue, 7 Jul 2015 12:34:08 +0200
-Subject: [PATCH] omfile: unconditionally include fcntl.h.
-
-required for open() flags
-
-Signed-off-by: Thordur Bjornsson <thorduri@secnorth.net>
-[Bernd: downloaded from upstream commit:
- https://github.com/rsyslog/rsyslog/commit/835571774dc519dd2cff7ab1020cf298cc953a8f
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- tools/omfile.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/tools/omfile.c b/tools/omfile.c
-index 482e723..4444b97 100644
---- a/tools/omfile.c
-+++ b/tools/omfile.c
-@@ -48,9 +48,7 @@
- #include <libgen.h>
- #include <unistd.h>
- #include <sys/file.h>
--#ifdef OS_SOLARIS
--#	include <fcntl.h>
--#endif
-+#include <fcntl.h>
- #ifdef HAVE_ATOMIC_BUILTINS
- #	include <pthread.h>
- #endif
diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in
index 3599207..241ee2e 100644
--- a/package/rsyslog/Config.in
+++ b/package/rsyslog/Config.in
@@ -3,11 +3,11 @@ config BR2_PACKAGE_RSYSLOG
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBESTR
 	select BR2_PACKAGE_LIBLOGGING
-	select BR2_PACKAGE_JSON_C
+	select BR2_PACKAGE_LIBFASTJSON
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS # modules
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libfastjson
 	help
 	  Rsyslog is a powerful and flexible syslog implementation
 
diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash
index 5f9e0ed..7dc341a 100644
--- a/package/rsyslog/rsyslog.hash
+++ b/package/rsyslog/rsyslog.hash
@@ -1,2 +1,2 @@
 # From http://www.rsyslog.com/downloads/download-v8-stable/
-sha256	eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc	rsyslog-8.9.0.tar.gz
+sha256	3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e	rsyslog-8.19.0.tar.gz
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 5dde924..40e3b33 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-RSYSLOG_VERSION = 8.9.0
+RSYSLOG_VERSION = 8.19.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_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
 RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
 RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \
 	mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \
-- 
2.7.0

[Buildroot] [PATCH 3/3] rsyslog: add optional gnutls support

[Peter Korsgaard]

From: Adrien Decostre <ad.decostre@gmail.com>

[Peter: drop explicit option and handle like other dependencies]
Signed-off-by: Adrien Decostre <ad.decostre@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/rsyslog/rsyslog.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 40e3b33..18a5737 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -22,6 +22,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 RSYSLOG_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+RSYSLOG_DEPENDENCIES += gnutls
+RSYSLOG_CONF_OPTS += --enable-gnutls
+else
+RSYSLOG_CONF_OPTS += --disable-gnutls
+endif
+
 ifeq ($(BR2_PACKAGE_LIBEE),y)
 RSYSLOG_DEPENDENCIES += libee
 endif
-- 
2.7.0

[Buildroot] [PATCH 1/3] libfastjson: new package

[Thomas Petazzoni]

Hello,

On Wed, 15 Jun 2016 15:17:46 +0200, Peter Korsgaard wrote:
> Libfastjson is a fork of json-c, and a dependency of newer versions of
> rsyslog.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/Config.in                    |  1 +
>  package/libfastjson/Config.in        | 16 ++++++++++++++++
>  package/libfastjson/libfastjson.hash |  2 ++
>  package/libfastjson/libfastjson.mk   | 15 +++++++++++++++
>  4 files changed, 34 insertions(+)
>  create mode 100644 package/libfastjson/Config.in
>  create mode 100644 package/libfastjson/libfastjson.hash
>  create mode 100644 package/libfastjson/libfastjson.mk

Series applied, thanks!

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