CVS commit: pkgsrc/misc/less

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb  7 20:32:34 UTC 2023

Modified Files:
        pkgsrc/misc/less: Makefile distinfo
Added Files:
        pkgsrc/misc/less/patches: patch-line.c

Log Message:
less: add upstream patch to avoid less -R escape.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/misc/less/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/misc/less/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/less/patches/patch-line.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/less/Makefile
diff -u pkgsrc/misc/less/Makefile:1.30 pkgsrc/misc/less/Makefile:1.31
--- pkgsrc/misc/less/Makefile:1.30      Thu Sep 15 11:02:14 2022
+++ pkgsrc/misc/less/Makefile   Tue Feb  7 20:32:34 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2022/09/15 11:02:14 leot Exp $
+# $NetBSD: Makefile,v 1.31 2023/02/07 20:32:34 wiz Exp $
 
 DISTNAME=      less-608
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://www.greenwoodsoftware.com/less/
 

Index: pkgsrc/misc/less/distinfo
diff -u pkgsrc/misc/less/distinfo:1.23 pkgsrc/misc/less/distinfo:1.24
--- pkgsrc/misc/less/distinfo:1.23      Thu Sep 15 11:02:14 2022
+++ pkgsrc/misc/less/distinfo   Tue Feb  7 20:32:34 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23 2022/09/15 11:02:14 leot Exp $
+$NetBSD: distinfo,v 1.24 2023/02/07 20:32:34 wiz Exp $
 
 BLAKE2s (less-608.tar.gz) = b96aedc410ad1072253e0e22da1d059a1396fda6f454f778df9b13388f88b007
 SHA512 (less-608.tar.gz) = 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 Size (less-608.tar.gz) = 362346 bytes
 SHA1 (patch-Makefile.in) = 4b47caa52dfb236da1b51a74902b98d7aa3237f4
+SHA1 (patch-line.c) = 43116af39c37c14f6fa68999aee6ac4ee44d929c

Added files:

Index: pkgsrc/misc/less/patches/patch-line.c
diff -u /dev/null pkgsrc/misc/less/patches/patch-line.c:1.1
--- /dev/null   Tue Feb  7 20:32:34 2023
+++ pkgsrc/misc/less/patches/patch-line.c       Tue Feb  7 20:32:34 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-line.c,v 1.1 2023/02/07 20:32:34 wiz Exp $
+
+End OSC8 hyperlink on invalid embedded escape sequence.
+https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c
+
+--- line.c.orig        2022-07-22 19:26:24.000000000 +0000
++++ line.c
+@@ -633,8 +633,8 @@ ansi_step(pansi, ch)
+               /* Hyperlink ends with \7 or ESC-backslash. */
+               if (ch == '\7')
+                       return ANSI_END;
+-              if (pansi->prev_esc && ch == '\\')
+-                      return ANSI_END;
++              if (pansi->prev_esc)
++                      return (ch == '\\') ? ANSI_END : ANSI_ERR;
+               pansi->prev_esc = (ch == ESC);
+               return ANSI_MID;
+       }