[arch-commits] Commit in clamav/repos (24 files)
Gaetan Bisson
bisson at archlinux.org
Fri Dec 16 09:17:40 UTC 2011
Date: Friday, December 16, 2011 @ 04:17:40
Author: bisson
Revision: 145066
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
clamav/repos/extra-i686/PKGBUILD
(from rev 145065, clamav/trunk/PKGBUILD)
clamav/repos/extra-i686/conf.d
(from rev 145065, clamav/trunk/conf.d)
clamav/repos/extra-i686/config.patch
(from rev 145065, clamav/trunk/config.patch)
clamav/repos/extra-i686/install
(from rev 145065, clamav/trunk/install)
clamav/repos/extra-i686/logrotate
(from rev 145065, clamav/trunk/logrotate)
clamav/repos/extra-i686/rc.d
(from rev 145065, clamav/trunk/rc.d)
clamav/repos/extra-x86_64/PKGBUILD
(from rev 145065, clamav/trunk/PKGBUILD)
clamav/repos/extra-x86_64/conf.d
(from rev 145065, clamav/trunk/conf.d)
clamav/repos/extra-x86_64/config.patch
(from rev 145065, clamav/trunk/config.patch)
clamav/repos/extra-x86_64/install
(from rev 145065, clamav/trunk/install)
clamav/repos/extra-x86_64/logrotate
(from rev 145065, clamav/trunk/logrotate)
clamav/repos/extra-x86_64/rc.d
(from rev 145065, clamav/trunk/rc.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-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
---------------------------+
extra-i686/PKGBUILD | 112 +++++++++++++++++------------------
extra-i686/conf.d | 16 ++---
extra-i686/config.patch | 60 +++++++++---------
extra-i686/install | 28 ++++----
extra-i686/logrotate | 16 ++---
extra-i686/rc.d | 139 +++++++++++++++++++++-----------------------
extra-x86_64/PKGBUILD | 112 +++++++++++++++++------------------
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 | 139 +++++++++++++++++++++-----------------------
12 files changed, 366 insertions(+), 376 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/PKGBUILD 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,56 +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.3
-pkgrel=1
-pkgdesc='Anti-virus toolkit for Unix'
-arch=('i686' 'x86_64')
-depends=('bzip2' 'zlib' 'libtool')
-options=('!libtool')
-license=('GPL')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-url='http://www.clamav.net/'
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'rc.d'
- 'conf.d'
- 'logrotate'
- 'config.patch')
-sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
- '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
- 'cb116cdab49a810381a515cbcfb6a6c148547f07'
- 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
- '701a61571788d10ff7af01597785835c6bfea918')
-
-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 ../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 145065, clamav/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,56 @@
+# $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.3
+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/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'rc.d'
+ 'conf.d'
+ 'logrotate'
+ 'config.patch')
+sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
+ '50cfe02c97e4297a0efd25b23142408380305d30'
+ 'cb116cdab49a810381a515cbcfb6a6c148547f07'
+ 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
+ '701a61571788d10ff7af01597785835c6bfea918')
+
+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 ../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
+}
Deleted: extra-i686/conf.d
===================================================================
--- extra-i686/conf.d 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/conf.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 145065, clamav/trunk/conf.d)
===================================================================
--- extra-i686/conf.d (rev 0)
+++ extra-i686/conf.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/config.patch 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 /var/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 145065, clamav/trunk/config.patch)
===================================================================
--- extra-i686/config.patch (rev 0)
+++ extra-i686/config.patch 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 /var/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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/install 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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
-
- install -d /var/{log,run}/clamav
- chown clamav:root /var/{log,run}/clamav
- chown -R clamav:clamav /var/lib/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 145065, clamav/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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
+
+ install -d /var/log/clamav
+ chown clamav:root /var/log/clamav
+ chown -R clamav:clamav /var/lib/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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/logrotate 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
- create 644 clamav clamav
- sharedscripts
- postrotate
- /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
- /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: clamav/repos/extra-i686/logrotate (from rev 145065, clamav/trunk/logrotate)
===================================================================
--- extra-i686/logrotate (rev 0)
+++ extra-i686/logrotate 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,8 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+ create 644 clamav clamav
+ sharedscripts
+ postrotate
+ /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: extra-i686/rc.d
===================================================================
--- extra-i686/rc.d 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-i686/rc.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/clamav ] && . /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 clamd isn't started first, notifyclamd fails at times
- 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
-
- # give clamd enough time to start
- sleep 1
-
- if [ "$START_FRESHCLAM" == "yes" ]; then
- stat_busy "Starting FreshClam"
- [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/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
- # will not start if not fully stopped, so sleep
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: clamav/repos/extra-i686/rc.d (from rev 145065, clamav/trunk/rc.d)
===================================================================
--- extra-i686/rc.d (rev 0)
+++ extra-i686/rc.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav
+[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/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 /var/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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/PKGBUILD 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,56 +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.3
-pkgrel=1
-pkgdesc='Anti-virus toolkit for Unix'
-arch=('i686' 'x86_64')
-depends=('bzip2' 'zlib' 'libtool')
-options=('!libtool')
-license=('GPL')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-url='http://www.clamav.net/'
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'rc.d'
- 'conf.d'
- 'logrotate'
- 'config.patch')
-sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
- '7f15f0b13a1c11235bc99ef0add01efd8a442f07'
- 'cb116cdab49a810381a515cbcfb6a6c148547f07'
- 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
- '701a61571788d10ff7af01597785835c6bfea918')
-
-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 ../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 145065, clamav/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,56 @@
+# $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.3
+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/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'rc.d'
+ 'conf.d'
+ 'logrotate'
+ 'config.patch')
+sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655'
+ '50cfe02c97e4297a0efd25b23142408380305d30'
+ 'cb116cdab49a810381a515cbcfb6a6c148547f07'
+ 'be3310d2b41a68ce06e33c84ab68ffe59fdce104'
+ '701a61571788d10ff7af01597785835c6bfea918')
+
+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 ../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
+}
Deleted: extra-x86_64/conf.d
===================================================================
--- extra-x86_64/conf.d 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/conf.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 145065, clamav/trunk/conf.d)
===================================================================
--- extra-x86_64/conf.d (rev 0)
+++ extra-x86_64/conf.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/config.patch 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 /var/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 145065, clamav/trunk/config.patch)
===================================================================
--- extra-x86_64/config.patch (rev 0)
+++ extra-x86_64/config.patch 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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 /var/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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/install 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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
-
- install -d /var/{log,run}/clamav
- chown clamav:root /var/{log,run}/clamav
- chown -R clamav:clamav /var/lib/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 145065, clamav/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2011-12-16 09:17:40 UTC (rev 145066)
@@ -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
+
+ install -d /var/log/clamav
+ chown clamav:root /var/log/clamav
+ chown -R clamav:clamav /var/lib/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 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/logrotate 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
- create 644 clamav clamav
- sharedscripts
- postrotate
- /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
- /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: clamav/repos/extra-x86_64/logrotate (from rev 145065, clamav/trunk/logrotate)
===================================================================
--- extra-x86_64/logrotate (rev 0)
+++ extra-x86_64/logrotate 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,8 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+ create 644 clamav clamav
+ sharedscripts
+ postrotate
+ /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: extra-x86_64/rc.d
===================================================================
--- extra-x86_64/rc.d 2011-12-16 09:16:44 UTC (rev 145065)
+++ extra-x86_64/rc.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/clamav ] && . /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 clamd isn't started first, notifyclamd fails at times
- 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
-
- # give clamd enough time to start
- sleep 1
-
- if [ "$START_FRESHCLAM" == "yes" ]; then
- stat_busy "Starting FreshClam"
- [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/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
- # will not start if not fully stopped, so sleep
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: clamav/repos/extra-x86_64/rc.d (from rev 145065, clamav/trunk/rc.d)
===================================================================
--- extra-x86_64/rc.d (rev 0)
+++ extra-x86_64/rc.d 2011-12-16 09:17:40 UTC (rev 145066)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav
+[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/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 /var/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
More information about the arch-commits
mailing list