[arch-commits] Commit in clamav/trunk (PKGBUILD config.patch)

[Gaetan Bisson]

    Date: Friday, September 20, 2013 @ 04:04:26
  Author: bisson
Revision: 194639

upstream update

Modified:
  clamav/trunk/PKGBUILD
  clamav/trunk/config.patch

--------------+
 PKGBUILD     |   15 +++++----------
 config.patch |   12 ++++++------
 2 files changed, 11 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-20 01:57:04 UTC (rev 194638)
+++ PKGBUILD	2013-09-20 02:04:26 UTC (rev 194639)
@@ -4,8 +4,8 @@
 # Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.8
-pkgrel=3
+pkgver=0.98
+pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
@@ -12,7 +12,7 @@
 options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav')
+backup=('etc/logrotate.d/clamav')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'service'
         'service.fresh'
@@ -19,12 +19,12 @@
         'logrotate'
         'tmpfiles.d'
         'config.patch')
-sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c'
+sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db'
           'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
           'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
+          '00dfadd93d11186793cb1161745f9dd7370beb99')
 
 install=install
 
@@ -49,11 +49,6 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-
 	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf

Modified: config.patch
===================================================================
--- config.patch	2013-09-20 01:57:04 UTC (rev 194638)
+++ config.patch	2013-09-20 02:04:26 UTC (rev 194639)
@@ -1,6 +1,6 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
+diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample
+--- old/etc/clamd.conf.sample	2010-12-02 19:31:21.773357389 +0100
++++ new/etc/clamd.conf.sample	2010-12-02 19:31:45.873357389 +0100
 @@ -14 +14 @@
 -#LogFile /tmp/clamd.log
 +LogFile /var/log/clamav/clamd.log
@@ -19,9 +19,9 @@
 @@ -190 +190 @@
 -#User clamav
 +User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
+diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample
+--- old/etc/freshclam.conf.sample	2010-12-02 19:31:21.773357389 +0100
++++ new/etc/freshclam.conf.sample	2010-12-02 19:31:51.190024057 +0100
 @@ -17 +17 @@
 -#UpdateLogFile /var/log/freshclam.log
 +UpdateLogFile /var/log/clamav/freshclam.log