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

[Eric Bélanger]

    Date: Friday, November 8, 2013 @ 01:37:59
  Author: eric
Revision: 199054

upgpkg: syslog-ng 3.5.1-1

Upstream update, Fix license, Clean up depends and makedepends, Remove old install scriptlet, Add prepare and check function

Modified:
  syslog-ng/trunk/PKGBUILD
Deleted:
  syslog-ng/trunk/syslog-ng.install

-------------------+
 PKGBUILD          |   27 +++++++++++++++++----------
 syslog-ng.install |    9 ---------
 2 files changed, 17 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-07 23:52:10 UTC (rev 199053)
+++ PKGBUILD	2013-11-08 00:37:59 UTC (rev 199054)
@@ -1,29 +1,31 @@
 # $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.4.3
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd')
-makedepends=('flex' 'pkg-config' 'python2')
+license=('GPL2' 'LGPL2.1')
+depends=('awk' 'eventlog' 'openssl' 'systemd')
+makedepends=('python2')
 optdepends=('logrotate: for rotating log files')
 backup=('etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
         'etc/logrotate.d/syslog-ng')
-install=$pkgname.install
 source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
         syslog-ng.conf
         syslog-ng.logrotate)
-sha1sums=('70433d041b2e48c598ee7595d89ddb2e1f6450b4'
+sha1sums=('e7e135f64a093db6a7258e6e0bfb35ac014b6de8'
           '0aaf695ea6756b59198ff2e4af237b4a6186525d'
           '949128fe3d7f77a7aab99048061f885bc758000c')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  sed -i 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -43,6 +45,11 @@
   make
 }
 
+check() {
+  cd "$pkgname-$pkgver"
+  make check
+}
+
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
@@ -50,5 +57,5 @@
   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"
 
-  sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
+
 }

Deleted: syslog-ng.install
===================================================================
--- syslog-ng.install	2013-11-07 23:52:10 UTC (rev 199053)
+++ syslog-ng.install	2013-11-08 00:37:59 UTC (rev 199054)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 3.3.6-3 "$2")" -eq 1 ]; then
-    printf '==> syslog-ng now reads from /run/systemd/journal/syslog in the\n'
-    printf '    default config. If you still use sysvinit/initscripts, this\n'
-    printf '    must be /dev/log in /etc/syslog-ng/syslog-ng.conf\n'
-  fi
-}