Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (b42abc35f56d13a6452b13209672d46ea568b7c8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Andraž Levstik (b42abc35f56d13a6452b13209672d46ea568b7c8)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (b42abc35f56d13a6452b13209672d46ea568b7c8)
  • Date: Fri, 3 Jul 2009 14:59:20 -0500
GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

mail/dovecot/BUILD | 27 ++++++++++-----------------
mail/dovecot/CONFIGURE | 44 +++++++++++++++++++++++++++++++++-----------
mail/dovecot/DEPENDS | 31 ++++++++++++++++++++++++-------
mail/dovecot/DETAILS | 34 ++++++++++++++++------------------
mail/dovecot/HISTORY | 12 ++++++++++++
mail/dovecot/INSTALL | 5 +++--
mail/dovecot/PREPARE | 5 +++--
mail/dovecot/PRE_BUILD | 11 +++++++----
8 files changed, 108 insertions(+), 61 deletions(-)

New commits:
commit b42abc35f56d13a6452b13209672d46ea568b7c8
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

dovecot: update to 1.2.0 - have fun and read the migration docs - minimal
but important - also some sieve changes

diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index 1094d64..cc165f7 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -1,10 +1,12 @@
-#LDFLAGS="$LDFLAGS -lc"
-# disableing what we don't have available
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-OPTS="--with-deliver $OPTS"
+if list_find "$DOVECOT_MAILSTORE" "all" ; then
+OPTS="--with-storages=maildir,mbox,dbox,cydir $OPTS"
else
-OPTS="--without-deliver $OPTS"
+OPTS="--with-storages=$(echo $DOVECOT_MAILSTORE | tr " " ",") $OPTS"
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 \
@@ -16,24 +18,15 @@ OPTS="--without-vpopmail \
$OPTS" &&
default_build &&
if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-sieve-* &&
+pushd dovecot-${VERSION%.*}-sieve-$VERSION2 &&
OPTS="--with-dovecot=.." &&
default_build &&
if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-$VERSION5-managesieve-* &&
-OPTS="--with-dovecot=../.. --with-dovecot-sieve=.." &&
+pushd dovecot-${VERSION%.*}-managesieve-$VERSION3 &&
+OPTS="--with-dovecot=../.. --with-dovecot-sieve=.." &&
default_build &&
popd
fi
popd
fi
-# when the dspam plugin will get updated to work in
-# a multiuser environment this will be usefull
-#pushd src/plugins/dspam
-#gcc -fPIC -shared -Wall -I../../ -I../../lib \
-# -I../../../ -I../../lib-storage \
-# -I../../lib-mail -I../../lib-imap \
-# -I../../imap/ -DHAVE_CONFIG_H dspam.c \
-# -o lib_dspam.so
-#popd

diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index 11ee66e..8bac8e0 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -1,13 +1,44 @@
+. $GRIMOIRE/config_query_multi.function
+#if spell_ok gnutls ; then
+#config_query_list DOVECOT_SSL 'Which SSL provider do you want?' \
+# gnutls openssl none
+#else
+#config_query_list DOVECOT_SSL 'Which SSL provider do you want?' \
+# openssl gnutls none
+#fi &&
+
+config_query_multi DOVECOT_MAILSTORE \
+ 'What mail storage support do you want?' \
+ all
\
+
maildir \
+ mbox
\
+ dbox
\
+ cydir
&&
+config_query_list DOVECOT_NOTIFY \
+ 'What filesystem notification method do you want?' \
+
inotify \
+
dnotify \
+ none
&&
config_query_list DOVECOT_IOLOOP \
'What ioloop do you want' \
poll \
epoll &&
config_query_option DOVECOT_OPTS \
+ 'Build with GENERIC SQL support' \
+ y \
+ "--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" \
@@ -28,17 +59,8 @@ config_query_option DOVECOT_OPTS
\
"--with-prefetch-userdb" \
"--without-prefetch-userdb" &&
config_query_option DOVECOT_OPTS \
- 'Build POP3 server' \
- y \
- "--with-pop3d" \
- "--without-pop3d" &&
-config_query_option DOVECOT_OPTS \
'Install documentation' \
y \
"--with-docs" \
- "--without-docs" &&
-config_query_option DOVECOT_OPTS \
- 'Enable IPv6 support' \
- y \
- "--enable-ipv6" \
- "--disable-ipv6"
+ "--without-docs"
+
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index 4be449e..7e93d67 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -1,14 +1,31 @@
-depends zlib &&
depends libtool &&
if [[ $DOVECOT_MANAGESIEVE == y ]] ; then
depends autoconf &&
depends automake
fi &&
-# gnutls support is broken
-optional_depends openssl \
- "--with-ssl=openssl" \
- "--without-ssl" \
- "Enable SSL support" &&
+
+#if [[ $DOVECOT_SSL == gnutls ]]; then
+#depends gnutls "--with-ssl=gnutls"
+#elif [[ $DOVECOT_SSL == openssl ]]; then
+#depends openssl "--with-ssl=openssl"
+#fi &&
+
+optional_depends openssl \
+ '--with-ssl=openssl' \
+
'--without-ssl' \
+ 'Enable SSL
support' &&
+optional_depends zlib \
+ '--with-zlib' \
+ '--without-zlib' \
+ 'for zlib compression support' &&
+optional_depends bzip2 \
+ '--with-bzlib' \
+ '--without-bzlib' \
+ 'for bzlib support' &&
+optional_depends libcap \
+ '--with-libcap' \
+ '--without-libcap' \
+ 'for libcap support' &&
optional_depends linux-pam \
'--with-pam' \
'--without-pam' \
@@ -18,7 +35,7 @@ optional_depends krb5 \
'--without-gssapi' \
'for GSSAPI support' &&
optional_depends openldap \
- '--with-ldap' \
+ '--with-ldap=yes' \
'--without-ldap' \
'Enable LDAP support' &&
optional_depends mysql \
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 5af74bd..1d2ecca 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=1.1.14
+ VERSION=1.2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -7,29 +7,27 @@
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=1.1.6
- SOURCE3=$SPELL-sieve-$VERSION2.tar.gz
- SOURCE4=$SPELL-sieve-$VERSION2.tar.gz.sig
- SOURCE3_URL[0]=http://www.dovecot.org/releases/sieve/$SOURCE3
- SOURCE4_URL[0]=http://www.dovecot.org/releases/sieve/$SOURCE4
+ VERSION2=0.1.6
+ SOURCE3=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz
+ SOURCE4=$SPELL-${VERSION%.*}-sieve-$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=1.1.14
- VERSION4=0.10.6
- VERSION5=1.1
- SOURCE5=$SPELL-$VERSION3-managesieve-$VERSION4.diff.gz
- SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE5
- SOURCE6=$SPELL-$VERSION3-managesieve-$VERSION4.diff.gz.sig
- SOURCE6_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE6
+ VERSION3=0.11.5
+ 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-$VERSION5-managesieve-$VERSION4.tar.gz
- SOURCE7_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE7
- SOURCE8=$SPELL-$VERSION5-managesieve-$VERSION4.tar.gz.sig
- SOURCE8_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE8
+ SOURCE7=$SPELL-${VERSION%.*}.rc5-managesieve-$VERSION3.diff.gz
+ SOURCE7_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE7
+ SOURCE8=$SPELL-${VERSION%.*}.rc5-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"
+ SOURCE7_GPG="dovecot.gpg:${SOURCE7}:UPSTREAM_KEY"
fi
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 27bf702..f9317de 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,15 @@
+2009-07-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 1.2.0
+ * BUILD: updates for 1.2.0
+ * CONFIGURE: updates for 1.2.0
+ * DEPENDS: updates for 1.2.0
+ * INSTALL: updates for 1.2.0
+ * PREPARE: updates for 1.2.0, fixed the version check
+ * PRE_BUILD: updates for 1.2.0
+
+2009-06-26 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 1.1.16
+
2009-05-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated (properly) to 1.1.14 and managesieve 0.10.6

diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index f713153..ddaefa5 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,10 +1,11 @@
default_install &&
create_account dovecot &&
+pwd
if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-sieve-* &&
+pushd dovecot-${VERSION%.*}-sieve-$VERSION2 &&
default_install &&
if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-$VERSION5-managesieve-* &&
+pushd dovecot-${VERSION%.*}-managesieve-$VERSION3 &&
default_install &&
popd
fi &&
diff --git a/mail/dovecot/PREPARE b/mail/dovecot/PREPARE
index cd69876..307f5b7 100755
--- a/mail/dovecot/PREPARE
+++ b/mail/dovecot/PREPARE
@@ -1,6 +1,7 @@
-if [[ "$(installed_version $SPELL | cut -d. -f1-5 | sed -e 's/\.//g')" -lt
"110" && $(spell_ok $SPELL) ]]; then
+if [[ "$(installed_version $SPELL | cut -c-3 | sed -e 's/\.//g')" -lt "12"
]] && \
+ spell_ok $SPELL ; then
message "Warning the dovecot.conf has some minor changes. Please see"
- message "http://wiki.dovecot.org/Upgrading/1.1 for further information"
+ message "http://wiki.dovecot.org/Upgrading/1.2 for further information"
query "Please acknowledge that you've read the warning from above" n ||
return 1
fi &&

diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index 36e1fb4..a40299c 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -3,13 +3,16 @@ cd $SOURCE_DIRECTORY &&
if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
unpack_file 3 &&
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-verify_file 5 &&
-zcat $SOURCE_CACHE/$SOURCE5 | patch -p1 &&
+pushd $SOURCE_DIRECTORY &&
+verify_file 7 &&
+zcat $SOURCE_CACHE/$SOURCE7 | patch -p1 &&
libtoolize -f &&
aclocal &&
automake -f --add-missing &&
autoreconf -f &&
-cd dovecot-sieve-* &&
-unpack_file 7
+popd &&
+pushd dovecot-${VERSION%.*}-sieve-$VERSION2 &&
+unpack_file 5 &&
+sed -i -e '47s:>=:<:'
dovecot-1.2-managesieve-0.11.5/src/managesieve-login/client.c
fi
fi


  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (b42abc35f56d13a6452b13209672d46ea568b7c8), Andraž Levstik, 07/03/2009

Archive powered by MHonArc 2.6.24.

Top of Page