extra/clamav to 0.98-2

extra/clamav/PKGBUILD

@@ -8,7 +8,7 @@
 
 pkgname=clamav
 pkgver=0.98
-pkgrel=1
+pkgrel=2
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
@@ -17,25 +17,30 @@ arch=('i686' 'x86_64')
 depends=('bzip2' 'libltdl')
 backup=('etc/logrotate.d/clamav')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'service'
-        'service.fresh'
         'logrotate'
         'tmpfiles.d'
-        'config.patch'
+        'clamd.conf'
+        'freshclam.conf'
+        'clamd.service'
+        'freshclamd.service'
         'arm.patch')
 sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db'
-          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
           'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '00dfadd93d11186793cb1161745f9dd7370beb99'
+          '887f624eb305f2446f55d8339e2972ad0cfe2b79'
+          'b767837d0279ad30b92c314cb762b73e5ad0415e'
+          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
+          'cda9a087e5593992150cb456e34c5f6f589aca82'
           '7855de9eb13c1ec7623375d36f184a2c0b208fcc')
 
+backup=('etc/clamav/clamd.conf'
+        'etc/clamav/freshclam.conf'
+        'etc/logrotate.d/clamav')
+
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../config.patch
 	patch -p1 -i ../arm.patch
 }
 
@@ -55,8 +60,10 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+	install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+	install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+	install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+	install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
 	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
 

extra/clamav/clamd.conf

@@ -0,0 +1,6 @@
+LogFile /var/log/clamav/clamd.log
+LogTime yes
+PidFile /run/clamav/clamd.pid
+TemporaryDirectory /tmp
+LocalSocket /var/lib/clamav/clamd.sock
+User clamav

extra/clamav/config.patch

@@ -1,30 +0,0 @@
-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
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-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
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf

extra/clamav/freshclam.conf

@@ -0,0 +1,3 @@
+UpdateLogFile /var/log/clamav/freshclam.log
+DatabaseMirror database.clamav.net
+NotifyClamd /etc/clamav/clamd.conf