Revision: 3607
http://gar.svn.sourceforge.net/gar/?rev=3607&view=rev
Author: bonivart
Date: 2009-03-06 16:56:03 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
clamav: more fixes
Modified Paths:
--------------
csw/mgar/pkg/clamav/trunk/Makefile
csw/mgar/pkg/clamav/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall
csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec
csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall
csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec
Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/Makefile 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,7 +1,4 @@
# http://www.clamav.net/snapshot/clamav-devel-latest.tar.gz
-# review deps
-# - remove: gmp, tcp wrappers (?)
-# - add: ncurses, unrar (?)
GARNAME = clamav
GARVERSION = 0.95rc1
@@ -22,15 +19,15 @@
MASTER_SITES = http://www.clamav.net/snapshot/
#DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES = $(GARNAME)-devel-latest.tar.gz
-#DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall)
-DISTFILES += $(call admfiles,CSWclamav,)
-DISTFILES += $(call admfiles,CSWlibclamav,)
-SPKG_DESC_CSWclamav = Clam AntiVirus
-SPKG_DESC_CSWlibclamav = Clam AntiVirus Library
+PACKAGES = CSWclamav CSWlibclamav
+CATALOGNAME_CSWclamav = clamav
+SPKG_DESC_CSWclamav = $(DESCRIPTION)
+CATALOGNAME_CSWlibclamav = libclamav
+SPKG_DESC_CSWlibclamav = $(DESCRIPTION) Library
-REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWtcpwrap
-REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv
+REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWncurses
+REQUIRED_PKGS_CSWlibclamav = CSWzlib CSWbzip2 CSWiconv
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -43,7 +40,7 @@
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-clamav
CONFIGURE_ARGS += --enable-milter
-CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail
+# unrecognized by 0.95rc1? CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail
CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db
CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME)
@@ -54,6 +51,8 @@
PKGFILES_CSWlibclamav += $(docdir)/libclamav/.*
# fix usergroup stuff
+## files/dirs owned by clamav user
+## move cswusergroup file /opt/csw/etc/clamav/
PROTOTYPE_FILTER = awk ' \
$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } \
$$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } \
@@ -67,6 +66,8 @@
SPKG_SOURCEURL = http://www.clamav.net/
TEST_TARGET = check
+
+# can not run checkpkg due to libs in separate package
ENABLE_CHECK=0
include gar/category.mk
@@ -93,7 +94,7 @@
@mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW
@ginstall -d $(DOCDEST)
@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
- @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE
+# @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE
@ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW
@ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW
@ginstall -d $(DOCDEST)/contrib
@@ -102,6 +103,6 @@
@ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib
@ginstall -d $(DOCDEST)/html
@ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html
- @ginstall -d $(DESTDIR)$(docdir)/libclamav
- @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE
+# @ginstall -d $(DESTDIR)$(docdir)/libclamav
+# @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/clamav/trunk/checksums
===================================================================
--- csw/mgar/pkg/clamav/trunk/checksums 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/checksums 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,3 +1 @@
-9ae62dd70ac3dabd775c2c9cba7cfd73 download/clamav-devel-latest.tar.gz
-dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec
-8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec
+2c7c582b6182353dfdd25931c80bc781 download/clamav-devel-latest.tar.gz
Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,56 +0,0 @@
-# checkinstall script for Clamav
-# Verify that group and user clamav exists
-# 2008-12-10 Peter Bonivart
-
-ADDUSER=0
-ADDGROUP=0
-# Next, verify that group clamav exists.
-# First check target machines group file, THEN check
-# NIS/NIS+/whatever
-
-/usr/bin/grep '^clamav:' /etc/group >/dev/null
-if [ $? -ne 0 ] ; then
- /usr/bin/getent group clamav >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDGROUP=1
- fi
-fi
-
-if [ "$NEEDGROUP" = 1 ] ; then
- echo "***"
- echo "Group clamav must exist for this package install."
- echo "clamav group will be added."
- ADDGROUP=1
-else
- echo "clamav group detected"
-fi
-# Next, verify that user clamav exists.
-# First check target machines password file, THEN check
-# NIS/NIS+/whatever
-
-/usr/bin/grep '^clamav:' /etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
- /usr/bin/getent passwd clamav >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDUSER=1
- fi
-fi
-
-if [ "$NEEDUSER" = 1 ] ; then
- echo "***"
- echo "User clamav must exist for this package install."
- echo "clamav user will be added."
- ADDUSER=1
-else
- echo "clamav user detected"
-fi
-
-# Make env variables available to other packaging scripts
-
-cat >$1 <<!
-
-ADDGROUP='$ADDGROUP'
-ADDUSER='$ADDUSER'
-!
-
-exit 0
Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,7 +0,0 @@
-%var bitname clamav
-%var pkgname CSWclamav
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/clamav/LICENSE for license information.
-
Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,24 +0,0 @@
-# preinstall for clamav
-# Add the user and group clamav if told to by checkinstall script.
-# 2008-12-10 Peter Bonivart
-
-# If installing on a filesystem that is not running the OS, exit this script.
-if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi
-
-if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then
- PKG_INSTALL_ROOT="/"
-fi
-
-MYHOME=/var/spool
-
-if [ "$ADDGROUP" = "1" ] ; then
- chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd clamav
- echo "Added clamav group."
-fi
-if [ "$ADDUSER" = "1" ] ; then
- chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g clamav clamav
- chroot $PKG_INSTALL_ROOT /usr/sbin/usermod -c "Clamav user" -d $MYHOME -s /bin/false clamav
- echo "Added clamav user."
-fi
-
-exit 0
Deleted: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2009-03-06 16:36:20 UTC (rev 3606)
+++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2009-03-06 16:56:03 UTC (rev 3607)
@@ -1,7 +0,0 @@
-%var bitname libclamav
-%var pkgname CSWlibclamav
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/libclamav/LICENSE for license information.
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.