Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (6c495eb512651f49fd3ff6a7ec9b467ba4d845bf)
  • Date: Tue, 21 Sep 2010 03:44:36 -0500

GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

ChangeLog | 4 +++
accounts | 1
groups | 1
mail/dovecot/BUILD | 31 +++++++++--------------
mail/dovecot/CONFIGURE | 35 ++++++--------------------
mail/dovecot/DEPENDS | 14 +++-------
mail/dovecot/DETAILS | 30 ++++-------------------
mail/dovecot/FINAL | 19 ++++----------
mail/dovecot/HISTORY | 12 +++++++++
mail/dovecot/INSTALL | 17 ++++---------
mail/dovecot/PREPARE | 9 ++----
mail/dovecot/PRE_BUILD | 16 +-----------
mail/exim/HISTORY | 6 ++++
mail/exim/PRE_BUILD | 2 +
mail/exim/exim-dovecot-1.1.diff | 52
++++++++++++++++++++++++++++++++++++++++
15 files changed, 127 insertions(+), 122 deletions(-)

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

dovecot: update to 2.0.3

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

exim: fixes for dovecot sasl, upstream applied already

diff --git a/ChangeLog b/ChangeLog
index c86e9fd..d25daa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * accounts: added dovenull
+ * groups: added dovenull
+
2010-09-18 David C. Haley <khoralin AT gmail.com>
* chat-libs/silc-toolkit: new spell - permits PidginIM to build with
SILC.

diff --git a/accounts b/accounts
index fff1f3f..14d922f 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 29fdbc9..aa718ef 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 cc165f7..c4c012f 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 a6ad15a..ce7d541 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 44960c3..9a398a8 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 509fb8a..fd2a3bc 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 89095a1..61ebdfc 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 d895314..8492fa2 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,15 @@
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f AT 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 AT codemages.net>
* DETAILS: updated spell, managesieve and sieve to 1.2.12

diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index ddaefa5..8a2957d 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 307f5b7..27c35b5 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 3bcbc45..bb97586 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
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 92ea4f6..4efb499 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,9 @@
+2010-09-20 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * PRE_BUILD: added the dovecot patch
+ * exim-dovecot-1.1.diff: fixes some issues and brings the
+ compatibility to the latest version
+ Upstream: http://bugs.exim.org/show_bug.cgi?id=954
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/mail/exim/PRE_BUILD b/mail/exim/PRE_BUILD
index 694980c..d2e3201 100755
--- a/mail/exim/PRE_BUILD
+++ b/mail/exim/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < $SPELL_DIRECTORY/exim-dovecot-1.1.diff &&
+
patch "$SOURCE_DIRECTORY/scripts/exim_install" \
"$SPELL_DIRECTORY/config.patch" &&

diff --git a/mail/exim/exim-dovecot-1.1.diff b/mail/exim/exim-dovecot-1.1.diff
new file mode 100644
index 0000000..3dc5067
--- /dev/null
+++ b/mail/exim/exim-dovecot-1.1.diff
@@ -0,0 +1,52 @@
+diff --git a/src/auths/dovecot.c b/src/auths/dovecot.c
+index 6bfbba2..5b5e829 100644
+--- a/src/auths/dovecot.c
++++ b/src/auths/dovecot.c
+@@ -209,35 +209,23 @@ int auth_dovecot_server(auth_instance *ablock, uschar
*data)
+ HDEBUG(D_auth) debug_printf("received: %s\n", buffer);
+ nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0]));
+
+- switch (toupper(*args[0])) {
+- case 'C':
++ /* Code below rewritten by Kirill Miazine (km AT krot.org).
Only check commands that
++ Exim will need. Original code also failed if Dovecot
server sent unknown
++ command. E.g. COOKIE in version 1.1 of the protocol would
cause troubles. */
++ if (Ustrcmp(args[0], US"CUID") == 0) {
+ CHECK_COMMAND("CUID", 1, 1);
+ cuid = Uatoi(args[1]);
+- break;
+-
+- case 'D':
+- CHECK_COMMAND("DONE", 0, 0);
+- cont = 0;
+- break;
+-
+- case 'M':
+- CHECK_COMMAND("MECH", 1, INT_MAX);
+- if (strcmpic(US args[1], ablock->public_name) == 0)
+- found = 1;
+- break;
+-
+- case 'S':
+- CHECK_COMMAND("SPID", 1, 1);
+- break;
+-
+- case 'V':
++ } else if (Ustrcmp(args[0], US"VERSION") == 0) {
+ CHECK_COMMAND("VERSION", 2, 2);
+ if (Uatoi(args[1]) != VERSION_MAJOR)
+ OUT("authentication socket protocol version
mismatch");
+- break;
+-
+- default:
+- goto out;
++ } else if (Ustrcmp(args[0], US"MECH") == 0) {
++ CHECK_COMMAND("MECH", 1, INT_MAX);
++ if (strcmpic(US args[1], ablock->public_name) == 0)
++ found = 1;
++ } else if (Ustrcmp(args[0], US"DONE") == 0) {
++ CHECK_COMMAND("DONE", 0, 0);
++ cont = 0;
+ }
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (6c495eb512651f49fd3ff6a7ec9b467ba4d845bf), Andraž Levstik, 09/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page