From b1c0e9a516ef3ef5e9cb99870754fe6b9b121ecc Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:14 +0200 Subject: [PATCH 1/6] libestr: cleanup package --- .../rsyslog-depends/libestr/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk index ad063260d1c..467b9bab914 100644 --- a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk @@ -3,16 +3,16 @@ PKG_NAME="libestr" PKG_VERSION="0.1.10" -PKG_SHA256="bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c" +PKG_SHA256="e8756b071540314abef25c044f893d6b5d249e46709329a4b3e7361403c29a1e" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://libestr.adiscon.com/" -PKG_URL="http://libestr.adiscon.com/files/download/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="http://libestr.adiscon.com" +PKG_URL="https://github.com/rsyslog/libestr/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="rsyslog" -PKG_SHORTDESC="libestr: some essentials for string handling (and a bit more)" -PKG_LONGDESC="libestr: some essentials for string handling (and a bit more)" +PKG_TOOLCHAIN="autotools" +PKG_LONGDESC="some essentials for string handling (and a bit more)" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --disable-shared \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" From df61b5476ef2c0297f270a17dbfeb5298c80ada9 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:14 +0200 Subject: [PATCH 2/6] libfastjson: update to 0.99.8 --- .../rsyslog-depends/libfastjson/package.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk index 6cb1323437a..ae80cb08972 100644 --- a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk @@ -2,17 +2,16 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libfastjson" -PKG_VERSION="0.99.0" -PKG_SHA256="5d19c39daaedfd9b335f6222b521e7529016bc11382cccebe41a9894d4ab32fd" +PKG_VERSION="0.99.8" +PKG_SHA256="3544c757668b4a257825b3cbc26f800f59ef3c1ff2a260f40f96b48ab1d59e07" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.rsyslog.com/tag/libfastjson/" +PKG_SITE="http://www.rsyslog.com/tag/libfastjson" PKG_URL="http://download.rsyslog.com/libfastjson/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="rsyslog" -PKG_SHORTDESC="libfastjson" -PKG_LONGDESC="libfastjson" +PKG_LONGDESC="a fast json library for C" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --disable-shared \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" From 0e8f8b4ad99c1a6f7669dad3342d2f1ba2e1cde9 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:14 +0200 Subject: [PATCH 3/6] liblogging: update to 1.0.6 --- .../rsyslog-depends/liblogging/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk index 48820276607..d45d9593b2d 100644 --- a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk @@ -2,17 +2,17 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="liblogging" -PKG_VERSION="1.0.5" -PKG_SHA256="310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b" +PKG_VERSION="1.0.6" +PKG_SHA256="338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.liblogging.org/" +PKG_SITE="http://www.liblogging.org" PKG_URL="http://download.rsyslog.com/liblogging/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain systemd" -PKG_SHORTDESC="liblogging" -PKG_LONGDESC="liblogging" +PKG_LONGDESC="an easy to use and lightweight signal-safe logging library" -PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages \ - --enable-static --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --disable-shared \ + --disable-man-pages \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" From a6506aa9913257d7088321b3d3bc4d946a8288b4 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:14 +0200 Subject: [PATCH 4/6] liblognorm: update to 2.0.5 --- .../rsyslog-depends/liblognorm/package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk index 9c8d24718ce..f29939ce502 100644 --- a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk @@ -2,17 +2,17 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="liblognorm" -PKG_VERSION="2.0.1" -PKG_SHA256="6a7fda0da2791a87c808fbfde1af20e6463e3ff73496aae7756e3440f3bc5b75" +PKG_VERSION="2.0.5" +PKG_SHA256="dd779b6992de37995555e1d54caf0716a694765efc65480eed2c713105ab46fe" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.liblognorm.com/" -PKG_URL="http://www.liblognorm.com/files/download/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="http://www.liblognorm.com" +PKG_URL="https://github.com/rsyslog/liblognorm/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="rsyslog" -PKG_SHORTDESC="liblognorm" -PKG_LONGDESC="liblognorm" +PKG_TOOLCHAIN="autotools" +PKG_LONGDESC="a fast samples-based log normalization library" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --disable-shared \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" From c421e73bcb2b57bddc842e857742aec8d199863f Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:15 +0200 Subject: [PATCH 5/6] librelp: update to 1.2.17 --- .../rsyslog-depends/librelp/package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk index 540380be2b3..42032a2f458 100644 --- a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk @@ -2,19 +2,19 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librelp" -PKG_VERSION="1.2.12" -PKG_SHA256="0355730524f7b20bed1b85697296b6ce57ac593ddc8dddcdca263da71dee7bd7" +PKG_VERSION="1.2.17" +PKG_SHA256="1bf88b9decdbcaf06454ea1362455aa5ceccbcce282f07a4dc95e6911da4cbf0" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.librelp.com/" +PKG_SITE="http://www.librelp.com" PKG_URL="http://download.rsyslog.com/librelp/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_SECTION="rsyslog" -PKG_SHORTDESC="librelp" -PKG_LONGDESC="librelp" +PKG_LONGDESC="provides reliable event logging over the network" +PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="+pic" -PKG_CONFIGURE_OPTS_TARGET="--disable-tls \ - --enable-static --disable-shared \ +PKG_CONFIGURE_OPTS_TARGET="--enable-static \ + --disable-shared \ + --disable-tls \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" From 7969d8273e6d110a49aef332ff5fa10efe2cef86 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 11 Sep 2018 12:52:15 +0200 Subject: [PATCH 6/6] rsyslog: update to 8.37.0 --- packages/addons/service/rsyslog/changelog.txt | 16 ++++++++++----- packages/addons/service/rsyslog/package.mk | 11 +++++----- .../rsyslog/source/resources/settings.xml | 6 +++--- .../rsyslog/source/settings-default.xml | 20 +++++++++---------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/packages/addons/service/rsyslog/changelog.txt b/packages/addons/service/rsyslog/changelog.txt index 4f7534df678..82b2d78c6ee 100755 --- a/packages/addons/service/rsyslog/changelog.txt +++ b/packages/addons/service/rsyslog/changelog.txt @@ -1,10 +1,16 @@ -8.0.100 -- Initial addon +104 +- Update to 8.37.0 + +103 +- Rebuild + +102 +- Add first run wizard configuration menu -8.0.101 +101 - Add RELP Protocol - Add ability to compress messages using TCP/UDP protocols - Update configuration files using newer standards -8.0.102 -- Add first run wizard configuration menu +100 +- Initial addon diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk index 37090257490..8ddc6a0b80f 100644 --- a/packages/addons/service/rsyslog/package.mk +++ b/packages/addons/service/rsyslog/package.mk @@ -2,14 +2,14 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rsyslog" -PKG_VERSION="8.21.0" -PKG_SHA256="bdb1fde87b75107b58d1cd5d00408822fb15b9f3efb8d9dbb93a1dee128339ab" -PKG_REV="103" +PKG_VERSION="8.37.0" +PKG_SHA256="295c289b4c8abd8f8f3fe35a83249b739cedabe82721702b910255f9faf147e7" +PKG_REV="104" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rsyslog" PKG_URL="http://www.rsyslog.com/files/download/rsyslog/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain util-linux libestr libfastjson liblognorm librelp zlib libgcrypt liblogging" +PKG_DEPENDS_TARGET="toolchain curl libestr libfastjson libgcrypt liblogging liblognorm librelp util-linux zlib" PKG_SECTION="service" PKG_SHORTDESC="Rsyslog: a rocket-fast system for log processing." PKG_LONGDESC="Rsyslog ($PKG_VERSION) offers high-performance, great security features and a modular design." @@ -18,7 +18,8 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="Rsyslog" PKG_ADDON_TYPE="xbmc.service" -PKG_CONFIGURE_OPTS_TARGET="--enable-imfile \ +PKG_CONFIGURE_OPTS_TARGET="--disable-default-tests \ + --enable-imfile \ --enable-imjournal \ --enable-relp \ --enable-omjournal \ diff --git a/packages/addons/service/rsyslog/source/resources/settings.xml b/packages/addons/service/rsyslog/source/resources/settings.xml index e740cc15b49..7c1b5ad451f 100644 --- a/packages/addons/service/rsyslog/source/resources/settings.xml +++ b/packages/addons/service/rsyslog/source/resources/settings.xml @@ -1,10 +1,10 @@ - - + + - + diff --git a/packages/addons/service/rsyslog/source/settings-default.xml b/packages/addons/service/rsyslog/source/settings-default.xml index 6160c557fbc..c7037f0acd2 100644 --- a/packages/addons/service/rsyslog/source/settings-default.xml +++ b/packages/addons/service/rsyslog/source/settings-default.xml @@ -1,11 +1,11 @@ - - - - - - - - - - + + + false + true + false + 514 + UDP + false + false + 0