From 7969d8273e6d110a49aef332ff5fa10efe2cef86 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Tue, 11 Sep 2018 12:52:15 +0200
Subject: [PATCH] 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 4f7534df67..82b2d78c6e 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
 
-8.0.101
+103
+- Rebuild
+
+102
+- Add first run wizard configuration menu
+
+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 3709025749..8ddc6a0b80 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 e740cc15b4..7c1b5ad451 100644
--- 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
index 6160c557fb..c7037f0acd 100644
--- 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>