[csw-devel] SF.net SVN: gar:[7996] csw/mgar/pkg/postfix/branches/postfix-2.6

[skayser at users.sourceforge.net]

Revision: 7996
          http://gar.svn.sourceforge.net/gar/?rev=7996&view=rev
Author:   skayser
Date:     2010-01-14 01:30:15 +0000 (Thu, 14 Jan 2010)

Log Message:
-----------
postfix: 2.6 branch, checkinstall bail out on potential mail spool files

Modified Paths:
--------------
    csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile
    csw/mgar/pkg/postfix/branches/postfix-2.6/checksums
    csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall
    csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW

Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile	2010-01-14 00:00:53 UTC (rev 7995)
+++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile	2010-01-14 01:30:15 UTC (rev 7996)
@@ -1,19 +1,17 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! Obsolete postinstall scripts:
-#   #3060 http://www.opencsw.org/bugtrack/view.php?id=3060
-#   #2964 http://www.opencsw.org/bugtrack/view.php?id=2964
-#   #1943 http://www.opencsw.org/bugtrack/view.php?id=1943
-# ! Handle spool location change (bail out and force user interaction?)
 # ! Handle system integration (refer to README.CSW or alike), see
 #   http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313
-# ! Does the currently available package preserve configuration files on
-#   removal?
 # ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010)
 # ! Verify CONFIG_FILES list (can this be generated on the fly?)
 # ! Ship simple default configuration
-# ! Build, install and test package (works? spool permissions ok?)
+# ! Build, install and test package (bails out on existing spool files?
+#   works? spool permissions ok?)
 #   WRT to permissions, run "postfix set-permissions" and compare
 #
+# NICE TO KNOW
+# - 2.4.6,REV=2008.05.28 preserves modified configuration files via
+#   package-shipped CAS class csw_conf.
+#
 GARNAME = postfix
 GARVERSION = 2.6.2
 CATEGORIES = server

Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums	2010-01-14 00:00:53 UTC (rev 7995)
+++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums	2010-01-14 01:30:15 UTC (rev 7996)
@@ -1,4 +1,2 @@
-63ac43075e092255cb266e5270ce5364  download/CSWpostfix.cswusergroup
-76e992eb49e5d2d8c51305be8891566f  download/CSWpostfix.postinstall
-980c70abf5ea711adec41f3dd4e37141  download/CSWpostfix.postremove
-1f0edbd521d2b0473626f4d61e8bb4eb  download/postfix-2.6.2.tar.gz
+64dadd7a3737c6a82211b301e380a31a  CSWpostfix.checkinstall
+1f0edbd521d2b0473626f4d61e8bb4eb  postfix-2.6.2.tar.gz

Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall	2010-01-14 00:00:53 UTC (rev 7995)
+++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall	2010-01-14 01:30:15 UTC (rev 7996)
@@ -43,4 +43,29 @@
   fi
 done
 
+# Verify that there are no possibly important files in the old spool location
+# (where old <= 2.4.6,REV=2008.05.28). Bail out otherwise and instruct user to
+# manually migrate. Skips named pipes as well as all files in pid/.
+old_spooldir="/opt/csw/var/spool/postfix/"
+new_spooldir="/var/opt/csw/
+old_spoolfiles=`find ${PKG_INSTALL_ROOT}/opt/csw/var/spool/postfix/ \
+  -name pid -prune -o ! -type d ! -type p | grep -v '/pid$'`
+if [ "${old_spoolfiles}" != "" ]; then
+    echo
+    echo "*******************************************************************"
+    echo "* The old spool directory ${old_spooldir} still contains files.    "
+    echo "* Please migrate these as needed to ${new_spooldir}.               "
+    echo "*                                                                  "
+    echo "* Installation will now terminate. Please restart the installation "
+    echo "* once the files have been migrated or removed.                    "
+    echo "*******************************************************************"
+    echo
+    echo "*******************************************************************"
+    echo "* This is the list of affected files:                              "
+    echo ${old_spoolfiles}
+    echo
+
+    exit 1
+fi
+
 exit 0

Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW	2010-01-14 00:00:53 UTC (rev 7995)
+++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW	2010-01-14 01:30:15 UTC (rev 7996)
@@ -1,11 +1,13 @@
 postfix (2.6.2,REV=2010.01.13)
 
-  * Updated to 2.6.2. (Closes #3580, #3700, #3970)
+  * Adopted and updated to 2.6.2. (Closes #3580, #3700, #3970)
   * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
   * Added Cyrus SASL support. (Closes #2843)
   * Added hash table support via bdb. (Closes #2097)
   * Init / SMF handling now done with cswclassutils. (Closes #3946)
   * Now depends on pcre_rt instead of pcre. (Closes #3017)
   * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063)
+  * Doesn't automatically substitute system sendmail binaries any more.
+    Please refer to README.CSW instead. (Closes #1943, #2964, #3060) 
 
  -- Sebastian Kayser <skayser at opencsw.org>  Wed, 13 Jan 2010 22:01:36 +0100


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