4 files changed, 22 insertions, 13 deletions
diff --git a/system/rsyslog/README b/system/rsyslog/README
index 52f70523ee..89601b1dac 100644
--- a/system/rsyslog/README
+++ b/system/rsyslog/README
@@ -19,5 +19,3 @@ PGSQL=yes|no (default: no), requires postgresql
 RELP=yes|no (default: no), requires librelp
 LIBDBI=yes|no (default: no), requires libdbi
 GNUTLS=yes|no (default: no), requires gnutls
-
-NOTE: docutils is only needed at compile time - not needed for runtime.
diff --git a/system/rsyslog/README.SLACKWARE b/system/rsyslog/README.SLACKWARE
index b4bdd4ae4d..0eb1f04ccb 100644
--- a/system/rsyslog/README.SLACKWARE
+++ b/system/rsyslog/README.SLACKWARE
@@ -21,3 +21,6 @@ proper format, which was converted from sysklogd's syslog.conf.
 /etc/rc.d/rc.rsyslogd is written to emulate syslogd.  To prevent rc.inet1
 from attempting to run rc.syslog again, rc.syslogd will copy/remove the
 /var/run/syslogd.pid file on successful start/stop invocations.
+
+Be aware that xscanimage, xcam and xscanimage from the sane package depend
+from sysklogd and therefore will not work after replacement with rsyslog.
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
index 907527f5ae..011377525b 100644
--- a/system/rsyslog/rsyslog.SlackBuild
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rsyslog
 
-# Copyright (c) 2019, Christophe Trussardi, Paris, France
+# Copyright (c) 2024, Christophe Trussardi, Paris, France
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -21,10 +21,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rsyslog
-VERSION=${VERSION:-8.2001.0}
+VERSION=${VERSION:-8.2312.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,6 +65,7 @@ fi
 [ "${LIBDBI:-no}" = "no" ] || libdbi_option="--enable-libdbi"
 [ "${GNUTLS:-no}" = "no" ] || gnutls_option="--enable-gnutls"
 [ "${RELP:-no}" = "no" ] || relp_option="--enable-relp"
+[ "${LIBLOGGING:-no}" = "no" ] || liblogging_option="--enable-liblogging-stdlog"
 
 set -e
 
@@ -85,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-generate-man-pages \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option
+  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option $liblogging_option
 
 make
 make install-strip DESTDIR=$PKG
@@ -109,7 +117,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README \
+  AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 chmod -R 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -120,4 +128,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
index 174f7d97fd..4eac458a50 100644
--- a/system/rsyslog/rsyslog.info
+++ b/system/rsyslog/rsyslog.info
@@ -1,10 +1,10 @@
 PRGNAM="rsyslog"
-VERSION="8.2001.0"
+VERSION="8.2312.0"
 HOMEPAGE="https://www.rsyslog.com/"
-DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2001.0.tar.gz"
-MD5SUM="4dc7bd26d3e6e8fbeff9e0bd203077be"
+DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2312.0.tar.gz"
+MD5SUM="632381aead68840967c74fbb564436cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README% docutils libee libestr libfastjson liblogging"
+REQUIRES="%README% libestr libfastjson"
 MAINTAINER="Christophe Trussardi"
 EMAIL="chris@teria.org"