From 0a8a03d82ee21ffdf1de8bbad8dc4acb1204ad00 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Mon, 31 Dec 2018 14:17:58 +0100
Subject: [PATCH] [skip-ci] rsyslog: update to 8.40.0

---
 rsyslog/PKGBUILD       |  6 +++---
 rsyslog/rsyslog        | 39 ---------------------------------------
 rsyslog/rsyslog.conf.d |  6 ------
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 rsyslog/rsyslog
 delete mode 100644 rsyslog/rsyslog.conf.d

diff --git a/rsyslog/PKGBUILD b/rsyslog/PKGBUILD
index b18324161..5bbd37de0 100644
--- a/rsyslog/PKGBUILD
+++ b/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=rsyslog
-pkgver=8.33.1
+pkgver=8.40.0
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
-url="http://www.rsyslog.com/"
+url="https://www.rsyslog.com/"
 arch=('x86_64')
 license=('GPL3')
 depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging' 'librelp>=1.2.12' 'libfastjson>=0.99.8')
@@ -17,7 +17,7 @@ backup=('etc/rsyslog.conf'
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
         'rsyslog.logrotate'
 	'rsyslog.conf')
-sha256sums=('2da2bd773dbd5fde4eb162d5411dac96bf596b33e62a4062610443686597e3a8'
+sha256sums=('414abbdd27b65d3cd513e1a8a7ccbd110d06160759189e818ea93aca962fc194'
             '0f5bea3fd4dff2c9f097bf95768b2e1f6e9cfd9a08eab98bc3b3b4d2ed44119a'
             '5fd51665ab9a81fbb24773068cb261b8dec073d74082c121633f49b9381d9a3f')
 
diff --git a/rsyslog/rsyslog b/rsyslog/rsyslog
deleted file mode 100644
index ee0145418..000000000
--- a/rsyslog/rsyslog
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/rsyslog/rsyslog.conf.d b/rsyslog/rsyslog.conf.d
deleted file mode 100644
index fc0770666..000000000
--- a/rsyslog/rsyslog.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c6"