[92434] trunk/dports/mail/dovecot2

[pixilla at macports.org]

Revision: 92434
          https://trac.macports.org/changeset/92434
Author:   pixilla at macports.org
Date:     2012-04-28 09:15:28 -0700 (Sat, 28 Apr 2012)
Log Message:
-----------
mail/dovecot2:
- hg.dovecot.org patch lib-storage: Fixed expanding path that ends with "~/"
- Closes #34245

Modified Paths:
--------------
    trunk/dports/mail/dovecot2/Portfile
    trunk/dports/mail/dovecot2/files/patch-doc-example-config-conf.d-10-master.conf.diff

Added Paths:
-----------
    trunk/dports/mail/dovecot2/files/patch-src-lib-storage-mail-user.c.diff

Modified: trunk/dports/mail/dovecot2/Portfile
===================================================================
--- trunk/dports/mail/dovecot2/Portfile	2012-04-28 15:42:33 UTC (rev 92433)
+++ trunk/dports/mail/dovecot2/Portfile	2012-04-28 16:15:28 UTC (rev 92434)
@@ -8,6 +8,7 @@
 # Please revbump port:dovecot2-sieve and port:dovecot2-antispam
 # on port:dovecot2 version changes.
 version             2.1.5
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          mail
 maintainers         pixilla
@@ -30,14 +31,14 @@
                     port:zlib \
                     port:openssl
 
-set default_internal_user \
-    _dovecot
-set default_login_user \
-    _dovenull
+set default_internal_user   _dovecot
+set default_login_user      _dovenull
 add_users ${default_internal_user} group=${default_internal_user} realname=Dovecot
-add_users ${default_login_user} group=${default_login_user} realname=Dovenull
+add_users ${default_login_user}    group=${default_login_user}    realname=Dovenull
 
-patchfiles          patch-doc-example-config-conf.d-10-master.conf.diff
+patch.pre_args      -p1
+patchfiles          patch-doc-example-config-conf.d-10-master.conf.diff \
+                    patch-src-lib-storage-mail-user.c.diff
 
 checksums           rmd160  ae79cdacffc115fc7a5aaa9d175cb82f0a77492a \
                     sha256  94df927aa9f5edb7c86973292c42310e5a7f6c3af50a36436b66b49d31747050

Modified: trunk/dports/mail/dovecot2/files/patch-doc-example-config-conf.d-10-master.conf.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-doc-example-config-conf.d-10-master.conf.diff	2012-04-28 15:42:33 UTC (rev 92433)
+++ trunk/dports/mail/dovecot2/files/patch-doc-example-config-conf.d-10-master.conf.diff	2012-04-28 16:15:28 UTC (rev 92434)
@@ -1,15 +1,15 @@
---- doc/example-config/conf.d/10-master.conf.orig	2011-01-14 11:19:50.000000000 -0800
-+++ doc/example-config/conf.d/10-master.conf	2011-01-14 11:20:58.000000000 -0800
+--- a/doc/example-config/conf.d/10-master.conf	2012-04-28 08:50:58.000000000 -0700
++++ b/doc/example-config/conf.d/10-master.conf	2012-04-28 08:50:43.000000000 -0700
 @@ -9,10 +9,12 @@
  # Login user is internally used by login processes. This is the most untrusted
  # user in Dovecot system. It shouldn't have access to anything at all.
  #default_login_user = dovenull
-+default_login_user = @@default_login_user@@
++default_login_user = _dovenull
  
  # Internal user is used by unprivileged processes. It should be separate from
  # login user, so that login processes can't disturb other processes.
  #default_internal_user = dovecot
-+default_internal_user = @@default_internal_user@@
++default_internal_user = _dovecot
  
  service imap-login {
    inet_listener imap {

Added: trunk/dports/mail/dovecot2/files/patch-src-lib-storage-mail-user.c.diff
===================================================================
--- trunk/dports/mail/dovecot2/files/patch-src-lib-storage-mail-user.c.diff	                        (rev 0)
+++ trunk/dports/mail/dovecot2/files/patch-src-lib-storage-mail-user.c.diff	2012-04-28 16:15:28 UTC (rev 92434)
@@ -0,0 +1,11 @@
+--- a/src/lib-storage/mail-user.c	2012-04-28 08:50:59.000000000 -0700
++++ b/src/lib-storage/mail-user.c	2012-04-28 08:50:43.000000000 -0700
+@@ -343,7 +343,7 @@
+ {
+ 	const char *home, *path = *pathp;
+ 
+-	if (strncmp(path, "~/", 2) != 0) {
++	if (*path != '~') {
+ 		/* no need to expand home */
+ 		return 0;
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120428/40d4e1e9/attachment.html>