[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng.conf)

[Florian Pritz]

    Date: Saturday, September 21, 2019 @ 22:09:05
  Author: bluewind
Revision: 363211

Revert to manually incrementing config version

This has too much potential for unintended breakage if the config is not
adjusted to match the new config version and not every update requires a config
version change. Go back to playing it safe like it was done before.

Modified:
  syslog-ng/trunk/PKGBUILD
  syslog-ng/trunk/syslog-ng.conf

----------------+
 PKGBUILD       |    6 +++---
 syslog-ng.conf |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-21 21:59:14 UTC (rev 363210)
+++ PKGBUILD	2019-09-21 22:09:05 UTC (rev 363211)
@@ -2,7 +2,7 @@
 
 pkgname=syslog-ng
 pkgver=3.23.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('x86_64')
 url="https://www.syslog-ng.com/products/open-source-log-management/"
@@ -31,7 +31,7 @@
 source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
         syslog-ng.conf syslog-ng.logrotate)
 sha256sums=('fb36cfc1982831f74143b77a924ee79714745b5e2b3ff59d086d09a77d0acd38'
-            '91308ed9c68113724d92b703ecbf4f74d4559969f2caa812962fba1ce0fe9931'
+            '3491c028f9ff9ccd7437b487de682a961ca64202f861838775d872bef980bf4d'
             '93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317')
 
 prepare() {
@@ -60,7 +60,7 @@
 package() {
   make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
   install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
-  sed -e "s#%%VERSION%%#${pkgver%.*}#" "$srcdir/syslog-ng.conf" > "$pkgdir/etc/syslog-ng/syslog-ng.conf"
+  install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
   install -Dm644 "$srcdir"/$pkgname-$pkgver/contrib/systemd/syslog-ng at default -t "$pkgdir"/etc/default
 }

Modified: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2019-09-21 21:59:14 UTC (rev 363210)
+++ syslog-ng.conf	2019-09-21 22:09:05 UTC (rev 363211)
@@ -1,4 +1,4 @@
- at version: %%VERSION%%
+ at version: 3.23
 @include "scl.conf"
 #
 # /etc/syslog-ng/syslog-ng.conf