[csw-devel] SF.net SVN: gar:[3800] csw/mgar/pkg/dovecot/trunk

[skayser at users.sourceforge.net]

Revision: 3800
          http://gar.svn.sourceforge.net/gar/?rev=3800&view=rev
Author:   skayser
Date:     2009-03-18 13:44:54 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
dovecot: adjusted path references

Modified Paths:
--------------
    csw/mgar/pkg/dovecot/trunk/Makefile
    csw/mgar/pkg/dovecot/trunk/checksums
    csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW
    csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-18 04:12:10 UTC (rev 3799)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-18 13:44:54 UTC (rev 3800)
@@ -50,6 +50,8 @@
 
 # See http://dovecot.org/list/dovecot/2009-February/037273.html
 PATCHFILES = patch-authcrash.diff
+# Adjust the comment about file paths in the example conf header
+PATCHFILES = patch-exampleconf.diff
 
 # Override some paths for configure
 localstatedir=/var/opt/csw
@@ -83,6 +85,19 @@
 
 include gar/category.mk
 
+# Adjust file paths in various files. Not a prerequisite to the remaining build
+# process, but i found it easiest # to put it here and not clutter post-install
+# even more
+pre-install-modulated:
+	@perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh
+	@perl -pi -e '\
+		s| /var/run| /var/opt/csw/run|; \
+		s| /etc/ssl| /opt/csw/ssl|; \
+		s| /usr/libexec| /opt/csw/libexec|; \
+		s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \
+		' $(WORKSRC)/dovecot-example.conf
+	@$(MAKECOOKIE)
+
 # Maybe there is a nicer way to build this via modulations ...
 build-and-install-sieveplugin: CONFIGURE_ARGS = $(DIRPATHS)
 build-and-install-sieveplugin: CONFIGURE_ARGS += --with-dovecot=../$(WORKSRC)
@@ -97,6 +112,7 @@
 		$(BUILD_ENV) gmake $(BUILD_ARGS); \
 		$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; )
 	@rm -rf dovecot-sieve-1.1.6*
+	@$(MAKECOOKIE)
 
 post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT
 post-install-modulated: CSWDOCS = changelog.CSW README.CSW

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2009-03-18 04:12:10 UTC (rev 3799)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2009-03-18 13:44:54 UTC (rev 3800)
@@ -1,3 +1,2 @@
 c973eb41aca79fb16630a16f0d84f765  download/dovecot-1.1.11.tar.gz
-f8e71a5be649e71131cf1ad7ea11019a  download/CSWdovecot.preinstall
-1f39cae3a38d10169fe31f246095b67f  download/patch-authcrash.diff
+765a31bece26ed3cebee784dc4aa8216  download/patch-exampleconf.diff

Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW	2009-03-18 04:12:10 UTC (rev 3799)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW	2009-03-18 13:44:54 UTC (rev 3800)
@@ -1,7 +1,7 @@
 dovecot (1.1.11) REV=2009.03.15
 
   * Package adopted again and updated to 1.1.11.
-  * Tested and validated LDAP interopability with PAM. (Closes: #)
-  * TBD ....
+  * Tested and validated LDAP interopability with PAM. (Closes: #2760)
+  * Adjusted SSLDIR in mkcert.sh. (Closes: #3027)
 
  -- Sebastian Kayser <skayser at opencsw.org>  Sun, 15 Mar 2009 18:19:59 +0100

Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot	2009-03-18 04:12:10 UTC (rev 3799)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot	2009-03-18 13:44:54 UTC (rev 3800)
@@ -11,8 +11,8 @@
 test -x $DAEMON || exit 1
 set -e
 
-CONF=/opt/csw/etc/dovecot/dovecot.conf
-CONF_LOCAL=/etc/opt/csw/dovecot/dovecot.conf
+CONF=/opt/csw/etc/dovecot.conf
+CONF_LOCAL=/etc/opt/csw/dovecot.conf
 [ -f $CONF_LOCAL ] && CONF=$CONF_LOCAL
 
 base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'`
@@ -26,36 +26,32 @@
 
 case "$1" in
   start)
-    echo -n "Starting Dovecot"
+    echo "Starting Dovecot"
     $DAEMON -c $CONF
-    echo "."
     ;;
   stop)
     if test $running = yes; then
       echo "Stopping Dovecot"
       kill `cat $pidfile`
-      echo "."
     else
       echo "Dovecot is already stopped."
     fi
     ;;
   reload)
     if test $running = yes; then
-      echo -n "Reloading Dovecot configuration"
+      echo "Reloading Dovecot configuration"
       kill -HUP `cat $pidfile`
-      echo "."
     else
       echo "Dovecot isn't running."
     fi
     ;;
   restart|force-reload)
-    echo -n "Restarting Dovecot"
+    echo "Restarting Dovecot"
     if test $running = yes; then
       kill `cat $pidfile`
       sleep 1
     fi
     $DAEMON -c $CONF
-    echo "."
     ;;
   *)
     echo "Usage: /etc/init.d/dovecot {start|stop|reload|restart|force-reload}" >&2


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