rsyslog: update to 8.11.0

1 files changed, 38 insertions, 29 deletions

diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD
index 89739bc..641af25 100644
--- a/abs/core/rsyslog/PKGBUILD
+++ b/abs/core/rsyslog/PKGBUILD
@@ -1,55 +1,64 @@
-# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $
+# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=5.8.13
-pkgrel=3
+pkgver=8.11.0
+pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('zlib')
-makedepends=( 'libmysqlclient'  'gnutls')
-optdepends=( 'libmysqlclient: MySQL Database Support'
+depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging' 'librelp')
+makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls'
+	     'python2-docutils')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmariadbclient: MySQL Database Support'
+	    'net-snmp'
 	    'gnutls')
-backup=('etc/rsyslog.conf' \
-	'etc/conf.d/rsyslog')
-conflicts=('syslog-ng')
-replaces=('syslog-ng')
 groups=('base')
- 
-options=('strip' 'zipman' '!libtool')
-#install=('rsyslog.install')
+options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-        'rsyslog' 'rsyslog.conf.d' 'rsyslog.conf.linhes' 'mythtv.conf'
-        'log_care.sh')
+    'rsyslog.conf.linhes'
+    'mythtv.conf'
+    'log_care.sh'
+	'gnutls.patch')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+#  patch -p1 <$srcdir/gnutls.patch
+  sed -i rsyslog.service.in \
+    -e 's|rsyslogd -n|rsyslogd -n -i /run/rsyslogd.pid|' \
+    -e '/ExecStart=.*$/iPIDFile=/run/rsyslogd.pid'
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-	      --sbindir=/usr/bin \
+              --sbindir=/usr/bin \
               --enable-mysql \
+              --enable-pgsql \
               --enable-mail \
               --enable-imfile \
-              --enable-imtemplate \
+              --enable-snmp \
               --enable-gnutls \
               --enable-inet \
+              --enable-imjournal \
+              --enable-omjournal \
+              --enable-relp \
+              --enable-impstats \
               --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make install DESTDIR=${pkgdir}
-  # Install Daemons and Configuration Files
-  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
-  install -D -m644 ${srcdir}/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf
-  install -D -m644 ${srcdir}/mythtv.conf ${pkgdir}/etc/rsyslog.d/mythtv.conf
-  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -D -m755 ${srcdir}/log_care.sh ${pkgdir}/etc/cron.daily/log_care
+  install -D -m644 $srcdir/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf
+  install -D -m644 $srcdir/mythtv.conf ${pkgdir}/etc/rsyslog.d/mythtv.conf
+  install -D -m755 $srcdir/log_care.sh ${pkgdir}/etc/cron.daily/log_care
 }
-md5sums=('8d228a8b622f90b320c95f38be7fc5bb'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '1a0cd4530dd5d1439456d5ae230574d9'
-         '8dd27270e882e8707924dbca0c66f66f'
-         'c71fa75857ff7b9e24e41457e89c76ca'
-         'cd39e6edc1fcbbae2093c40c880e0079')
+md5sums=('35f0b7024ae7b5677e49f14f36304d77'
+         '61750ec989c319470b466946f6404931'
+         'd99814eeea48b370b3e0fe2899792fdb'
+         'cd39e6edc1fcbbae2093c40c880e0079'
+         'aafafdf4502f5e4de5fcfebd21499700')