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

Andraž Levstik scm at sourcemage.org
Tue Feb 10 06:48:34 EST 2009


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

 mail/dovecot/DETAILS          |    8 ++++----
 mail/dovecot/HISTORY          |    6 ++++++
 mail/dovecot/PRE_BUILD        |   10 +++-------
 mail/dovecot/fixforhome1.diff |   15 ---------------
 mail/dovecot/fixforhome2.diff |   18 ------------------
 5 files changed, 13 insertions(+), 44 deletions(-)

New commits:
commit 0bfac1bc66e466ea0b9782487dc5e71131ca781f
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    dovecot: updated to 1.1.11

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index ebfbb9b..bd142f1 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dovecot
-         VERSION=1.1.6
+         VERSION=1.1.11
           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.1.5
+        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
@@ -15,8 +15,8 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
   SOURCE4_IGNORE=signature
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
   if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-        VERSION3=1.1.6
-        VERSION4=0.10.4
+        VERSION3=1.1.11
+        VERSION4=0.10.5
         VERSION5=1.1
          SOURCE5=$SPELL-$VERSION3-managesieve-$VERSION4.diff.gz
   SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/$VERSION5/$SOURCE5
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index e2522c4..2f4bf8c 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,9 @@
+2009-02-10 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: updated spell to 1.1.11, updated sieve and managesieve
+	* PRE_BUILD: no more patches, run libtoolize
+	* fixforhome1.diff: removed
+	* fixforhome2.diff: removed
+
 2008-11-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: security fix for managesieve patch
 	  http://www.dovecot.org/list/dovecot/2008-November/035259.html
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index c911e0f..36e1fb4 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,18 +1,14 @@
 default_pre_build                                   &&
 cd $SOURCE_DIRECTORY                                &&
-# fixes upstream issues
-# http://www.dovecot.org/list/dovecot/2008-October/034925.html
-# follow the thread
-patch -p1 < $SPELL_DIRECTORY/fixforhome1.diff       &&
-patch -p1 < $SPELL_DIRECTORY/fixforhome2.diff       &&
 if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
 unpack_file 3                                       &&
 if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
 verify_file 5                                       &&
 zcat $SOURCE_CACHE/$SOURCE5 | patch -p1             &&
+libtoolize -f                                       &&
 aclocal                                             &&
-automake --add-missing                              &&
-autoreconf                                          &&
+automake -f --add-missing                           &&
+autoreconf -f                                       &&
 cd dovecot-sieve-*                                  &&
 unpack_file 7
 fi
diff --git a/mail/dovecot/fixforhome1.diff b/mail/dovecot/fixforhome1.diff
deleted file mode 100644
index a1fd930..0000000
--- a/mail/dovecot/fixforhome1.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-
---- a/src/master/master-settings.c	Sat Jun 21 16:11:26 2008 +0300
-+++ b/src/master/master-settings.c	Fri Oct 31 18:03:20 2008 +0200
-@@ -607,6 +607,7 @@ static bool get_imap_capability(struct s
- 	   automatically */
- 	static const char *generated_capability = NULL;
- 	static const char *args[] = {
-+		"home=/tmp",
- 		"uid=65534",
- 		"gid=65534",
- 		NULL
-
-
-
-
diff --git a/mail/dovecot/fixforhome2.diff b/mail/dovecot/fixforhome2.diff
deleted file mode 100644
index c80fed8..0000000
--- a/mail/dovecot/fixforhome2.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-
---- a/src/master/master-settings.c	Fri Oct 31 18:03:20 2008 +0200
-+++ b/src/master/master-settings.c	Fri Oct 31 18:35:27 2008 +0200
-@@ -607,9 +607,9 @@ static bool get_imap_capability(struct s
- 	   automatically */
- 	static const char *generated_capability = NULL;
- 	static const char *args[] = {
--		"home=/tmp",
- 		"uid=65534",
- 		"gid=65534",
-+		"home=/tmp",
- 		NULL
- 	};
- 	enum master_login_status login_status;
-
-
-
-



More information about the SM-Commit mailing list