Attachment 206552 Details for Bug 239864 – Unbreak nntp patch

Unbreak nntp patch

patch.txt (text/plain), 5.35 KB, created by Alex Kozlov on 2019-08-14 19:05:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2019-08-14 19:05:54 UTC

Size: 5.35 KB

patch

obsolete

>Index: mail/mutt/Makefile
>===================================================================
>--- mail/mutt/Makefile	(revision 508961)
>+++ mail/mutt/Makefile	(working copy)
>@@ -167,10 +167,9 @@
> 
> GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
> 
>-QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv
>-QUOTE_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-vvv.quote
>+QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
>+	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
> 
>-NNTP_BROKEN=		NNTP broken with 1.12.0
> NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
> NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
> NNTP_CONFIGURE_ON=	--enable-nntp
>@@ -183,7 +182,7 @@
> .include <bsd.port.options.mk>
> 
> # un/comment as each VERSION is created for PORTVERSION
>-VVV_PATCH_VERSION=	1.11.1
>+#VVV_PATCH_VERSION=	1.12.1
> GREETING_PATCH_VERSION=	1.12.0
> 
> .if !defined(VVV_PATCH_VERSION)
>Index: mail/mutt/distinfo
>===================================================================
>--- mail/mutt/distinfo	(revision 508961)
>+++ mail/mutt/distinfo	(working copy)
>@@ -1,9 +1,11 @@
>-TIMESTAMP = 1560623854
>+TIMESTAMP = 1565808330
> SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
> SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166
> SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
> SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
>-SHA256 (mutt/patch-1.11.1.vvv.nntp.xz) = 2a6386a82cbf9afde162bfb1989e545fb222bf40c5f6fac169d9249d4c904c79
>-SIZE (mutt/patch-1.11.1.vvv.nntp.xz) = 49384
>-SHA256 (mutt/patch-1.11.1.vvv.initials.xz) = af45defbda3a85f86db3f8ef5235ddb6613a36fdc35540cdc9afa38409114a07
>-SIZE (mutt/patch-1.11.1.vvv.initials.xz) = 712
>+SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
>+SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
>+SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
>+SIZE (mutt/patch-1.12.1.vvv.initials.xz) = 724
>+SHA256 (mutt/patch-1.12.1.vvv.quote.xz) = 365200817a203a892094062445865b7b8f9ab37e8214ec526082876ffd0d8ab4
>+SIZE (mutt/patch-1.12.1.vvv.quote.xz) = 1332
>Index: mail/mutt/files/extra-patch-vvv.quote
>===================================================================
>--- mail/mutt/files/extra-patch-vvv.quote	(revision 508961)
>+++ mail/mutt/files/extra-patch-vvv.quote	(nonexistent)
>@@ -1,81 +0,0 @@
>---- PATCHES.orig	2019-06-15 21:17:01 UTC
>-+++ PATCHES
>-@@ -0,0 +1 @@
>-+vvv.quote
>---- handler.c.orig	2019-05-31 16:21:33 UTC
>-+++ handler.c
>-@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, STATE *s)
>- 	buf[--l] = 0;
>-     }
>-     if (s->prefix)
>--      state_puts (s->prefix, s);
>-+    {
>-+      int i;
>-+      char qbuf[2 * LONG_STRING];
>-+      int j = 0, offset = 0;
>-+      regmatch_t pmatch[1];
>-+
>-+      while (regexec ((regex_t *) QuoteRegexp.rx, &buf[offset], 1, pmatch, 0) == 0)
>-+	offset += pmatch->rm_eo;
>-+
>-+      if (!option (OPTQUOTEEMPTY) && !*buf)
>-+	strcpy (qbuf, buf);
>-+      else if (option (OPTQUOTEQUOTED) && offset)
>-+      {
>-+	for (i = 0; i < offset; i++)
>-+	  if (buf[i] != ' ')
>-+	    j = i;
>-+	strncpy (qbuf, buf, j + 1);
>-+	strcpy (qbuf + j + 1, buf + j);
>-+      }
>-+      else
>-+	snprintf (qbuf, sizeof (qbuf), "%s%s", NONULL(s->prefix), buf);
>-+
>-+      state_puts (qbuf, s);
>-+    }
>-+    else
>-     state_puts (buf, s);
>-     state_putc ('\n', s);
>-   }
>-@@ -1779,7 +1803,7 @@ int mutt_body_handler (BODY *b, STATE *s)
>-        */
>-       if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
>- 	encrypted_handler = handler = crypt_pgp_application_pgp_handler;
>--      else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
>-+      else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
>- 	handler = rfc3676_handler;
>-       else
>- 	handler = text_plain_handler;
>---- init.h.orig	2019-06-15 21:17:01 UTC
>-+++ init.h
>-@@ -2745,6 +2745,19 @@ struct option_t MuttVars[] = {
>-   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
>-   ** prompted for confirmation when you try to quit.
>-   */
>-+  { "quote_empty",	DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1 },
>-+  /*
>-+  ** .pp
>-+  ** Controls whether or not empty lines will be quoted using
>-+  ** ``$indent_string''.
>-+  */
>-+  { "quote_quoted",	DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0 },
>-+  /*
>-+  ** .pp
>-+  ** Controls how quoted lines will be quoted. If set, one quote
>-+  ** character will be added to the end of existing prefix.  Otherwise,
>-+  ** quoted lines will be prepended by ``$indent_string''.
>-+  */
>-   { "quote_regexp",	DT_RX,	 R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+" },
>-   /*
>-   ** .pp
>---- mutt.h.orig	2019-06-14 01:29:29 UTC
>-+++ mutt.h
>-@@ -479,6 +479,8 @@ enum
>-   OPTPRINTDECODE,
>-   OPTPRINTSPLIT,
>-   OPTPROMPTAFTER,
>-+  OPTQUOTEEMPTY,
>-+  OPTQUOTEQUOTED,
>-   OPTREADONLY,
>-   OPTREFLOWSPACEQUOTES,
>-   OPTREFLOWTEXT,
>
>Property changes on: mail/mutt/files/extra-patch-vvv.quote
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 239864: 206552 | 206568 | 206572