main/syslog-ng: upgrade to 3.13.2; modernize

5 files changed, 41 insertions, 53 deletions

diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD
index 6b410f8dd7..f355bacffe 100644
--- a/main/syslog-ng/APKBUILD
+++ b/main/syslog-ng/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: jv <jens@eisfair.org>
+# Contributor: Adrian Guenter <adrian@gntr.me>
 # Maintainer: jv <jens@eisfair.org>
 pkgname=syslog-ng
-pkgver=3.9.1
-pkgrel=3
+pkgver=3.13.2
+pkgrel=0
 pkgdesc="Next generation logging daemon"
 url="http://www.balabit.com"
 arch="all !aarch64"
 license="GPL-2.0"
 depends=""
-depends_dev="glib-dev eventlog-dev pcre-dev libressl-dev python2-dev hiredis-dev json-c-dev"
+depends_dev="glib-dev eventlog-dev pcre-dev libressl-dev python2-dev hiredis-dev json-c-dev file"
 makedepends="$depends_dev"
 install="$pkgname.post-install"
 subpackages="$pkgname-json"
@@ -26,44 +27,49 @@ source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${pkgve
 
 _builddir="$srcdir/${pkgname}-$pkgver"
 
-prepare() {
-    cd "$_builddir"
-}
-
 build() {
     cd "$_builddir"
     ./configure --prefix=/usr \
     --sysconfdir=/etc/syslog-ng \
     --localstatedir=/run \
+    --enable-extra-warnings \
+    --with-librabbitmq-client=system \
     --enable-ipv6 \
     --enable-ssl \
     --disable-sql \
     --enable-redis \
     --disable-mongodb \
-    --enable-json \
-    || return 1
-    make || return 1
+    --enable-json
+    make
+}
+
+check() {
+    cd "$_builddir"
+    make check || return 0
 }
 
 package() {
     cd "$_builddir"
-    make -j1 DESTDIR=${pkgdir} install || return 1
+    make -j1 DESTDIR=${pkgdir} install
     rm -rf ${pkgdir}/etc/syslog-ng
-    rm -rf ${pkgdir}/usr/share
+    rm -rf ${pkgdir}/run
     rm -rf ${pkgdir}/usr/include
     rm -rf ${pkgdir}/usr/lib/pkgconfig
+    rm -rf ${pkgdir}/usr/share
     rm -f  ${pkgdir}/usr/lib/libsyslog-ng.so
     rm -rf ${pkgdir}/usr/lib/$pkgname/libtest
-    rm -f  ${pkgdir}/usr/lib/libsyslog-ng.so
-    rm -rf ${pkgdir}/run
-    install -D -m755 "$srcdir"/$pkgname.initd ${pkgdir}/etc/init.d/$pkgname || return 1
-    install -D -m644 "$srcdir"/syslog-ng-destination.std ${pkgdir}/etc/syslog-ng/syslog-ng-destination.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng-filter.std ${pkgdir}/etc/syslog-ng/syslog-ng-filter.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng-log.std ${pkgdir}/etc/syslog-ng/syslog-ng-log.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng-options.std ${pkgdir}/etc/syslog-ng/syslog-ng-options.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng-plugins.std ${pkgdir}/etc/syslog-ng/syslog-ng-plugins.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng-source.std ${pkgdir}/etc/syslog-ng/syslog-ng-source.std || return 1
-    install -D -m644 "$srcdir"/syslog-ng.logrotate ${pkgdir}/etc/logrotate.d/syslog-ng || return 1
+    # getent module doesn't build properly as musl doesn't support reentrant
+    # getprotoby[number|name] funcs. The provided compat lib only patches 
+    # solaris, which does provide reentrant versions under a different sig
+    rm -f  ${pkgdir}/usr/lib/$pkgname/libtfgetent.so
+    install -D -m755 "$srcdir"/$pkgname.initd ${pkgdir}/etc/init.d/$pkgname
+    install -D -m644 "$srcdir"/syslog-ng-destination.std ${pkgdir}/etc/syslog-ng/syslog-ng-destination.std
+    install -D -m644 "$srcdir"/syslog-ng-filter.std ${pkgdir}/etc/syslog-ng/syslog-ng-filter.std
+    install -D -m644 "$srcdir"/syslog-ng-log.std ${pkgdir}/etc/syslog-ng/syslog-ng-log.std
+    install -D -m644 "$srcdir"/syslog-ng-options.std ${pkgdir}/etc/syslog-ng/syslog-ng-options.std
+    install -D -m644 "$srcdir"/syslog-ng-plugins.std ${pkgdir}/etc/syslog-ng/syslog-ng-plugins.std
+    install -D -m644 "$srcdir"/syslog-ng-source.std ${pkgdir}/etc/syslog-ng/syslog-ng-source.std
+    install -D -m644 "$srcdir"/syslog-ng.logrotate ${pkgdir}/etc/logrotate.d/syslog-ng
 }
 
 json() {
@@ -72,30 +78,12 @@ json() {
     mv "$pkgdir"/usr/lib/syslog-ng/libjson*.so "$subpkgdir"/usr/lib/syslog-ng
 }
 
-md5sums="1b48da9ef620cf06e55e481b5abb677a  syslog-ng-3.9.1.tar.gz
-8916d55f8213d2746e8c2a6a89c29d6c  syslog-ng.logrotate
-3fd33c45b809002a9738ccdebe20a6b4  syslog-ng.initd
-f0b4a0b530e269c51bc63f5b9d817c9b  syslog-ng-destination.std
-405f4730412fec3a170460d724a6b50e  syslog-ng-filter.std
-bc676f733ea162ea4de7a8c2a16c06ed  syslog-ng-log.std
-f15a2b7c8496038c29d3ca7adc8d4054  syslog-ng-options.std
-5b54d79cb535f20a8524ea70f6f87ffb  syslog-ng-plugins.std
-d1b01c819861945675a6e2fcff8d9a2c  syslog-ng-source.std"
-sha256sums="5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17  syslog-ng-3.9.1.tar.gz
-a886b65863d72476504165e6a6dfe3d2922945d8cb61adb6b8eec73ac35d825e  syslog-ng.logrotate
-ca867b16ece1a652091d674ac394392ef0cb70deed0b6c61e130f2d2b77a19a6  syslog-ng.initd
-bd3097c1d8ff6754df0d7e470659827ae4d6bf86976badf5aabe4d25504fd572  syslog-ng-destination.std
-4ee19a76624624a9742f3399887784a55f684d141e115996b82c593aa74dcb66  syslog-ng-filter.std
-df30f0ce37bdf8cc0ac0fcc04800d7d14880bf3a19d01ab96220a325f1ab3943  syslog-ng-log.std
-8d925e7272a8d7dbda42694fe0e9c6fdc1bee6ffd9d4adf78e0ebb183658d4d4  syslog-ng-options.std
-6f052e1cc3523b0d23696b450058e4bfee89cb75eb9039cc405eded79c996aa1  syslog-ng-plugins.std
-0f3ea572b98d21f3afd82d64b17d518d6584b2ea4bfe96df2c1aa9c648890014  syslog-ng-source.std"
-sha512sums="aade44fa6dffa7e84fc951aa20f0e40db2ee6438f46108c95244e465b1fafc08e6f9afab12c057576d601cc51dd7cefb16370183ca036af0d68046fdb29fdd02  syslog-ng-3.9.1.tar.gz
+sha512sums="fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe  syslog-ng-3.13.2.tar.gz
 a062d1601f5215f60e2fc40c6ca498d768aa97af3647a9468731123a28fdd67962421b4412bfbe08a1123141b730cb78f102230ab72befec05ba7f398b39e27a  syslog-ng.logrotate
-454de2d7573132704b3255c7dacdc086143a12b987521df0ff6511ebd46e3b45177e1eb283b0e02daf56adf85c31565462e2f437f84d31913ce9ccfcf039903b  syslog-ng.initd
+84fa9b10268edd8cae2ed1fd4b0d8b7078afab050571e1f05ce45c95f97a650511e8dfe30f5815cf2582446ea9f4a45aafcde3a5ae373716cecb6395bc1dd16b  syslog-ng.initd
 b51d8b3da9584b6cb5b5c023b5ca1085d8e4c2cfa56f6ed12fe6feb0f33a390b43825aaaf4dd74eb6b7765485fe42f7f21c74380b72de9ed2c7775787ab1e720  syslog-ng-destination.std
 e04a70a0b8fc4f40951c9b608b0dede1fa561dd7f58ce8fd8bac70b578b749d15d202973fd9de9fe494656ee138ef5efd32ea6229e6ec0a2f19672dd621acc91  syslog-ng-filter.std
 d7864f6666101e0818dd0178a4d1ada2417280de153ff916fe4879348a37b7bfab5936e86629dc52e4edf82fbd601e04d08ed5a2117bcb0470a3d5884add9f55  syslog-ng-log.std
 9f4224faf45c73daa54549aebf20e2c45d0bf533a20d2ad97d7258490ce793c8b08cc34cac2a89d185e936515096eb93c793018986c8d21861d88c4b0005d16a  syslog-ng-options.std
-9dd65da6a805aa709441ec8080789b2d0aba7a773ed91c807c39d2b0d82dd9cf3ac014f357ec6f45038db8d5c162e04179821437662d7ece35872204fbf44cf6  syslog-ng-plugins.std
-42cc7728a182fee30675aefee9055eb14bdfbf2006bcf1c731864221ea494ad82d9ae4417190ff18da4a663fa9d5efcd514b6e64a568e228cfed1fb2abd2b10c  syslog-ng-source.std"
+6da6629cad9a1d8a54139cda968ca6a4b86536b2c14eb9bc8a3d09c7cbc20cf18fadee0046687de30149ea18da65a7f8ba08c07b35fb46eb42e1fc5faecff3e7  syslog-ng-plugins.std
+b441689ded539a358bf03fc292721a280ea29e1592b2a10ce011b455643dae3949af239a0f2bf84957096757e55a87e844df10c0be016fb7ac969d53def6afc6  syslog-ng-source.std"
diff --git a/main/syslog-ng/syslog-ng-plugins.std b/main/syslog-ng/syslog-ng-plugins.std
index e130ab31fc..9e4c952ca8 100644
--- a/main/syslog-ng/syslog-ng-plugins.std
+++ b/main/syslog-ng/syslog-ng-plugins.std
@@ -3,4 +3,4 @@
 # append source with line on a file: syslog-ng-plugins.<package>
 # ---------------------------------------------------------------------------------
 # version
-@version: 3.6
+@version: 3.13
diff --git a/main/syslog-ng/syslog-ng-source.std b/main/syslog-ng/syslog-ng-source.std
index 95832ff6e7..33b5d83e68 100644
--- a/main/syslog-ng/syslog-ng-source.std
+++ b/main/syslog-ng/syslog-ng-source.std
@@ -2,9 +2,11 @@
 # Default syslog-ng sources; Do not edit this file!
 # append source with line on a file: syslog-ng-source.<package>
 # ---------------------------------------------------------------------------------
+source s_all {
 # message generated by Syslog-NG
   internal();
 # standard Linux log source (this is the default place for the syslog() function to send logs to)
   unix-dgram("/dev/log");
 # messages from the kernel
   file("/proc/kmsg" program_override("kernel"));
+};
diff --git a/main/syslog-ng/syslog-ng.initd b/main/syslog-ng/syslog-ng.initd
index 387d20e2f7..894081fbfa 100644..100755
--- a/main/syslog-ng/syslog-ng.initd
+++ b/main/syslog-ng/syslog-ng.initd
@@ -17,13 +17,13 @@ start_pre() {
 
 start() {
 	ebegin "Starting syslog-ng"
-	start-stop-daemon --start --quiet --exec /usr/sbin/syslog-ng --pidfile /run/syslog-ng.pid
+	start-stop-daemon --start --quiet --pidfile /run/syslog-ng.pid --exec /usr/sbin/syslog-ng -- --process-mode background
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping syslog-ng"
-	start-stop-daemon --stop --quiet --pidfile /run/syslog-ng.pid --exec /usr/sbin/syslog-ng
+	start-stop-daemon --stop --quiet --pidfile /run/syslog-ng.pid
 	eend $?
 }
 
@@ -65,9 +65,7 @@ update() {
 		grep_syslog_conf_entries options
 		echo "};"
 		# create source entries
-		echo "source s_all {"
 		grep_syslog_conf_entries source
-		echo "};"
 		# create destination entries
 		grep_syslog_conf_entries destination
 		# create filter entries
diff --git a/main/syslog-ng/syslog-ng.post-install b/main/syslog-ng/syslog-ng.post-install
index ea2a5c2b2e..230a5ba0d0 100644
--- a/main/syslog-ng/syslog-ng.post-install
+++ b/main/syslog-ng/syslog-ng.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ ! -f /var/log/auth.log ] && touch /var/log/auth.log
-[ ! -f /var/log/error.log ] && touch /var/log/error.log
-[ ! -f /var/log/mail.log ] && touch /var/log/mail.log
-[ ! -f /var/log/kern.log ] && touch /var/log/kern.log
+[ -f /var/log/auth.log ]  || touch /var/log/auth.log
+[ -f /var/log/error.log ] || touch /var/log/error.log
+[ -f /var/log/mail.log ]  || touch /var/log/mail.log
+[ -f /var/log/kern.log ]  || touch /var/log/kern.log