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

Gaetan Bisson bisson at archlinux.org
Wed Mar 28 23:18:37 UTC 2012


    Date: Wednesday, March 28, 2012 @ 19:18:37
  Author: bisson
Revision: 154473

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  clamav/repos/testing-i686/
  clamav/repos/testing-i686/PKGBUILD
    (from rev 154472, clamav/trunk/PKGBUILD)
  clamav/repos/testing-i686/conf.d
    (from rev 154472, clamav/trunk/conf.d)
  clamav/repos/testing-i686/config.patch
    (from rev 154472, clamav/trunk/config.patch)
  clamav/repos/testing-i686/install
    (from rev 154472, clamav/trunk/install)
  clamav/repos/testing-i686/logrotate
    (from rev 154472, clamav/trunk/logrotate)
  clamav/repos/testing-i686/rc.d
    (from rev 154472, clamav/trunk/rc.d)
  clamav/repos/testing-i686/tmpfiles.d
    (from rev 154472, clamav/trunk/tmpfiles.d)
  clamav/repos/testing-x86_64/
  clamav/repos/testing-x86_64/PKGBUILD
    (from rev 154472, clamav/trunk/PKGBUILD)
  clamav/repos/testing-x86_64/conf.d
    (from rev 154472, clamav/trunk/conf.d)
  clamav/repos/testing-x86_64/config.patch
    (from rev 154472, clamav/trunk/config.patch)
  clamav/repos/testing-x86_64/install
    (from rev 154472, clamav/trunk/install)
  clamav/repos/testing-x86_64/logrotate
    (from rev 154472, clamav/trunk/logrotate)
  clamav/repos/testing-x86_64/rc.d
    (from rev 154472, clamav/trunk/rc.d)
  clamav/repos/testing-x86_64/tmpfiles.d
    (from rev 154472, clamav/trunk/tmpfiles.d)

-----------------------------+
 testing-i686/PKGBUILD       |   61 ++++++++++++++++++++++++++++++++++++++
 testing-i686/conf.d         |    8 +++++
 testing-i686/config.patch   |   30 +++++++++++++++++++
 testing-i686/install        |   14 ++++++++
 testing-i686/logrotate      |    8 +++++
 testing-i686/rc.d           |   66 ++++++++++++++++++++++++++++++++++++++++++
 testing-i686/tmpfiles.d     |    1 
 testing-x86_64/PKGBUILD     |   61 ++++++++++++++++++++++++++++++++++++++
 testing-x86_64/conf.d       |    8 +++++
 testing-x86_64/config.patch |   30 +++++++++++++++++++
 testing-x86_64/install      |   14 ++++++++
 testing-x86_64/logrotate    |    8 +++++
 testing-x86_64/rc.d         |   66 ++++++++++++++++++++++++++++++++++++++++++
 testing-x86_64/tmpfiles.d   |    1 
 14 files changed, 376 insertions(+)

Copied: clamav/repos/testing-i686/PKGBUILD (from rev 154472, clamav/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-03-28 23:18:37 UTC (rev 154473)
@@ -0,0 +1,61 @@
+# $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/testing-i686/conf.d (from rev 154472, clamav/trunk/conf.d)
===================================================================
--- testing-i686/conf.d	                        (rev 0)
+++ testing-i686/conf.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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"

Copied: clamav/repos/testing-i686/config.patch (from rev 154472, clamav/trunk/config.patch)
===================================================================
--- testing-i686/config.patch	                        (rev 0)
+++ testing-i686/config.patch	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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

Copied: clamav/repos/testing-i686/install (from rev 154472, clamav/trunk/install)
===================================================================
--- testing-i686/install	                        (rev 0)
+++ testing-i686/install	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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
+}

Copied: clamav/repos/testing-i686/logrotate (from rev 154472, clamav/trunk/logrotate)
===================================================================
--- testing-i686/logrotate	                        (rev 0)
+++ testing-i686/logrotate	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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
+}

Copied: clamav/repos/testing-i686/rc.d (from rev 154472, clamav/trunk/rc.d)
===================================================================
--- testing-i686/rc.d	                        (rev 0)
+++ testing-i686/rc.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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/testing-i686/tmpfiles.d (from rev 154472, clamav/trunk/tmpfiles.d)
===================================================================
--- testing-i686/tmpfiles.d	                        (rev 0)
+++ testing-i686/tmpfiles.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav

Copied: clamav/repos/testing-x86_64/PKGBUILD (from rev 154472, clamav/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-03-28 23:18:37 UTC (rev 154473)
@@ -0,0 +1,61 @@
+# $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/testing-x86_64/conf.d (from rev 154472, clamav/trunk/conf.d)
===================================================================
--- testing-x86_64/conf.d	                        (rev 0)
+++ testing-x86_64/conf.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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"

Copied: clamav/repos/testing-x86_64/config.patch (from rev 154472, clamav/trunk/config.patch)
===================================================================
--- testing-x86_64/config.patch	                        (rev 0)
+++ testing-x86_64/config.patch	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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

Copied: clamav/repos/testing-x86_64/install (from rev 154472, clamav/trunk/install)
===================================================================
--- testing-x86_64/install	                        (rev 0)
+++ testing-x86_64/install	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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
+}

Copied: clamav/repos/testing-x86_64/logrotate (from rev 154472, clamav/trunk/logrotate)
===================================================================
--- testing-x86_64/logrotate	                        (rev 0)
+++ testing-x86_64/logrotate	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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
+}

Copied: clamav/repos/testing-x86_64/rc.d (from rev 154472, clamav/trunk/rc.d)
===================================================================
--- testing-x86_64/rc.d	                        (rev 0)
+++ testing-x86_64/rc.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -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/testing-x86_64/tmpfiles.d (from rev 154472, clamav/trunk/tmpfiles.d)
===================================================================
--- testing-x86_64/tmpfiles.d	                        (rev 0)
+++ testing-x86_64/tmpfiles.d	2012-03-28 23:18:37 UTC (rev 154473)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav




More information about the arch-commits mailing list