[arch-commits] Commit in clamav/repos (34 files)

Dave Reisner dreisner at archlinux.org
Fri Jun 22 12:58:25 UTC 2012


    Date: Friday, June 22, 2012 @ 08:58:24
  Author: dreisner
Revision: 162158

db-move: moved clamav from [testing] to [extra] ( i686,  x86_64)

Added:
  clamav/repos/extra-i686/PKGBUILD
    (from rev 162156, clamav/repos/testing-i686/PKGBUILD)
  clamav/repos/extra-i686/conf.d
    (from rev 162156, clamav/repos/testing-i686/conf.d)
  clamav/repos/extra-i686/config.patch
    (from rev 162156, clamav/repos/testing-i686/config.patch)
  clamav/repos/extra-i686/install
    (from rev 162156, clamav/repos/testing-i686/install)
  clamav/repos/extra-i686/logrotate
    (from rev 162156, clamav/repos/testing-i686/logrotate)
  clamav/repos/extra-i686/rc.d
    (from rev 162156, clamav/repos/testing-i686/rc.d)
  clamav/repos/extra-i686/service
    (from rev 162156, clamav/repos/testing-i686/service)
  clamav/repos/extra-i686/service.fresh
    (from rev 162156, clamav/repos/testing-i686/service.fresh)
  clamav/repos/extra-i686/tmpfiles.d
    (from rev 162156, clamav/repos/testing-i686/tmpfiles.d)
  clamav/repos/extra-x86_64/PKGBUILD
    (from rev 162156, clamav/repos/testing-x86_64/PKGBUILD)
  clamav/repos/extra-x86_64/conf.d
    (from rev 162156, clamav/repos/testing-x86_64/conf.d)
  clamav/repos/extra-x86_64/config.patch
    (from rev 162156, clamav/repos/testing-x86_64/config.patch)
  clamav/repos/extra-x86_64/install
    (from rev 162156, clamav/repos/testing-x86_64/install)
  clamav/repos/extra-x86_64/logrotate
    (from rev 162156, clamav/repos/testing-x86_64/logrotate)
  clamav/repos/extra-x86_64/rc.d
    (from rev 162156, clamav/repos/testing-x86_64/rc.d)
  clamav/repos/extra-x86_64/service
    (from rev 162156, clamav/repos/testing-x86_64/service)
  clamav/repos/extra-x86_64/service.fresh
    (from rev 162156, clamav/repos/testing-x86_64/service.fresh)
  clamav/repos/extra-x86_64/tmpfiles.d
    (from rev 162156, clamav/repos/testing-x86_64/tmpfiles.d)
Deleted:
  clamav/repos/extra-i686/PKGBUILD
  clamav/repos/extra-i686/conf.d
  clamav/repos/extra-i686/config.patch
  clamav/repos/extra-i686/install
  clamav/repos/extra-i686/logrotate
  clamav/repos/extra-i686/rc.d
  clamav/repos/extra-i686/tmpfiles.d
  clamav/repos/extra-x86_64/PKGBUILD
  clamav/repos/extra-x86_64/conf.d
  clamav/repos/extra-x86_64/config.patch
  clamav/repos/extra-x86_64/install
  clamav/repos/extra-x86_64/logrotate
  clamav/repos/extra-x86_64/rc.d
  clamav/repos/extra-x86_64/tmpfiles.d
  clamav/repos/testing-i686/
  clamav/repos/testing-x86_64/

----------------------------+
 extra-i686/PKGBUILD        |  125 ++++++++++++++++++++--------------------
 extra-i686/conf.d          |   16 ++---
 extra-i686/config.patch    |   60 +++++++++----------
 extra-i686/install         |   28 ++++-----
 extra-i686/logrotate       |   16 ++---
 extra-i686/rc.d            |  132 +++++++++++++++++++++----------------------
 extra-i686/service         |   10 +++
 extra-i686/service.fresh   |   10 +++
 extra-i686/tmpfiles.d      |    2 
 extra-x86_64/PKGBUILD      |  125 ++++++++++++++++++++--------------------
 extra-x86_64/conf.d        |   16 ++---
 extra-x86_64/config.patch  |   60 +++++++++----------
 extra-x86_64/install       |   28 ++++-----
 extra-x86_64/logrotate     |   16 ++---
 extra-x86_64/rc.d          |  132 +++++++++++++++++++++----------------------
 extra-x86_64/service       |   10 +++
 extra-x86_64/service.fresh |   10 +++
 extra-x86_64/tmpfiles.d    |    2 
 18 files changed, 422 insertions(+), 376 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/PKGBUILD	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,61 +0,0 @@
-# $Id$
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.4
-pkgrel=2
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-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'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	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 -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
-	install -D -m644 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"
-
-	# Un-distribute databases to require freshclam.
-	rm "${pkgdir}"/var/lib/clamav/*.cvd
-}

Copied: clamav/repos/extra-i686/PKGBUILD (from rev 162156, clamav/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,64 @@
+# $Id$
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=clamav
+pkgver=0.97.5
+pkgrel=1
+pkgdesc='Anti-virus toolkit for Unix'
+url='http://www.clamav.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('bzip2' 'libltdl')
+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=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
+          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
+          'cb116cdab49a810381a515cbcfb6a6c148547f07'
+          'df522b0488f3901e491f148c9300f6bae348c605'
+          'cda9a087e5593992150cb456e34c5f6f589aca82'
+          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
+          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
+          '1c8ef193919b041135115170acd6313f008de808')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../config.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/clamav \
+		--with-dbdir=/var/lib/clamav \
+		--disable-clamav \
+
+	make
+}
+
+package() {
+	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
+	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
+}

Deleted: extra-i686/conf.d
===================================================================
--- extra-i686/conf.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/conf.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"

Copied: clamav/repos/extra-i686/conf.d (from rev 162156, clamav/repos/testing-i686/conf.d)
===================================================================
--- extra-i686/conf.d	                        (rev 0)
+++ extra-i686/conf.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,8 @@
+# clamav startup script config options
+
+# change these to "yes" to start 
+START_FRESHCLAM="no"
+START_CLAMD="no"
+
+# Options to pass to freshclam (man freshclam for more info).
+FRESHCLAM_OPTS="-c 12"

Deleted: extra-i686/config.patch
===================================================================
--- extra-i686/config.patch	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/config.patch	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,30 +0,0 @@
-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
-@@ -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 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
-@@ -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

Copied: clamav/repos/extra-i686/config.patch (from rev 162156, clamav/repos/testing-i686/config.patch)
===================================================================
--- extra-i686/config.patch	                        (rev 0)
+++ extra-i686/config.patch	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,30 @@
+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
+@@ -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 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
+@@ -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

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/install	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,14 +0,0 @@
-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() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}

Copied: clamav/repos/extra-i686/install (from rev 162156, clamav/repos/testing-i686/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,14 @@
+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() {
+	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
+	getent group clamav &>/dev/null && groupdel clamav >/dev/null
+	return 0
+}

Deleted: extra-i686/logrotate
===================================================================
--- extra-i686/logrotate	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/logrotate	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}

Copied: clamav/repos/extra-i686/logrotate (from rev 162156, clamav/repos/testing-i686/logrotate)
===================================================================
--- extra-i686/logrotate	                        (rev 0)
+++ extra-i686/logrotate	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,8 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+    create 644 clamav clamav
+    sharedscripts
+    postrotate
+            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+    endscript
+}

Deleted: extra-i686/rc.d
===================================================================
--- extra-i686/rc.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/rc.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0

Copied: clamav/repos/extra-i686/rc.d (from rev 162156, clamav/repos/testing-i686/rc.d)
===================================================================
--- extra-i686/rc.d	                        (rev 0)
+++ extra-i686/rc.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
+
+PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
+PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
+
+case "$1" in
+	start)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Starting ClamD"
+			[[ -z $PID_CD ]] && /usr/sbin/clamd
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+		sleep 1
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Starting FreshClam"
+			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	stop)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Stopping ClamD"
+			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
+				if [[ $? -gt 0 ]]; then
+					stat_fail
+				else
+					rm_daemon clamav
+					stat_done
+				fi
+		fi
+
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Stopping FreshClam"
+			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					rm_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 2
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"	
+esac
+exit 0

Copied: clamav/repos/extra-i686/service (from rev 162156, clamav/repos/testing-i686/service)
===================================================================
--- extra-i686/service	                        (rev 0)
+++ extra-i686/service	2012-06-22 12:58:24 UTC (rev 162158)
@@ -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

Copied: clamav/repos/extra-i686/service.fresh (from rev 162156, clamav/repos/testing-i686/service.fresh)
===================================================================
--- extra-i686/service.fresh	                        (rev 0)
+++ extra-i686/service.fresh	2012-06-22 12:58:24 UTC (rev 162158)
@@ -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

Deleted: extra-i686/tmpfiles.d
===================================================================
--- extra-i686/tmpfiles.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-i686/tmpfiles.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav

Copied: clamav/repos/extra-i686/tmpfiles.d (from rev 162156, clamav/repos/testing-i686/tmpfiles.d)
===================================================================
--- extra-i686/tmpfiles.d	                        (rev 0)
+++ extra-i686/tmpfiles.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/PKGBUILD	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,61 +0,0 @@
-# $Id$
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.4
-pkgrel=2
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-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'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	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 -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
-	install -D -m644 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"
-
-	# Un-distribute databases to require freshclam.
-	rm "${pkgdir}"/var/lib/clamav/*.cvd
-}

Copied: clamav/repos/extra-x86_64/PKGBUILD (from rev 162156, clamav/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,64 @@
+# $Id$
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=clamav
+pkgver=0.97.5
+pkgrel=1
+pkgdesc='Anti-virus toolkit for Unix'
+url='http://www.clamav.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('bzip2' 'libltdl')
+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=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
+          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
+          'cb116cdab49a810381a515cbcfb6a6c148547f07'
+          'df522b0488f3901e491f148c9300f6bae348c605'
+          'cda9a087e5593992150cb456e34c5f6f589aca82'
+          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
+          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
+          '1c8ef193919b041135115170acd6313f008de808')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../config.patch
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/clamav \
+		--with-dbdir=/var/lib/clamav \
+		--disable-clamav \
+
+	make
+}
+
+package() {
+	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
+	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
+}

Deleted: extra-x86_64/conf.d
===================================================================
--- extra-x86_64/conf.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/conf.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"

Copied: clamav/repos/extra-x86_64/conf.d (from rev 162156, clamav/repos/testing-x86_64/conf.d)
===================================================================
--- extra-x86_64/conf.d	                        (rev 0)
+++ extra-x86_64/conf.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,8 @@
+# clamav startup script config options
+
+# change these to "yes" to start 
+START_FRESHCLAM="no"
+START_CLAMD="no"
+
+# Options to pass to freshclam (man freshclam for more info).
+FRESHCLAM_OPTS="-c 12"

Deleted: extra-x86_64/config.patch
===================================================================
--- extra-x86_64/config.patch	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/config.patch	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,30 +0,0 @@
-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
-@@ -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 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
-@@ -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

Copied: clamav/repos/extra-x86_64/config.patch (from rev 162156, clamav/repos/testing-x86_64/config.patch)
===================================================================
--- extra-x86_64/config.patch	                        (rev 0)
+++ extra-x86_64/config.patch	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,30 @@
+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
+@@ -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 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
+@@ -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

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/install	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,14 +0,0 @@
-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() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}

Copied: clamav/repos/extra-x86_64/install (from rev 162156, clamav/repos/testing-x86_64/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,14 @@
+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() {
+	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
+	getent group clamav &>/dev/null && groupdel clamav >/dev/null
+	return 0
+}

Deleted: extra-x86_64/logrotate
===================================================================
--- extra-x86_64/logrotate	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/logrotate	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}

Copied: clamav/repos/extra-x86_64/logrotate (from rev 162156, clamav/repos/testing-x86_64/logrotate)
===================================================================
--- extra-x86_64/logrotate	                        (rev 0)
+++ extra-x86_64/logrotate	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,8 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+    create 644 clamav clamav
+    sharedscripts
+    postrotate
+            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+    endscript
+}

Deleted: extra-x86_64/rc.d
===================================================================
--- extra-x86_64/rc.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/rc.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0

Copied: clamav/repos/extra-x86_64/rc.d (from rev 162156, clamav/repos/testing-x86_64/rc.d)
===================================================================
--- extra-x86_64/rc.d	                        (rev 0)
+++ extra-x86_64/rc.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
+
+PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
+PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
+
+case "$1" in
+	start)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Starting ClamD"
+			[[ -z $PID_CD ]] && /usr/sbin/clamd
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+		sleep 1
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Starting FreshClam"
+			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					add_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	stop)
+		if [[ $START_CLAMD = yes ]]; then
+			stat_busy "Stopping ClamD"
+			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
+				if [[ $? -gt 0 ]]; then
+					stat_fail
+				else
+					rm_daemon clamav
+					stat_done
+				fi
+		fi
+
+		if [[ $START_FRESHCLAM = yes ]]; then
+			stat_busy "Stopping FreshClam"
+			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
+			if [[ $? -gt 0 ]]; then
+					stat_fail
+			else
+					rm_daemon clamav
+					stat_done
+			fi
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 2
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"	
+esac
+exit 0

Copied: clamav/repos/extra-x86_64/service (from rev 162156, clamav/repos/testing-x86_64/service)
===================================================================
--- extra-x86_64/service	                        (rev 0)
+++ extra-x86_64/service	2012-06-22 12:58:24 UTC (rev 162158)
@@ -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

Copied: clamav/repos/extra-x86_64/service.fresh (from rev 162156, clamav/repos/testing-x86_64/service.fresh)
===================================================================
--- extra-x86_64/service.fresh	                        (rev 0)
+++ extra-x86_64/service.fresh	2012-06-22 12:58:24 UTC (rev 162158)
@@ -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

Deleted: extra-x86_64/tmpfiles.d
===================================================================
--- extra-x86_64/tmpfiles.d	2012-06-22 12:58:04 UTC (rev 162157)
+++ extra-x86_64/tmpfiles.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav

Copied: clamav/repos/extra-x86_64/tmpfiles.d (from rev 162156, clamav/repos/testing-x86_64/tmpfiles.d)
===================================================================
--- extra-x86_64/tmpfiles.d	                        (rev 0)
+++ extra-x86_64/tmpfiles.d	2012-06-22 12:58:24 UTC (rev 162158)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav




More information about the arch-commits mailing list