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

Andraž Levstik scm at sourcemage.org
Fri Nov 27 04:46:11 EST 2009


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

 mail/dovecot/DETAILS                               |   14 +++++++-------
 mail/dovecot/HISTORY                               |    6 ++++++
 mail/dovecot/PRE_BUILD                             |    2 --
 mail/dovecot/dovecot-1.2.5-check-init_limits.patch |   15 ---------------
 4 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 2a303b6e475bcbaf024dd6408b0a04fe6a33b4c1
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dovecot: update to 1.2.8

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index e30dde5..16f729a 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dovecot
-         VERSION=1.2.5
+         VERSION=1.2.8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
@@ -7,8 +7,8 @@
    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.12
-      PATHCLEVEL=2
+        VERSION2=0.1.13
+      PATHCLEVEL=3
          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
@@ -17,16 +17,16 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
   if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
         VERSION3=0.11.9
-      PATCHLEVEL=1
+      PATCHLEVEL=2
          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-${VERSION%.*}.4-managesieve-$VERSION3.diff.gz
+         SOURCE7=$SPELL-${VERSION%.*}.8-managesieve-$VERSION3.diff.gz
   SOURCE7_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE7
-         SOURCE8=$SPELL-${VERSION%.*}.4-managesieve-$VERSION3.diff.gz.sig
+         SOURCE8=$SPELL-${VERSION%.*}.8-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"
@@ -34,7 +34,7 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          ENTERED=20030224
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
       LICENSE[0]=LGPL2.1/LGPL2/MIT/BSD/PublicDomain
         WEB_SITE=http://www.dovecot.org/
         KEYWORDS="mail"
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 12f4626..075e69c 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,9 @@
+2009-11-27 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 1.2.8
+	  SECURITY_PATCH++, updated managesieve and sieve
+	* dovecot-1.2.5-check-init_limits.patch: removed
+	* PRE_BUILD: no more extra patch
+
 2009-09-25 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated version to 1.2.5
 	* dovecot-1.2.5-check-init_limits.patch: added until it gets fixed with a
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index b3918a6..3bcbc45 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build                                   &&
 cd $SOURCE_DIRECTORY                                &&
-# until this gets fixed upstream
-patch -p0 < $SPELL_DIRECTORY/dovecot-1.2.5-check-init_limits.patch &&
 if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
 unpack_file 3                                       &&
 if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
diff --git a/mail/dovecot/dovecot-1.2.5-check-init_limits.patch b/mail/dovecot/dovecot-1.2.5-check-init_limits.patch
deleted file mode 100644
index ef7e138..0000000
--- a/mail/dovecot/dovecot-1.2.5-check-init_limits.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/plugins/quota/quota.c.old	2009-09-22 18:06:37.000000000 -0700
-+++ src/plugins/quota/quota.c	2009-09-22 18:08:49.000000000 -0700
-@@ -444,8 +444,10 @@
- 	bool found;
- 
- 	if (!root->set->force_default_rule) {
--		if (root->backend.v.init_limits(root) < 0)
--			return -1;
-+		if (root->backend.v.init_limits != NULL) {
-+			if (root->backend.v.init_limits(root) < 0)
-+				return -1;
-+		}
- 	}
- 
- 	bytes_limit = root->bytes_limit;



More information about the SM-Commit mailing list