Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10213
Modified Files:
clamav.info
Log Message:
Put pid file where it is actually found by launch daemon.
Index: clamav.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/clamav.info,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- clamav.info 30 Mar 2009 14:23:30 -0000 1.33
+++ clamav.info 5 Apr 2009 09:35:05 -0000 1.34
@@ -1,7 +1,7 @@
Info3: <<
Package: clamav
Version: 0.95
-Revision: 12
+Revision: 13
Description: Clam Anti-Virus scanner
DescDetail: <<
@@ -77,8 +77,9 @@
#!/bin/sh -ev
/usr/bin/make install DESTDIR=%d
- for configfile in clamd.conf freshclam.conf ; do
- /usr/bin/sed 's/^Example/#Example/' etc/$configfile > %i/etc/$configfile
+ for configfile in clamav-milter.conf clamd.conf freshclam.conf ; do
+ /usr/bin/sed -e "s/^Example/#Example/ ; s:^#PidFile /var/run:PidFile
/var/run:" \
+ etc/$configfile > %i/etc/$configfile
done
/usr/sbin/chown -R clamav:admin %i/var/db/%n
@@ -93,7 +94,7 @@
#Remove CVS directories
/usr/bin/find %i -name "CVS" -type d -depth -exec rm -rf \{\} \;
<<
-ConfFiles: %p/etc/freshclam.conf
+ConfFiles: %p/etc/clamav-milter.conf %p/etc/freshclam.conf
DocFiles: AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE
SplitOff: <<
@@ -148,7 +149,7 @@
<daemon name="clamd">
<executable background="yes">%p/sbin/clamd</executable>
<configfile>%p/etc/clamd.conf</configfile>
- <pidfile>%p/var/run/clamd.pid</pidfile>
+ <pidfile>/var/run/clamd.pid</pidfile>
</daemon>
</service>
<<
@@ -157,7 +158,9 @@
/Library/StartupItems/daemonic-clamav/daemonic-clamav start
<<
PreRmScript: <<
- /Library/StartupItems/daemonic-clamav/daemonic-clamav stop
+ # deamonic knows nothing about 'stop'
+ #/Library/StartupItems/daemonic-clamav/daemonic-clamav stop
+ kill -s TERM `cat /var/run/clamd.pid`
if [ $1 != "upgrade" ]; then
daemonic remove clamav
fi
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
