Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (b7710bdc48a55ff676c4b562bb3289ed348ebbc4)
  • Date: Mon, 23 Jun 2008 07:06:12 -0500

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

mail/dovecot/BUILD | 6 ++++++
mail/dovecot/CONFIGURE | 9 +--------
mail/dovecot/DEPENDS | 6 +++++-
mail/dovecot/DETAILS | 24 +++++++++++++++++-------
mail/dovecot/HISTORY | 12 ++++++++++++
mail/dovecot/INSTALL | 7 ++++++-
mail/dovecot/PREPARE | 6 ++++++
mail/dovecot/PRE_BUILD | 4 +++-
mail/dovecot/dovecot.gpg |binary
9 files changed, 56 insertions(+), 18 deletions(-)

New commits:
commit bf93c9de3f3d7fb74954b52ac513b97ce8beb613
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

dovecot: update to 1.1.1, update managesieve and sieve

diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index 6220938..1094d64 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -19,6 +19,12 @@ if [[ $DOVECOT_EXT_LDA == y ]]; then
pushd dovecot-sieve-* &&
OPTS="--with-dovecot=.." &&
default_build &&
+if [[ $DOVECOT_MANAGESIEVE == y ]]; then
+pushd dovecot-$VERSION5-managesieve-* &&
+OPTS="--with-dovecot=../.. --with-dovecot-sieve=.." &&
+default_build &&
+popd
+fi
popd
fi
# when the dspam plugin will get updated to work in
diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index 5f37e62..11ee66e 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -41,11 +41,4 @@ config_query_option DOVECOT_OPTS
\
'Enable IPv6 support' \
y \
"--enable-ipv6" \
- "--disable-ipv6" &&
-if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-config_query_option DOVECOT_OPTS \
- 'Build managesieve server' \
- y \
- "--with-managesieve" \
- "--without-managesieve"
-fi
+ "--disable-ipv6"
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index 11d7b7f..cf9a0ce 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -31,4 +31,8 @@ optional_depends postgresql \
optional_depends sqlite \
'--with-sqlite' \
'--without-sqlite' \
- 'for SQLite support'
+ 'for SQLite support' &&
+optional_depends clucene \
+ '--with-lucene' \
+ '--without-lucene' \
+ 'for CLucene full text search support'
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 194da3e..de51bb8 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=1.0.14
+ VERSION=1.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -7,7 +7,7 @@
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.0.3
+ VERSION2=1.1.5
SOURCE3=$SPELL-sieve-$VERSION2.tar.gz
SOURCE4=$SPELL-sieve-$VERSION2.tar.gz.sig
SOURCE3_URL[0]=http://www.dovecot.org/releases/sieve/$SOURCE3
@@ -15,11 +15,21 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
SOURCE4_IGNORE=signature
SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
- VERSION3=1.0.10
- VERSION4=v9.1
-
SOURCE5_HASH=sha512:25a0e8e73a050f79108deb1887cde58f97ec4dad49a738ee7dffd38c7c29f2e1a8c1d0278dbaf0c8413f14943672c63c7dcc282624b4f7e3c60f13492b00ea47
- SOURCE5=$SPELL-$VERSION3-MANAGESIEVE-$VERSION4.diff.gz
- SOURCE5_URL[0]=http://sinas.rename-it.nl/~sirius/$SOURCE5
+ VERSION3=1.1.1
+ VERSION4=0.10.2
+ 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
+ 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
+ SOURCE8_IGNORE=signature
+ SOURCE7_GPG="dovecot.gpg:${SOURCE8}:UPSTREAM_KEY"
fi
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index a54b532..abf5ea8 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,15 @@
+2008-06-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 1.1.1
+ managesieve patch updates
+ sieve updates
+ * dovecot.gpg: added gpg key for the managesieve patch
+ * PRE_BUILD: managesieve patch updates
+ * PREPARE: config file warning
+ * INSTALL: managesieve patch updates
+ * DEPENDS: added clucene
+ * CONFIGURE: removed managesieve option
+ * BUILD: managesieve patch updates
+
2008-06-02 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated version to 1.0.14; LDA/sieve to 1.0.3

diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index 1dc560b..f713153 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,7 +1,12 @@
default_install &&
create_account dovecot &&
if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-sieve-* &&
+pushd dovecot-sieve-* &&
default_install &&
+if [[ $DOVECOT_MANAGESIEVE == y ]]; then
+pushd dovecot-$VERSION5-managesieve-* &&
+default_install &&
+popd
+fi &&
popd
fi
diff --git a/mail/dovecot/PREPARE b/mail/dovecot/PREPARE
index 0df3a63..a6a6ae0 100755
--- a/mail/dovecot/PREPARE
+++ b/mail/dovecot/PREPARE
@@ -1,3 +1,9 @@
+if [[ "$(installed_version $SPELL)" != "1.1.1" ]]; then
+message "Warning the dovecot.conf has some minor changes. Please see"
+message "http://wiki.dovecot.org/Upgrading/1.1 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 &&
if [[ $DOVECOT_EXT_LDA == y ]]; then
config_query DOVECOT_MANAGESIEVE 'Do you want the manage sieve server
patch?' n
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index e02af6a..0d66c80 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -7,6 +7,8 @@ verify_file 5 &&
zcat $SOURCE_CACHE/$SOURCE5 | patch -p1 &&
aclocal &&
automake --add-missing &&
-autoreconf
+autoreconf &&
+cd dovecot-sieve-* &&
+unpack_file 7
fi
fi
diff --git a/mail/dovecot/dovecot.gpg b/mail/dovecot/dovecot.gpg
index 9b5f6d8..31029a8 100644
Binary files a/mail/dovecot/dovecot.gpg and b/mail/dovecot/dovecot.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (b7710bdc48a55ff676c4b562bb3289ed348ebbc4), Andraž 'ruskie' Levstik, 06/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page