dovecot: update to 2.0.3

12 files changed, 67 insertions, 122 deletions

diff --git a/ChangeLog b/ChangeLog
index c86e9fd9ec..d25daa2bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* accounts: added dovenull
+	* groups: added dovenull
+
 2010-09-18 David C. Haley <khoralin@gmail.com>
 	* chat-libs/silc-toolkit: new spell - permits PidginIM to build with SILC.
 
diff --git a/accounts b/accounts
index fff1f3fa65..14d922f794 100755
--- a/accounts
+++ b/accounts
@@ -88,4 +88,5 @@ mariadb:178:180
 avahi-autoipd:180:180
 puppet:181:181
 prosody:182:182
+dovenull:183:183
 nobody:65534:65534
diff --git a/groups b/groups
index 29fdbc9bea..aa718ef2b7 100755
--- a/groups
+++ b/groups
@@ -107,5 +107,6 @@ mariadb:180:
 avahi-autoipd:180:
 puppet:181:
 prosody:182:
+dovenull:183:
 users:1000:
 nogroup:65534:
diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index cc165f7c34..c4c012f6d6 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -2,31 +2,24 @@ if list_find "$DOVECOT_MAILSTORE" "all" ; then
 OPTS="--with-storages=maildir,mbox,dbox,cydir $OPTS"
 else
 OPTS="--with-storages=$(echo $DOVECOT_MAILSTORE | tr " " ",") $OPTS"
-fi                                              &&
+fi                                                  &&
 OPTS="--with-notify=$DOVECOT_NOTIFY $OPTS"
 #if [[ $DOVECOT_SSL == none ]]; then
 #OPTS="--without-ssl $OPTS"
 #fi                                              &&
 # desired to have dev headers installed else it's hard
 # to have external plugins built
-OPTS="--without-vpopmail                        \
-      --enable-header-install                   \
-      --without-sia                             \
-      --without-bsdauth                         \
-      --with-ioloop=$DOVECOT_IOLOOP             \
-      $DOVECOT_OPTS                             \
-      $OPTS"                                    &&
-default_build                                   &&
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2     &&
-OPTS="--with-dovecot=.."                        &&
-default_build                                   &&
-if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-${VERSION%.*}-managesieve-$VERSION3    &&
-OPTS="--with-dovecot=../.. --with-dovecot-sieve=.."  &&
-default_build                                   &&
-popd
-fi
+OPTS="--without-vpopmail                            \
+      --without-sia                                 \
+      --without-bsdauth                             \
+      --with-ioloop=$DOVECOT_IOLOOP                 \
+      $DOVECOT_OPTS                                 \
+      $OPTS"                                        &&
+default_build                                       &&
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+pushd dovecot-${VERSION%.*}-pigeonhole-$VERSION2    &&
+OPTS="$DOVECOT_PIGEONHOLE_OPTS --with-dovecot=.."   &&
+default_build                                       &&
 popd
 fi
 
diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index a6ad15a3bf..ce7d541f12 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -6,7 +6,15 @@
 #config_query_list DOVECOT_SSL 'Which SSL provider do you want?' \
 #                  openssl gnutls none
 #fi                                                           &&
-                  
+
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+config_query_option DOVECOT_PIGEONHOLE_OPTS                  \
+                    'Do you want to use managesieve?'        \
+                    y                                        \
+                    "--with-managesieve"                     \
+                    "--without-managesieve"
+fi                                                           &&
+
 config_query_multi DOVECOT_MAILSTORE                         \
                   'What mail storage support do you want?'   \
                   all                                        \
@@ -29,36 +37,11 @@ config_query_option DOVECOT_OPTS                             \
                     "--with-sql"                             \
                     "--without-sql"                          &&
 config_query_option DOVECOT_OPTS                             \
-                    'Build with /etc/passwd support'         \
-                    y                                        \
-                    "--with-passwd"                          \
-                    "--without-passwd"                       &&
-config_query_option DOVECOT_OPTS                             \
                     'Build with NSS support'                 \
                     y                                        \
                     "--with-nss"                             \
                     "--without-nss"                          &&
 config_query_option DOVECOT_OPTS                             \
-                    'Build with passwd-like file support'    \
-                    y                                        \
-                    "--with-passwd-file"                     \
-                    "--without-passwd-file"                  &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with checkpassword support'       \
-                    y                                        \
-                    "--with-checkpassword"                   \
-                    "--without-checkpassword"                &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with static userdb support'       \
-                    y                                        \
-                    "--with-static-userdb"                   \
-                    "--without-static-userdb"                &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with prefetch userdb support'     \
-                    y                                        \
-                    "--with-prefetch-userdb"                 \
-                    "--without-prefetch-userdb"              &&
-config_query_option DOVECOT_OPTS                             \
                     'Install documentation'                  \
                     y                                        \
                     "--with-docs"                            \
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index 44960c3409..9a398a8350 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -1,8 +1,4 @@
 depends libtool                                  &&
-if [[ $DOVECOT_MANAGESIEVE == y ]] ; then
-depends autoconf                                 &&
-depends automake
-fi                                               &&
 
 #if [[ $DOVECOT_SSL == gnutls ]]; then
 #depends gnutls "--with-ssl=gnutls"
@@ -30,6 +26,10 @@ optional_depends linux-pam                       \
                  '--with-pam'                    \
                  '--without-pam'                 \
                  'for PAM support'               &&
+optional_depends shadow                          \
+                 '--with-shadow'                 \
+                 '--without-shadow'              \
+                 'for shadow support'            &&
 optional_depends krb5                            \
                  '--with-gssapi'                 \
                  '--without-gssapi'              \
@@ -49,8 +49,4 @@ optional_depends postgresql                      \
 optional_depends sqlite                          \
                  '--with-sqlite'                 \
                  '--without-sqlite'              \
-                 'for SQLite support'            &&
-optional_depends clucene                         \
-                 '--with-lucene'                 \
-                 '--without-lucene'              \
-                 'for CLucene full text search support'
+                 'for SQLite support'
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 509fb8a548..fd2a3bc7ac 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,38 +1,20 @@
            SPELL=dovecot
-         VERSION=1.2.12
+         VERSION=2.0.3
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
       SOURCE_GPG="dovecot.gpg:${SOURCE2}:UPSTREAM_KEY"
    SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
   SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
-if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
-        VERSION2=0.1.17
-      PATHCLEVEL=6
-         SOURCE3=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz
-         SOURCE4=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz.sig
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
+        VERSION2=0.2.0
+      PATHCLEVEL=7
+         SOURCE3=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz
+         SOURCE4=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz.sig
   SOURCE3_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE3
   SOURCE4_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE4
   SOURCE4_IGNORE=signature
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
-  if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-        VERSION3=0.11.11
-# VERSION4 might not always be up to date
-        VERSION4=$VERSION
-      PATCHLEVEL=4
-         SOURCE5=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz
-  SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE5
-         SOURCE6=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz.sig
-  SOURCE6_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE6
-  SOURCE6_IGNORE=signature
-     SOURCE5_GPG="dovecot.gpg:${SOURCE6}:UPSTREAM_KEY"
-         SOURCE7=$SPELL-${VERSION4}-managesieve-$VERSION3.diff.gz
-  SOURCE7_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE7
-         SOURCE8=$SPELL-${VERSION4}-managesieve-$VERSION3.diff.gz.sig
-  SOURCE8_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE8
-  SOURCE8_IGNORE=signature
-     SOURCE7_GPG="dovecot.gpg:${SOURCE8}:UPSTREAM_KEY"
-  fi
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          ENTERED=20030224
diff --git a/mail/dovecot/FINAL b/mail/dovecot/FINAL
index 89095a12b6..61ebdfcf73 100755
--- a/mail/dovecot/FINAL
+++ b/mail/dovecot/FINAL
@@ -2,18 +2,11 @@ message "${MESSAGE_COLOR}Use the following script to generate certificates for I
 message "${MESSAGE_COLOR}sudo $GRIMOIRE_DIR/http/httpd-dev/mksscert.sh <imap|pop3>${DEFAULT_COLOR}"
 message "Or get a fully free certificate from http://www.cacert.org for various purposes"
 
-if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
 message "${MESSAGE_COLOR}"
-message "You have enabled the managesieve server patch but you still need to"
-message "enable it in the config file. To do so the following lines should help"
-message "####"
-message "# Add managesieve to protocols"
-message "protocols = managesieve"
-message "# Configure the managesieve protocol"
-message "protocol managesieve {"
-message "   listen = *:2000"
-message "   login_executable = /usr/libexec/dovecot/managesieve-login"
-message "   mail_executable = /usr/libexec/dovecot/managesieve"
-message "}"
-message "####${DEFAULT_COLOR}"
+message "For further info about Pigeonhole look on:"
+message "http://wiki2.dovecot.org/Pigeonhole/ManageSieve/Configuration#migration"
+message "http://wiki2.dovecot.org/Pigeonhole/Sieve/Configuration#migration"
+message "http://pigeonhole.dovecot.org/documentation.html"
+message "${DEFAULT_COLOR}"
 fi
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index d895314d26..8492fa2549 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,15 @@
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* DETAILS: updated spell to 2.0.3
+	* PREPARE: update to 2.0.3, updated warning for upgrade, no more split
+	  of lda and dovecot, pigeonhole replaces previous managesieve
+	* DEPENDS: update to 2.0.3, removed broken things
+	* BUILD: update to 2.0.3, no more separate lda, pigeonhole update
+	* PRE_BUILD: update to 2.0.3, no more patching for managesieve
+	* INSTALL: update to 2.0.3, only need to install pigeonhole now, add
+	  dovenull user
+	* CONFIGURE: removed unused options
+	* FINAL: point to the pigeonhole docs for further info
+
 2010-07-04 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
 	* DETAILS: updated spell, managesieve and sieve to 1.2.12
 
diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index ddaefa5539..8a2957db21 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,13 +1,8 @@
-default_install            &&
-create_account dovecot     &&
-pwd
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2      &&
-default_install            &&
-if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-${VERSION%.*}-managesieve-$VERSION3  &&
-default_install            &&
-popd
-fi                         &&
+default_install                                   &&
+create_account dovecot                            &&
+create_account dovenull                           &&
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+pushd dovecot-${VERSION%.*}-pigeonhole-$VERSION2  &&
+default_install                                   &&
 popd
 fi
diff --git a/mail/dovecot/PREPARE b/mail/dovecot/PREPARE
index 307f5b7636..27c35b5f25 100755
--- a/mail/dovecot/PREPARE
+++ b/mail/dovecot/PREPARE
@@ -1,12 +1,9 @@
-if [[ "$(installed_version $SPELL | cut -c-3 | sed -e 's/\.//g')" -lt "12" ]] && \
+if [[ "$(installed_version $SPELL | cut -c-3 | sed -e 's/\.//g')" -lt "20" ]] && \
     spell_ok $SPELL ; then
     message "Warning the dovecot.conf has some minor changes. Please see"
-    message "http://wiki.dovecot.org/Upgrading/1.2 for further information"
+    message "http://wiki2.dovecot.org/Upgrading/2.0 for further information"
     query "Please acknowledge that you've read the warning from above" n || return 1
 fi &&
 
-config_query DOVECOT_EXT_LDA 'Use extended LDA with Sieve support?' y  &&
+config_query DOVECOT_PIGEONHOLE 'Use Dovecot Pigeonhole(sieve, managesieve)?' y
 
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-    config_query DOVECOT_MANAGESIEVE 'Do you want the manage sieve server patch?' n
-fi
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index 3bcbc450bc..bb97586564 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,17 +1,5 @@
 default_pre_build                                   &&
 cd $SOURCE_DIRECTORY                                &&
-if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
-unpack_file 3                                       &&
-if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-pushd $SOURCE_DIRECTORY                             &&
-verify_file 7                                       &&
-zcat $SOURCE_CACHE/$SOURCE7 | patch -p1             &&
-libtoolize -f                                       &&
-aclocal                                             &&
-automake -f --add-missing                           &&
-autoreconf -f                                       &&
-popd                                                &&
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2         &&
-unpack_file 5
-fi
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
+unpack_file 3
 fi