[csw-devel] SF.net SVN: gar:[8045] csw/mgar/pkg/amavisd-new/trunk

idogan23 at users.sourceforge.net idogan23 at users.sourceforge.net
Sun Jan 17 17:49:06 CET 2010


Revision: 8045
          http://gar.svn.sourceforge.net/gar/?rev=8045&view=rev
Author:   idogan23
Date:     2010-01-17 16:49:06 +0000 (Sun, 17 Jan 2010)

Log Message:
-----------
amavisd-new: fixed postinstall script bug 4138, fixed dependancy bug 4137

Modified Paths:
--------------
    csw/mgar/pkg/amavisd-new/trunk/Makefile
    csw/mgar/pkg/amavisd-new/trunk/checksums
    csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall

Added Paths:
-----------
    csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup

Removed Paths:
-------------
    csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype

Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/Makefile	2010-01-17 16:39:57 UTC (rev 8044)
+++ csw/mgar/pkg/amavisd-new/trunk/Makefile	2010-01-17 16:49:06 UTC (rev 8045)
@@ -13,15 +13,14 @@
 
 MASTER_SITES = http://www.ijs.si/software/amavisd/#download
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += CSWamavisdnew.cswusergroup
 DISTFILES += CSWamavisdnew.postinstall
 DISTFILES += CSWamavisdnew.preinstall
-DISTFILES += CSWamavisdnew.prototype
 
-#DISTFILES += $(call admfiles,CSWamavisdnew, postinstall preinstall prototype)
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+REQUIRED_PKGS += CSWbdb47
 REQUIRED_PKGS += CSWperl
 REQUIRED_PKGS += CSWcswclassutils
 REQUIRED_PKGS += CSWpmiostringy
@@ -46,20 +45,27 @@
 PATCHFILES += p0f-analyzer.pl.diff
 
 SPKG_CLASSES = none cswinitsmf
+PROTOTYPE_FILTER  = awk ' \
+    $$$$3 ~ /\/init.d\/cswamavisdnew$$$$/ { $$$$2 = "cswinitsmf" } \
+    $$$$3 ~ /\/csw\/amavisd-new.conf$$$$/ { $$$$2 = "cswcpsampleconf" } \
+    { print }'
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-AMAVISBIN=amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl
+PCONFDIR = $(DESTDIR)/etc/opt/csw
+PVARDIR = $(DESTDIR)/var/opt/csw/$(GARNAME)
+
+AMAVISBIN = amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl
 AMAVISBIN += amavisd-nanny
 AMAVISBIN += amavisd-release
 AMAVISBIN += p0f-analyzer.pl
 
-AMAVISSBIN=amavisd-new
+AMAVISSBIN = amavisd-new
 
-AMAVISDOC=LDAP.schema
+AMAVISDOC = LDAP.schema
 AMAVISDOC += README_FILES
 AMAVISDOC += RELEASE_NOTES
 AMAVISDOC += AAAREADME.first
@@ -81,6 +87,7 @@
 	cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 755 files/cswamavisdnew $(DESTDIR)/etc/opt/csw/init.d/cswamavisdnew
+	ginstall -m 644 files/CSWamavisdnew.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWamavisdnew/cswusergroup
 	$(MAKECOOKIE)
 
 include gar/category.mk

Modified: csw/mgar/pkg/amavisd-new/trunk/checksums
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/checksums	2010-01-17 16:39:57 UTC (rev 8044)
+++ csw/mgar/pkg/amavisd-new/trunk/checksums	2010-01-17 16:49:06 UTC (rev 8045)
@@ -1,10 +1,10 @@
-2df80947353821e6e94fcad09a1bb3da  download/CSWamavisdnew.postinstall
-171767585ab6662c0cbedae26e9baa2c  download/CSWamavisdnew.preinstall
-631e33b02eb813b9f3f13db03b5c12eb  download/CSWamavisdnew.prototype
-b9cafe6715bc2703ac9411f24f248cd3  download/amavisd-agent.diff
-3e81998c8b933129870e3cab68d40261  download/amavisd-nanny.diff
-02b0bd38b40258841c60479603dc6842  download/amavisd-new-2.6.3.tar.gz
-f218d10e5280940268a3ffaa125a00ae  download/amavisd-release.diff
-9c3d4118cf3837e559a6026d6b89b377  download/amavisd.conf.diff
-071af9fb79ee5e9d045905043fea2b96  download/amavisd.diff
-befafc9594d5e1c1c8710b7d4d129d0b  download/p0f-analyzer.pl.diff
+b1af7a961c5f3111efeb72d83b21a0fd  CSWamavisdnew.cswusergroup
+b12bd6b3223756e47e95347fc177bd7b  CSWamavisdnew.postinstall
+171767585ab6662c0cbedae26e9baa2c  CSWamavisdnew.preinstall
+b9cafe6715bc2703ac9411f24f248cd3  amavisd-agent.diff
+3e81998c8b933129870e3cab68d40261  amavisd-nanny.diff
+02b0bd38b40258841c60479603dc6842  amavisd-new-2.6.3.tar.gz
+f218d10e5280940268a3ffaa125a00ae  amavisd-release.diff
+9c3d4118cf3837e559a6026d6b89b377  amavisd.conf.diff
+071af9fb79ee5e9d045905043fea2b96  amavisd.diff
+befafc9594d5e1c1c8710b7d4d129d0b  p0f-analyzer.pl.diff

Added: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup	2010-01-17 16:49:06 UTC (rev 8045)
@@ -0,0 +1 @@
+amavisn:amavisn:amavisd-new pseudo user:/:/bin/false::

Modified: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall	2010-01-17 16:39:57 UTC (rev 8044)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall	2010-01-17 16:49:06 UTC (rev 8045)
@@ -17,25 +17,25 @@
         echo "Running db_verify (before upgrade) on $DB_HOME" >>$installlog
         for each_db in `ls *.db`
         do
-          ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1
+          ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1
         done
 
         # Update the database environment to the new value
         echo "Running db_recover on $DB_HOME" >>$installlog
-        ${BASEDIR}/opt/csw/bin/db_recover -h $DB_HOME >>$installlog 2>&1
+        ${BASEDIR}/opt/csw/bdb47/bin/db_recover -h $DB_HOME >>$installlog 2>&1
 
         # Upgrade each file.  This does nothing if no upgrade is needed.
         echo "Running db_upgrade on $DB_HOME" >>$installlog
         for each_db in `ls *.db`
         do
-          ${BASEDIR}/opt/csw/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1
+          ${BASEDIR}/opt/csw/bdb47/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1
         done
 
         # Verify each file
         echo "Running db_verify (after upgrade) on $DB_HOME" >>$installlog
         for each_db in `ls *.db`
         do
-          ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1
+          ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1
         done
 fi
 

Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype	2010-01-17 16:39:57 UTC (rev 8044)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype	2010-01-17 16:49:06 UTC (rev 8045)
@@ -1,74 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/amavisd-agent 0755 root bin
-f none /opt/csw/bin/amavisd-nanny 0755 root bin
-f none /opt/csw/bin/amavisd-release 0755 root bin
-f none /opt/csw/bin/p0f-analyzer.pl 0755 root bin
-d none /opt/csw/etc 0755 root bin
-f none /opt/csw/etc/amavisd-new.conf.CSW 0644 root bin
-d none /opt/csw/sbin 0755 root bin
-f none /opt/csw/sbin/amavisd-new 0755 root bin
-d none /opt/csw/share/doc/amavisd-new 0755 root bin
-f none /opt/csw/share/doc/amavisd-new/AAAREADME.first 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/LDAP.schema 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.banned 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.chroot 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.contributed 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier-old 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.customize 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3_app 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app2 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.ldap 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.lookups 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.milter 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.performance 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.policy-on-notifications 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix.html 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.protocol 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-mysql 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-pg 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/TODO-SNMP-AGENT 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/amavisd-new-docs.html 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/blank.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/1.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/10.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/11.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/12.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/13.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/14.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/15.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/2.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/3.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/4.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/5.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/6.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/7.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/8.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/9.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/caution.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/draft.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/home.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/important.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/next.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/note.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/prev.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/tip.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-blank.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-minus.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin
-f none /opt/csw/share/doc/amavisd-new/amavisd.conf-sample 0644 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswamavisdnew 0755 root bin


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



More information about the devel mailing list