[arch-commits] Commit in clamav/trunk (PKGBUILD conf.d rc.d)

[Gaetan Bisson]

    Date: Monday, May 13, 2013 @ 12:02:51
  Author: bisson
Revision: 185318

remove deprecated rc script

Modified:
  clamav/trunk/PKGBUILD
Deleted:
  clamav/trunk/conf.d
  clamav/trunk/rc.d

----------+
 PKGBUILD |    8 -------
 conf.d   |    8 -------
 rc.d     |   66 -------------------------------------------------------------
 3 files changed, 1 insertion(+), 81 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 10:00:54 UTC (rev 185317)
+++ PKGBUILD	2013-05-13 10:02:51 UTC (rev 185318)
@@ -12,18 +12,14 @@
 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'
           'cda9a087e5593992150cb456e34c5f6f589aca82'
           '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
@@ -61,8 +57,6 @@
 	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

Deleted: conf.d
===================================================================
--- conf.d	2013-05-13 10:00:54 UTC (rev 185317)
+++ conf.d	2013-05-13 10:02:51 UTC (rev 185318)
@@ -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"

Deleted: rc.d
===================================================================
--- rc.d	2013-05-13 10:00:54 UTC (rev 185317)
+++ rc.d	2013-05-13 10:02:51 UTC (rev 185318)
@@ -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