From e3f225daecfd5cfea4af1a4e8ac4b6c46c7ec363 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 May 2013 00:28:39 -0700 Subject: Tue May 21 00:28:39 PDT 2013 --- extra/clamav/PKGBUILD | 15 ++++-------- extra/clamav/conf.d | 8 ------- extra/clamav/rc.d | 66 --------------------------------------------------- extra/clamav/service | 2 +- 4 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 extra/clamav/conf.d delete mode 100644 extra/clamav/rc.d (limited to 'extra/clamav') diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 92d1eca88..d6bb40f92 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $ +# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ # Contributor: Dale Blount # Contributor: Gregor Ibic # Maintainer: Gaetan Bisson pkgname=clamav pkgver=0.97.8 -pkgrel=1 +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') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') 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=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'df522b0488f3901e491f148c9300f6bae348c605' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' @@ -41,6 +37,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/clamav \ --with-dbdir=/var/lib/clamav \ --disable-clamav \ @@ -61,8 +58,6 @@ package() { 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 install -d -o 64 -g 64 "${pkgdir}"/run/clamav install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/extra/clamav/conf.d +++ /dev/null @@ -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" diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/extra/clamav/rc.d +++ /dev/null @@ -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 diff --git a/extra/clamav/service b/extra/clamav/service index 5bf9eb14e..86608c40e 100644 --- a/extra/clamav/service +++ b/extra/clamav/service @@ -4,7 +4,7 @@ Description=clamav daemon [Service] Type=forking PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/sbin/clamd +ExecStart=/usr/bin/clamd [Install] WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf