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

Andraž Levstik scm at sourcemage.org
Sat Nov 1 05:09:16 EDT 2008


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

 mail/dovecot/DETAILS          |    4 ++--
 mail/dovecot/HISTORY          |    6 ++++++
 mail/dovecot/PRE_BUILD        |    5 +++++
 mail/dovecot/fixforhome1.diff |   15 +++++++++++++++
 mail/dovecot/fixforhome2.diff |   18 ++++++++++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

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

    dovecot: update to 1.1.6

diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 6789c67..c693832 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=dovecot
-         VERSION=1.1.4
+         VERSION=1.1.6
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
@@ -15,7 +15,7 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
   SOURCE4_IGNORE=signature
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
   if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-        VERSION3=1.1.4
+        VERSION3=1.1.6
         VERSION4=0.10.3
         VERSION5=1.1
          SOURCE5=$SPELL-$VERSION3-managesieve-$VERSION4.diff.gz
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 769bb10..86a5949 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,9 @@
+2008-11-01 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: update to 1.1.6, managesieve patch to 1.1.6
+	* PRE_BUILD: two patches to fix upstream issue
+	* fixforhome1.diff: fixes an issue when using %h
+	* fixforhome2.diff: fixes the previous patch for %h
+
 2008-10-10 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: updated spell to 1.1.4; updated managesieve patch to 1.1.4/0.10.3
 	* PREPARE: rewrote the warning for pre-1.1 installs
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index 0d66c80..c911e0f 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,5 +1,10 @@
 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
diff --git a/mail/dovecot/fixforhome1.diff b/mail/dovecot/fixforhome1.diff
new file mode 100644
index 0000000..a1fd930
--- /dev/null
+++ b/mail/dovecot/fixforhome1.diff
@@ -0,0 +1,15 @@
+
+--- 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
new file mode 100644
index 0000000..c80fed8
--- /dev/null
+++ b/mail/dovecot/fixforhome2.diff
@@ -0,0 +1,18 @@
+
+--- 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