[csw-devel] SF.net SVN: gar:[2523] csw/mgar/pkg/clamav/trunk

[bonivart at users.sourceforge.net]

Revision: 2523
          http://gar.svn.sourceforge.net/gar/?rev=2523&view=rev
Author:   bonivart
Date:     2008-12-11 09:05:46 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
clamav: fixed ownership issues, removed postinstall

Modified Paths:
--------------
    csw/mgar/pkg/clamav/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2008-12-11 07:15:12 UTC (rev 2522)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2008-12-11 09:05:46 UTC (rev 2523)
@@ -19,13 +19,13 @@
 SF_PROJ = clamav
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall)
+DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall)
 DISTFILES += $(call admfiles,CSWlibclamav,)
 
 SPKG_DESC_CSWclamav = Clam AntiVirus
 SPKG_DESC_CSWlibclamav = Clam AntiVirus Library
 
-REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils
+REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWtcpwrap
 REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -45,7 +45,7 @@
 PKGFILES_CSWlibclamav  = $(libdir)/.*
 PKGFILES_CSWlibclamav += $(includedir)/.*
 
-PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'
+PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }'
 
 SPKG_SOURCEURL = http://www.clamav.net/
 

Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall	2008-12-11 07:15:12 UTC (rev 2522)
+++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall	2008-12-11 09:05:46 UTC (rev 2523)
@@ -1,15 +0,0 @@
-# Postinstall script for clamav
-# 2007-01-07 Add csw.conf support
-# 2008-12-10 Peter Bonivart
-
-# if /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf
-if [ -f /opt/csw/etc/clamav.conf ]; then
-        /usr/bin/mv /opt/csw/etc/clamav.conf /opt/csw/etc/clamd.conf
-	echo '  Moved /opt/csw/etc/clamav.conf to /opt/csw/etc/clamd.conf'
-fi
-
-# assign user for /var/opt/csw/clamav directory
-chown -R clamav /var/opt/csw/clamav
-
-# display message
-echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.