Merge pull request #2930 from CvH/9.0/rsyslog-up

rsyslog: update to latest
LibreELEC · Sep 13, 2018 · 2522e7b · 2522e7b
2 parents 062e3d2 + 7969d82
commit 2522e7b
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 60 deletions.
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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"
diff --git 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
@@ -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
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
    <category   label="30000">
-      <setting label="30001" type="bool"      id="RSYSLOG_MANUAL"                                              default="true" />
-      <setting label="30002" type="text"      id="RSYSLOG_IP_NAME_FQDN"                                                         visible="eq(-1,false)" />
+      <setting label="30001" type="bool"      id="RSYSLOG_MANUAL"                                              default="false" />
+      <setting label="30002" type="text"      id="RSYSLOG_IP_NAME_FQDN"                                        default=""       visible="eq(-1,false)" />
       <setting label="30003" type="number"    id="RSYSLOG_PORT"                                                default="514"    visible="eq(-2,false)" />
-      <setting label="30004" type="labelenum" id="RSYSLOG_PROTOCOL"               lvalues="UDP|TCP|RELP"                        visible="eq(-3,false)" />
+      <setting label="30004" type="labelenum" id="RSYSLOG_PROTOCOL"               values="UDP|TCP|RELP"        default="UDP"    visible="eq(-3,false)" />
       <setting label="30005" type="bool"      id="RSYSLOG_JOURNAL_LOGGING"                                     default="false"  visible="eq(-4,false)" />
       <setting label="30006" type="bool"      id="RSYSLOG_KODI_LOGGING"                                        default="true"   visible="eq(-5,false)" />
       <setting label="30007" type="bool"      id="RSYSLOG_ZLIB_COMPRESSION"                                    default="false"  visible="eq(-6,false)+!eq(-3,2)" />

diff --git a/packages/addons/service/rsyslog/source/settings-default.xml b/packages/addons/service/rsyslog/source/settings-default.xml
@@ -1,11 +1,11 @@
-<settings>
-   <setting id="RSYSLOG_IP_NAME_FQDN" value=""/>
-   <setting id="RSYSLOG_JOURNAL_LOGGING" value="false"/>
-   <setting id="RSYSLOG_KODI_LOGGING" value="true"/>
-   <setting id="RSYSLOG_MANUAL" value="false"/>
-   <setting id="RSYSLOG_PORT" value="514"/>
-   <setting id="RSYSLOG_PROTOCOL" value="UDP"/>
-   <setting id="RSYSLOG_WIZARD" value="true"/>
-   <setting id="RSYSLOG_ZLIB_COMPRESSION" value="false" />
-   <setting id="RSYSLOG_ZLIB_COMPRESSION_LEVEL" value="0" />
+<settings version="2">
+    <setting id="RSYSLOG_IP_NAME_FQDN" default="true"></setting>
+    <setting id="RSYSLOG_JOURNAL_LOGGING" default="true">false</setting>
+    <setting id="RSYSLOG_KODI_LOGGING">true</setting>
+    <setting id="RSYSLOG_MANUAL" default="true">false</setting>
+    <setting id="RSYSLOG_PORT">514</setting>
+    <setting id="RSYSLOG_PROTOCOL" default="true">UDP</setting>
+    <setting id="RSYSLOG_WIZARD" default="true">false</setting>
+    <setting id="RSYSLOG_ZLIB_COMPRESSION" default="true">false</setting>
+    <setting id="RSYSLOG_ZLIB_COMPRESSION_LEVEL" default="true">0</setting>
 </settings>