From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 8 21:30:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 938D0106570D for ; Sat, 8 Aug 2009 21:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6F3AB8FC22 for ; Sat, 8 Aug 2009 21:30:02 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n78LU2Xw075087 for ; Sat, 8 Aug 2009 21:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n78LU2wl075086; Sat, 8 Aug 2009 21:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 8 Aug 2009 21:30:02 GMT Resent-Message-Id: <200908082130.n78LU2wl075086@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Milan Obuch Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 179DC106564A for ; Sat, 8 Aug 2009 21:25:01 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id EEA348FC15 for ; Sat, 8 Aug 2009 21:25:00 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n78LP0rv087259 for ; Sat, 8 Aug 2009 21:25:00 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n78LP0qg087258; Sat, 8 Aug 2009 21:25:00 GMT (envelope-from nobody) Message-Id: <200908082125.n78LP0qg087258@www.freebsd.org> Date: Sat, 8 Aug 2009 21:25:00 GMT From: Milan Obuch To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/137582: [mail/courier] missing optional patches addition X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2009 21:30:02 -0000 >Number: 137582 >Category: ports >Synopsis: [mail/courier] missing optional patches addition >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 08 21:30:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Milan Obuch >Release: 6.4, 7.2, 8.0 >Organization: >Environment: >Description: Patch in PR 137112 was missing four new files/extra-patch-* files, sorry. Missing files are: extra-patch-webmail__folder.c extra-patch-webmail__images__sqwebmail.css extra-patch-webmail__maildir.c extra-patch-webmail__maildir.h >How-To-Repeat: >Fix: Add missing files - apply attached patch Patch attached with submission follows: diff -urN courier/files/extra-patch-webmail__folder.c courier-0.62.0/files/extra-patch-webmail__folder.c --- courier/files/extra-patch-webmail__folder.c 1970-01-01 01:00:00.000000000 +0100 +++ courier-0.62.0/files/extra-patch-webmail__folder.c 2009-06-04 09:10:47.000000000 +0200 @@ -0,0 +1,102 @@ +--- webmail/folder.c.orig 2008-07-20 19:00:33.000000000 +0200 ++++ webmail/folder.c 2009-06-04 08:32:54.000000000 +0200 +@@ -247,6 +247,18 @@ + return (maildir_msgmovefile(folder, file, cgi("moveto"), pos)); + } + ++static int groupmark(const char *folder, const char *file, size_t pos) ++{ ++ maildir_msgmarkfile(folder, file, pos); ++ return (0); ++} ++ ++static int groupunmark(const char *folder, const char *file, size_t pos) ++{ ++ maildir_msgunmarkfile(folder, file, pos); ++ return (0); ++} ++ + void folder_delmsgs(const char *dir, size_t pos) + { + int rc=0; +@@ -317,6 +329,16 @@ + rc=group_movedel( dir, &groupmove ); + maildir_savefoldermsgs(dir); + } ++ else if (*cgi("cmdmark")) ++ { ++ rc=group_movedel( dir, &groupmark ); ++ maildir_savefoldermsgs(dir); ++ } ++ else if (*cgi("cmdunmark")) ++ { ++ rc=group_movedel( dir, &groupunmark ); ++ maildir_savefoldermsgs(dir); ++ } + + maildir_cleanup(); + +@@ -441,7 +463,7 @@ + + folder_navigate(dir, pos, highend, morebefore, moreafter); + +- printf("\n", ++ printf("
%s %s%s%s%s
\n", + getarg("NUM"), + getarg("DATE"), + (strncmp(dir, INBOX "." SENT, sizeof(INBOX)+sizeof(SENT)-1) && +@@ -486,12 +508,13 @@ + if ((q=strrchr(p, '/')) != 0) + p=q+1; + +- printf(""); +- puts(""); +- puts(""); ++ puts(""); ++ puts("
%s   %s%s%s%s
%s%ld.%s%s%ld.%s%s!" : "", + (long) (pos+i), + (long) (pos+i)); + printf("\" onchange=\"setsel('MOVE-%ld', 'row%d', 'folder-index-bg-%d');\"%s /> %s%s%s%s", ++ printf("\" />%s%s%s%s", + folder_index_entry_start, + type, + folder_index_entry_end, +@@ -545,9 +568,9 @@ + + if (found) + { +- puts("
 "); ++ puts("
 "); + + puts("