[csw-devel] SF.net SVN: gar:[3772] csw/mgar/pkg/dovecot/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Mon Mar 16 00:01:36 CET 2009
Revision: 3772
http://gar.svn.sourceforge.net/gar/?rev=3772&view=rev
Author: skayser
Date: 2009-03-15 23:01:36 +0000 (Sun, 15 Mar 2009)
Log Message:
-----------
dovecot: added cswusergroup, added cmusieve plugin, adjusted config file location
Modified Paths:
--------------
csw/mgar/pkg/dovecot/trunk/Makefile
csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot
Added Paths:
-----------
csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW
csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW
csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup
Removed Paths:
-------------
csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall
Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-15 06:17:09 UTC (rev 3771)
+++ csw/mgar/pkg/dovecot/trunk/Makefile 2009-03-15 23:01:36 UTC (rev 3772)
@@ -1,6 +1,3 @@
-# TODO
-# * Build and package Dovecot Sieve plugin http://wiki.dovecot.org/LDA/Sieve
-
GARNAME = dovecot
GARVERSION = 1.1.11
CATEGORIES = server
@@ -15,7 +12,6 @@
MASTER_SITES = http://dovecot.org/releases/1.1/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWdovecot.preinstall
PACKAGES = CSWdovecot CSWdovecotdevel
CATALOGNAME_CSWdovecotdevel = dovecot_devel
@@ -23,9 +19,9 @@
SPKG_SOURCEURL = http://dovecot.org/
SPKG_DESC_CSWdovecot = Secure IMAP server
SPKG_DESC_CSWdovecotdevel = Dovecot secure IMAP server header files
-SPKG_CLASSES_CSWdovecot = none cswcpsampleconf cswinitsmf
+SPKG_CLASSES_CSWdovecot = none cswusergroup cswcpsampleconf cswinitsmf
-REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt
+REQUIRED_PKGS_CSWdovecot = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq
REQUIRED_PKGS_CSWdovecot += CSWsasl CSWsqlite3 CSWzlib CSWlibnet
REQUIRED_PKGS_CSWdovecot += CSWbzip2 CSWiconv CSWcswclassutils
REQUIRED_PKGS_CSWdovecotdevel = CSWdovecot
@@ -47,25 +43,30 @@
# See http://dovecot.org/list/dovecot/2009-February/037273.html
PATCHFILES = patch-authcrash.diff
+# Override some paths for configure
+localstatedir=/var/opt/csw
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-pop3d
CONFIGURE_ARGS += --with-lda
CONFIGURE_ARGS += --with-ldap
CONFIGURE_ARGS += --with-mysql
+CONFIGURE_ARGS += --with-pgsql
CONFIGURE_ARGS += --with-sqlite
CONFIGURE_ARGS += --with-ssl=openssl
CONFIGURE_ARGS += --with-ssldir=/opt/csw/ssl
+CONFIGURE_ARGS += --with-zlib
+CONFIGURE_ARGS += --with-bzlib
CONFIGURE_ARGS += --enable-header-install
-CONFIGURE_ARGS += --localstatedir=/var/opt/csw
-CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(GARNAME)
-EXTRA_LIB = /opt/csw/mysql5/lib/mysql
-EXTRA_INC = /opt/csw/mysql5/include/mysql
+EXTRA_LIB = /opt/csw/mysql5/lib/mysql /opt/csw/postgresql/lib
+EXTRA_INC = /opt/csw/mysql5/include/mysql /opt/csw/postgresql/include
STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot
PROTOTYPE_FILTER = awk '\
$$$$3 ~ /\/init.d\/cswdovecot$$$$/ { $$$$2 = "cswinitsmf" } \
+ $$$$3 ~ /cswusergroup$$$$/ { $$$$2 = "cswusergroup" } \
$$$$3 ~ /dovecot.pem.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
$$$$3 ~ /dovecot.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
$$$$3 == "/opt/csw/ssl/certs" { next } \
@@ -74,21 +75,42 @@
include gar/category.mk
+# Maybe there is a nicer way to build this via modulations ...
+build-and-install-sieveplugin:
+ @echo
+ @echo [===== NOW BUILDING extra cmusieve plugin =====]
+ @echo
+ @wget -nc http://www.dovecot.org/releases/sieve/dovecot-sieve-1.1.6.tar.gz
+ @gtar xzf dovecot-sieve-1.1.6.tar.gz
+ @(cd dovecot-sieve-1.1.6; \
+ ./configure $(DIRPATHS) --with-dovecot=../$(WORKSRC); \
+ gmake; \
+ gmake DESTDIR=$(DESTDIR) install; )
+ @rm -rf dovecot-sieve-1.1.6*
+
post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT
+post-install-modulated: CSWDOCS = changelog.CSW README.CSW
post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl
-post-install-modulated:
+post-install-modulated: build-and-install-sieveplugin
@ginstall -d $(DOCDEST)
@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+ @ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot
@ginstall -d $(SSLDIR)/certs
@ginstall -d $(SSLDIR)/private
@( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh )
@mv $(SSLDIR)/certs/dovecot.pem $(SSLDIR)/certs/dovecot.pem.CSW
@mv $(SSLDIR)/private/dovecot.pem $(SSLDIR)/private/dovecot.pem.CSW
@chmod 400 $(SSLDIR)/private/dovecot.pem.CSW
- @cp $(DESTDIR)/etc/opt/csw/$(GARNAME)/dovecot-example.conf \
- $(DESTDIR)/etc/opt/csw/$(GARNAME)/dovecot.conf.CSW
+ @cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \
+ $(DESTDIR)$(sysconfdir)/dovecot.conf.CSW
@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
+ @$(foreach DOC,$(CSWDOCS),\
+ ginstall -m 644 $(FILEDIR)/CSWdovecot.$(DOC) $(DOCDEST);)
+ @cp $(WORKSRC)/doc/mkcert.sh $(DOCDEST)
+ @cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST)
@ginstall -m 755 $(FILEDIR)/CSWdovecot.cswdovecot \
$(DESTDIR)/etc/opt/csw/init.d/cswdovecot
+ @ginstall -m 644 $(FILEDIR)/CSWdovecot.cswusergroup \
+ $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot/cswusergroup
@$(MAKECOOKIE)
Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW (rev 0)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.README.CSW 2009-03-15 23:01:36 UTC (rev 3772)
@@ -0,0 +1,17 @@
+Service user accounts
+=====================
+The CSWdovecot package will create a service user account (dovecot) for you in
+case no user account by this name exists upon installation. This user account
+is required for the dovecot login service (and nothing else).
+
+If you want to use Dovecot for virtual users, you need to create another
+service user account (!= dovecot). For background information, see
+
+ http://wiki.dovecot.org/UserIds
+
+Upgrading
+=========
+For upgrading information from other IMAP servers or previous Dovecot
+versions, see
+
+ http://wiki.dovecot.org/UpgradingDovecot
Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW (rev 0)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW 2009-03-15 23:01:36 UTC (rev 3772)
@@ -0,0 +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 ....
+
+ -- 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-15 06:17:09 UTC (rev 3771)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswdovecot 2009-03-15 23:01:36 UTC (rev 3772)
@@ -2,12 +2,19 @@
# License is public domain.
#
# Taken from http://wiki.dovecot.org/DovecotInit
+# Modified for CSW by Sebastian Kayser
+#
+#FMRI network
DAEMON=/opt/csw/sbin/dovecot
test -x $DAEMON || exit 1
set -e
+CONF=/opt/csw/etc/dovecot/dovecot.conf
+CONF_LOCAL=/etc/opt/csw/dovecot/dovecot.conf
+[ -f $CONF_LOCAL ] && CONF=$CONF_LOCAL
+
base_dir=`$DAEMON -a|grep '^base_dir: '|sed 's/^base_dir: //'`
pidfile=$base_dir/master.pid
@@ -20,7 +27,7 @@
case "$1" in
start)
echo -n "Starting Dovecot"
- $DAEMON
+ $DAEMON -c $CONF
echo "."
;;
stop)
@@ -47,7 +54,7 @@
kill `cat $pidfile`
sleep 1
fi
- $DAEMON
+ $DAEMON -c $CONF
echo "."
;;
*)
Added: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup (rev 0)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.cswusergroup 2009-03-15 23:01:36 UTC (rev 3772)
@@ -0,0 +1 @@
+dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false
Deleted: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall 2009-03-15 06:17:09 UTC (rev 3771)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.preinstall 2009-03-15 23:01:36 UTC (rev 3772)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Test if the dovecot group exist, if not create it
-getent group dovecot > /dev/null
-if test $? -gt 0
-then
- groupadd dovecot > /dev/null
- if test $? -eq 0
- then
- echo CSWdovecot postinstall: group dovecot has been added
- else
- echo CSWdovecot postinstall: ERROR: Failed to add group dovecot
- exit 1
- fi
-fi
-
-# Test if the dovecot user exist, if not create it
-getent passwd dovecot > /dev/null
-if test $? -gt 0
-then
- useradd -c "Dovecot service user" -g dovecot -d /var/opt/csw/run/dovecot/login -s /bin/false dovecot > /dev/null
- if test $? -eq 0
- then
- echo CSWdovecot postinstall: user dovecot has been added
- else
- echo CSWdovecot postinstall: ERROR: Failed to add user dovecot
- exit 1
- fi
-fi
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