Source Mage code commit list

[Andraž Levstik <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

 mail/dovecot/BUILD     |    9 ++++++++-
 mail/dovecot/CONFIGURE |    5 -----
 mail/dovecot/DETAILS   |    1 +
 mail/dovecot/HISTORY   |   11 +++++------
 mail/dovecot/INSTALL   |    2 ++
 5 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 96b4f6ba2c8b40fd4f5c5c664f8e382598ddc4a3
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

    dovecot: revamped the spell and added managesieve patch

commit 9fff2fb825f092b053efa95bcea857298d0c9505
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

    dovecot: version update SECURITY_PATCH=1

commit f596fb88a5414dede3d004f156b939fbf8577a45
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

    Revert "dovecot: updated to 1.0.rc29, SECURITY_PATCH++, sm-bug-id #13668"
    
    This reverts commit a9b65d3a332862363187b0cefe072507d875ca31.

diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index 4c1dfe5..966460d 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -1,5 +1,10 @@
 #LDFLAGS="$LDFLAGS -lc"
 # disableing what we don't have available
+if [[ $DOVECOT_EXT_LDA == y ]]; then
+OPTS="--with-deliver $OPTS"
+else
+OPTS="--without-deliver $OPTS"
+fi                                              &&
 OPTS="--without-vpopmail                        \
       --without-sia                             \
       --without-bsdauth                         \
@@ -7,10 +12,12 @@ OPTS="--without-vpopmail
       $DOVECOT_OPTS                             \
       $OPTS"                                    &&
 default_build                                   &&
-pushd dovecot-sieve-1.0.1                       &&
+if [[ $DOVECOT_EXT_LDA == y ]]; then
+pushd dovecot-sieve-*                           &&
 OPTS="--with-dovecot=.."                        &&
 default_build                                   &&
 popd
+fi
 # when the dspam plugin will get updated to work in
 # a multiuser environment this will be usefull
 #pushd src/plugins/dspam                         
diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index e08bdfc..5f37e62 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -33,11 +33,6 @@ config_query_option DOVECOT_OPTS
                     "--with-pop3d"                           \
                     "--without-pop3d"                        &&
 config_query_option DOVECOT_OPTS                             \
-                    'Build mail delivery agent'              \
-                    y                                        \
-                    "--with-deliver"                         \
-                    "--without-deliver"                      &&
-config_query_option DOVECOT_OPTS                             \
                     'Install documentation'                  \
                     y                                        \
                     "--with-docs"                            \
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 73d359c..91975db 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -22,6 +22,7 @@ fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          ENTERED=20030224
   SECURITY_PATCH=1
+      PATCHLEVEL=1
       LICENSE[0]=GPL
         WEB_SITE=http://www.dovecot.org/
         KEYWORDS="mail"
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index d774a7a..650c435 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,9 +1,5 @@
-2007-03-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
-       * DETAILS: update to 1.0.rc29
-         SECURITY_PATCH=1:Security fix: If zlib plugin was loaded, it was 
possible
-         to open gzipped mbox files outside the user's mail directory.
-         added managesieve server patch
-         updated lda
+2007-04-01 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: added managesieve server patch, PATCHLEVEL++
        * PREPARE: ask for managesieve if lda is selected
        * CONFIGURE: added plenty of options to configure
        * BUILD: fixup for extra options, disabled what we don't have
@@ -12,6 +8,9 @@
        * PREPARE: ask for managesieve patch
        * PRE_BUILD: handle the managesieve patch
 
+2007-03-31 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: update to 1.0.rc29, SECURITY_PATCH=1
+
 2006-03-14 Bearcat M. Sandor <sourcemage AT feline-soul.com>
        * DETAILS: update to 1.0.rc26
 
diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index 1cdd0df..d2599df 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,4 +1,6 @@
 default_install            &&
+if [[ $DOVECOT_EXT_LDA == y ]]; then
 pushd dovecot-sieve-1.0.1  &&
 default_install            &&
 popd
+fi