From owner-svn-ports-all@freebsd.org Thu Sep 17 06:28:00 2020 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 91A423FDCB9; Thu, 17 Sep 2020 06:28:00 +0000 (UTC) (envelope-from danfe@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BsRq43Grcz4n1V; Thu, 17 Sep 2020 06:28:00 +0000 (UTC) (envelope-from danfe@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 5430A25ACA; Thu, 17 Sep 2020 06:28:00 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08H6S0nH059175; Thu, 17 Sep 2020 06:28:00 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08H6S0O7059174; Thu, 17 Sep 2020 06:28:00 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009170628.08H6S0O7059174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 17 Sep 2020 06:28:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548813 - head/mail/mailutils/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/mail/mailutils/files X-SVN-Commit-Revision: 548813 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 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: Thu, 17 Sep 2020 06:28:00 -0000 Author: danfe Date: Thu Sep 17 06:27:59 2020 New Revision: 548813 URL: https://svnweb.freebsd.org/changeset/ports/548813 Log: Backport upstream patch to unbreak the build with SQL support enabled. PR: 249358 Added: head/mail/mailutils/files/patch-mda_lib_mailquota.c (contents, props changed) Added: head/mail/mailutils/files/patch-mda_lib_mailquota.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mailutils/files/patch-mda_lib_mailquota.c Thu Sep 17 06:27:59 2020 (r548813) @@ -0,0 +1,22 @@ +--- mda/lib/mailquota.c.orig 2020-08-08 20:32:07 UTC ++++ mda/lib/mailquota.c +@@ -270,16 +270,10 @@ sql_retrieve_quota (char *name, mu_off_t *quota) + } + else if (tmp == NULL || tmp[0] == 0 || mu_c_strcasecmp (tmp, "none") == 0) + rc = RETR_UNLIMITED; +- else ++ else if (get_quota (quota, tmp)) + { +- char *p; +- +- if (get_size (tmp, quota, &p)) +- { +- mu_error (_("bogus mailbox quota for `%s' (near `%s')"), +- name, p); +- *quota = groupquota; +- } ++ *quota = groupquota; ++ rc = RETR_OK; + } + } +