rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bsp/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch Normal file
View File

@@ -0,0 +1,39 @@
From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Mon, 11 Dec 2017 15:46:06 +0100
Subject: [PATCH] modules/json: Adaptions for json-c v0.13
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Patch status: upstream commit 1b824dd6389e
modules/json/json-parser.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
index 0368ed8f7ffe..356df48b9fc7 100644
--- a/modules/json/json-parser.c
+++ b/modules/json/json-parser.c
@@ -20,6 +20,8 @@
* COPYING for details.
*/
+#define JSON_C_VER_013 (13 << 8)
+
#include "json-parser.h"
#include "dot-notation.h"
#include "scratch-buffers.h"
@@ -28,7 +30,10 @@
#include <ctype.h>
#include <json.h>
+
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
#include <json_object_private.h>
+#endif
typedef struct _JSONParser
{
--
2.15.1

8
bsp/buildroot/package/syslog-ng/Config.in
View File

@@ -1,13 +1,13 @@
config BR2_PACKAGE_SYSLOG_NG
bool "syslog-ng"
select BR2_PACKAGE_EVENTLOG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_OPENSSL
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
select BR2_PACKAGE_EVENTLOG
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_OPENSSL
help
syslog-ng is an enhanced log daemon, supporting a wide range
of input and output methods: syslog, unstructured text,

2
bsp/buildroot/package/syslog-ng/syslog-ng.conf
View File

@@ -1,4 +1,4 @@
@version: 3.9
@version: 3.10
source s_sys {
file("/proc/kmsg" program_override("kernel"));

2
bsp/buildroot/package/syslog-ng/syslog-ng.hash
View File

@@ -1,2 +1,2 @@
# Locally computed
sha256 5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17 syslog-ng-3.9.1.tar.gz
sha256 a905fe7bad09dcf40bf03650ef1c287b511bf262d004464b8993a28ce58c9136 syslog-ng-3.10.1.tar.gz

12
bsp/buildroot/package/syslog-ng/syslog-ng.mk
View File

@@ -4,16 +4,18 @@
#
################################################################################
SYSLOG_NG_VERSION = 3.9.1
# When updating the version, please check at runtime if the version in
# syslog-ng.conf header needs to be updated
SYSLOG_NG_VERSION = 3.10.1
SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPLv2+ (modules)
SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING
SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
eventlog libglib2 openssl pcre
# rabbit-mq needs -lrt
SYSLOG_NG_CONF_ENV = LIBS=-lrt
SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
--disable-java --disable-java-modules
--disable-java --disable-java-modules --disable-mongodb
# We override busybox's S01logging init script
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -71,7 +73,9 @@ endif
ifeq ($(BR2_PACKAGE_LIBNET),y)
SYSLOG_NG_DEPENDENCIES += libnet
SYSLOG_NG_CONF_OPTS += --enable-spoof-source
SYSLOG_NG_CONF_OPTS += \
--with-libnet=$(STAGING_DIR)/usr/bin \
--enable-spoof-source
else
SYSLOG_NG_CONF_OPTS += --disable-spoof-source
endif