Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/nginx/PKGBUILD
	community-testing/nginx/nginx.install
	community/chrony/PKGBUILD
	community/lxdm/PKGBUILD
	community/oidentd/PKGBUILD
	community/oss/PKGBUILD
	community/pdnsd/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/subtle/PKGBUILD
	core/kmod/PKGBUILD
	core/lvm2/PKGBUILD
	core/openldap/PKGBUILD
	core/systemd/PKGBUILD
	extra/smartmontools/PKGBUILD
	multilib/wine/PKGBUILD

4 files changed, 38 insertions, 15 deletions

diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 5fe88e742..06a995bde 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154496 2012-03-29 15:43:20Z bisson $
+# $Id: PKGBUILD 162231 2012-06-24 02:24:03Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.4
+pkgver=0.97.5
 pkgrel=2
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
@@ -16,12 +16,16 @@ backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'rc.d'
         'conf.d'
+        'service'
+        'service.fresh'
         'logrotate'
         'tmpfiles.d'
         'config.patch')
-sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
+sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
           'c9d508c1e5972f0f849d8694c1872455fa9e74de'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
+          'df522b0488f3901e491f148c9300f6bae348c605'
+          'cda9a087e5593992150cb456e34c5f6f589aca82'
           '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
           '1c8ef193919b041135115170acd6313f008de808')
@@ -48,14 +52,17 @@ package() {
 
 	# Make sure conf files get installed, because make install
 	# doesn't do that if clamav is already installed upon building.
-	install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
-	install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf"
+	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
 
-	install -D -m644 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf"
-	install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav"
-	install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav"
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav"
+	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
+	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
+	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
+	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
 
-	# Un-distribute databases to require freshclam.
-	rm "${pkgdir}"/var/lib/clamav/*.cvd
+	install -d -o 64 -g 64 "${pkgdir}"/run/clamav
+	install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
+	install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
 }
diff --git a/extra/clamav/install b/extra/clamav/install
index a2092e815..896e187c7 100644
--- a/extra/clamav/install
+++ b/extra/clamav/install
@@ -1,10 +1,6 @@
 post_install() {
 	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
 	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
-
-	chown -R clamav:clamav /var/lib/clamav
-	install -o clamav -g clamav -d /run/clamav
-	install -o clamav -g clamav -d /var/log/clamav
 }
 
 post_remove() {
diff --git a/extra/clamav/service b/extra/clamav/service
new file mode 100644
index 000000000..5bf9eb14e
--- /dev/null
+++ b/extra/clamav/service
@@ -0,0 +1,10 @@
+[Unit]
+Description=clamav daemon
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/clamd.pid
+ExecStart=/usr/sbin/clamd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/clamav/service.fresh b/extra/clamav/service.fresh
new file mode 100644
index 000000000..a0a72c2e6
--- /dev/null
+++ b/extra/clamav/service.fresh
@@ -0,0 +1,10 @@
+[Unit]
+Description=clamav updater
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/freshclam.pid
+ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
+
+[Install]
+WantedBy=multi-user.target