Hi, a new bugfix release just went out after upstream learnt that S-nail 14.2 was in the OpenBSD ports tree. Patch to source goes away.
I did only very basic testing, no IMAP or other fancy stuff. Just posting it so that William can have feedback before dealing with this. -- Jérémie Courrèges-Anglas PGP Key fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494 Index: Makefile =================================================================== RCS file: /cvs/ports/mail/s-nail/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 29 Mar 2013 03:54:33 -0000 1.1.1.1 +++ Makefile 30 Apr 2013 19:46:05 -0000 @@ -2,8 +2,8 @@ COMMENT= enhanced, MIME capable Berkeley Mail -DISTNAME= s-nail-14.2 -DISTFILES= ${DISTNAME:S/./_/}.tar.gz +DISTNAME= s-nail-14.2.1 +DISTFILES= ${DISTNAME:S/./_/g}.tar.gz CATEGORIES= mail HOMEPAGE= http://sdaoden.users.sourceforge.net/code.html#s-nail Index: distinfo =================================================================== RCS file: /cvs/ports/mail/s-nail/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 29 Mar 2013 03:54:34 -0000 1.1.1.1 +++ distinfo 30 Apr 2013 19:46:18 -0000 @@ -1,2 +1,2 @@ -SHA256 (s-nail-14_2.tar.gz) = T02Y5tChotCqrsFCI9BJmuPbNPtGxVa7J70qNUc0pzU= -SIZE (s-nail-14_2.tar.gz) = 349557 +SHA256 (s-nail-14_2_1.tar.gz) = nIdzaXMWXDthpDSsGCJL7AXm/F+isDZCc+DtKOSbyqU= +SIZE (s-nail-14_2_1.tar.gz) = 350830 Index: patches/patch-cmd1_c =================================================================== RCS file: patches/patch-cmd1_c diff -N patches/patch-cmd1_c --- patches/patch-cmd1_c 29 Mar 2013 03:54:34 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,53 +0,0 @@ -$OpenBSD: patch-cmd1_c,v 1.1.1.1 2013/03/29 03:54:34 william Exp $ - -fix bsdcompat message index, from upstream: -cmd1.c:hprf(): fix subject length calculation.. - - ---- cmd1.c.orig Fri Mar 15 07:20:17 2013 -+++ cmd1.c Wed Mar 27 14:26:05 2013 -@@ -582,9 +582,8 @@ jputc: - fromlen = ABS(n); - if (isto) /* XXX tr()! */ - fromlen -= 3; -- fprintf(f, "%s%s", isto ? "To " : "", -+ subjlen -= fprintf(f, "%s%s", isto ? "To " : "", - colalign(name, fromlen, n)); -- subjlen -= ABS(n); - break; - case 'd': - if (datefmt != NULL) { -@@ -613,6 +612,7 @@ jputc: - subjlen -= fprintf(f, "%*ld", n, - mp->m_xlines); - else { -+ n = ABS(n); - subjlen -= n; - while (n--) - putc(' ', f); -@@ -633,11 +633,12 @@ jputc: - B = 1; - /*FALLTHRU*/ - case 's': -- n = (n != 0) ? n : subjlen - 2; -+ if (n == 0) -+ n = subjlen - 2; - if (n > 0 && s < 0) - n = -n; - if (B) -- n -= 2; -+ n -= (n < 0) ? -2 : 2; - if (subjline != NULL && n != 0) { - /* pretty pathetic */ - fprintf(f, B ? "\"%s\"" : "%s", -@@ -667,9 +668,8 @@ jputc: - for (i=msgCount; i>999; i/=10) - n++; - } -- fprintf(f, "%*ld", n, threaded ? -+ subjlen -= fprintf(f, "%*ld", n, threaded ? - mp->m_threadpos : mesg); -- subjlen -= n; - break; - case 'c': - #ifdef USE_SCORE