From owner-svn-ports-head@freebsd.org Thu Aug 15 10:28:15 2019 Return-Path: Delivered-To: svn-ports-head@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 1EA29CD5E7; Thu, 15 Aug 2019 10:28:15 +0000 (UTC) (envelope-from ak@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 468N2Q73xCz3CB2; Thu, 15 Aug 2019 10:28:14 +0000 (UTC) (envelope-from ak@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 D5530F26D; Thu, 15 Aug 2019 10:28:14 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7FASEL5073792; Thu, 15 Aug 2019 10:28:14 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7FASEbt073791; Thu, 15 Aug 2019 10:28:14 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201908151028.x7FASEbt073791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Thu, 15 Aug 2019 10:28:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508990 - head/mail/mutt/files X-SVN-Group: ports-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: head/mail/mutt/files X-SVN-Commit-Revision: 508990 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Aug 2019 10:28:15 -0000 Author: ak Date: Thu Aug 15 10:28:14 2019 New Revision: 508990 URL: https://svnweb.freebsd.org/changeset/ports/508990 Log: - Fix MAILDIR_MTIME_PATCH option with NNTP enabled Submitted by: Derek Schrock (maintainer) Pointy hat: ak Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp Modified: head/mail/mutt/files/extra-patch-maildir-mtime-nntp ============================================================================== --- head/mail/mutt/files/extra-patch-maildir-mtime-nntp Thu Aug 15 10:10:22 2019 (r508989) +++ head/mail/mutt/files/extra-patch-maildir-mtime-nntp Thu Aug 15 10:28:14 2019 (r508990) @@ -1,8 +1,8 @@ ---- PATCHES.orig 2017-09-10 21:57:09 UTC +--- PATCHES.orig 2019-08-15 02:24:43 UTC +++ PATCHES @@ -0,0 +1 @@ +patch-1.5.7.ust.maildir-mtime.2 ---- browser.c.orig 2017-09-10 21:56:59 UTC +--- browser.c.orig 2019-08-15 02:24:39 UTC +++ browser.c @@ -35,6 +35,7 @@ #ifdef USE_NNTP @@ -12,7 +12,7 @@ #include #include -@@ -545,6 +546,21 @@ static void init_state (struct browser_s +@@ -592,6 +593,21 @@ static void init_state (struct browser_state *state, M menu->data = state->entry; } @@ -33,20 +33,20 @@ + /* get list of all files/newsgroups with mask */ static int examine_directory (MUTTMENU *menu, struct browser_state *state, - char *d, const char *prefix) -@@ -634,6 +650,7 @@ static int examine_directory (MUTTMENU * + const char *d, const char *prefix) +@@ -684,6 +700,7 @@ static int examine_directory (MUTTMENU *menu, struct b tmp = Incoming; - while (tmp && mutt_strcmp (buffer, tmp->path)) + while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf))) tmp = tmp->next; + check_maildir_times (tmp, &s); if (tmp && Context && !mutt_strcmp (tmp->realpath, Context->realpath)) { -@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU * +@@ -792,6 +809,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b s.st_mtime = st2.st_mtime; } + check_maildir_times (tmp, &s); - add_folder (menu, state, buffer, &s, tmp, NULL); + add_folder (menu, state, mutt_b2s (mailbox), &s, tmp, NULL); } while ((tmp = tmp->next));