From owner-svn-ports-all@freebsd.org Mon Jul 22 23:17:55 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2B054BEE20; Mon, 22 Jul 2019 23:17:55 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0CB54685B1; Mon, 22 Jul 2019 23:17:55 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D4AEB1C8ED; Mon, 22 Jul 2019 23:17:54 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6MNHsS5030241; Mon, 22 Jul 2019 23:17:54 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6MNHsJR030240; Mon, 22 Jul 2019 23:17:54 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201907222317.x6MNHsJR030240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Mon, 22 Jul 2019 23:17:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507181 - in head/mail/dovecot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in head/mail/dovecot: . files X-SVN-Commit-Revision: 507181 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0CB54685B1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jul 2019 23:17:55 -0000 Author: ler Date: Mon Jul 22 23:17:54 2019 New Revision: 507181 URL: https://svnweb.freebsd.org/changeset/ports/507181 Log: mail/dovecot: [PATCH] lib-storage: Namespace prefix shouldn't be included in all mailbox name validity checks Obtained from: upstream github. Added: head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c (contents, props changed) Modified: head/mail/dovecot/Makefile Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Mon Jul 22 23:01:47 2019 (r507180) +++ head/mail/dovecot/Makefile Mon Jul 22 23:17:54 2019 (r507181) @@ -8,7 +8,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= https://dovecot.org/releases/2.3/ Added: head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c Mon Jul 22 23:17:54 2019 (r507181) @@ -0,0 +1,35 @@ +--- src/lib-storage/mail-storage.c.orig 2019-07-12 10:46:25 UTC ++++ src/lib-storage/mail-storage.c +@@ -1040,10 +1040,10 @@ mailbox_name_verify_extra_separators(const char *vname + } + + static bool +-mailbox_verify_name_prefix(struct mailbox *box, const char **error_r) ++mailbox_verify_name_prefix(struct mail_namespace *ns, const char **vnamep, ++ const char **error_r) + { +- const char *vname = box->vname; +- struct mail_namespace *ns = box->list->ns; ++ const char *vname = *vnamep; + + if (ns->prefix_len == 0) + return TRUE; +@@ -1071,6 +1071,7 @@ mailbox_verify_name_prefix(struct mailbox *box, const + return FALSE; + } + } ++ *vnamep = vname; + return TRUE; + } + +@@ -1085,7 +1086,9 @@ int mailbox_verify_name(struct mailbox *box) + return 0; + } + +- if (!mailbox_verify_name_prefix(box, &error)) { ++ /* Verify the namespace prefix here. Change vname to skip the prefix ++ for the following checks. */ ++ if (!mailbox_verify_name_prefix(box->list->ns, &vname, &error)) { + mail_storage_set_error(box->storage, MAIL_ERROR_PARAMS, + t_strdup_printf("Invalid mailbox name '%s': %s", + str_sanitize(vname, 80), error));