CVS commit: pkgsrc/sysutils/mc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 18 13:36:45 UTC 2021

Modified Files:
        pkgsrc/sysutils/mc: Makefile PLIST distinfo
        pkgsrc/sysutils/mc/patches: patch-src_subshell_common.c

Log Message:
mc: 4.8.27

Version 4.8.27

- Core

    * Minimal version of Autoconf is 2.64
    * Minimal version of Automake is 1.12
    * Minimal version of Gettext is 0.18.2
    * Minimal version of libssh2 is 1.2.8
    * Reimplement version detection
    * Significantly reduce rebuilt time after version change
    * Drop automatic migration of configuration from ~/.mc to XDG-based directories
    * zsh: support custom configuration file: ~/.local/share/mc/.zshrc
    * Widgets: implement WST_VISIBLE state to show/hide widgets
    * "Find File": add "Follow symlinks" option

- VFS

    * extfs: support unrar-6
    * extfs: support official 7z binary
    * ftpfs: apply file list parser from lftp project

- Editor

    * Word completion: get candidates from all open files
    * etags: get rid of hardcoded list length and window width
    * Update syntax files:
        - Python
    * Add syntax highlighting:
        - Verilog and SystemVerilog header files
        - JSON
        - openrc-run scripts

- Misc

    * Code clean up
    * Filehighlight of c++ and h++ files as sources
    * Filehighlight of JSON files as documents
    * Support of alacritty terminal emulator (https://github.com/alacritty/alacritty)
    * Support of foot terminal emulator (https://codeberg.org/dnkl/foot)
    * Support of (alt+)shift+arrow keys in st terminal emulator (st.suckless.org)
    * Mouse support in screen: don't check $DISPLAY variable
    * mc.ext: support fb2 e-books
    * ext.d: use mediainfo to view info about various media files
    * Remove OS/distro-specific package-related stuff from source tree

- Fixes

    * FTBFS against NCurses on OS X 10.9.5
    * Segfault on dialog before panels get visible
    * Crash if shadow is out of screen (build against NCurses)
    * Crash in search
    * Crash on startup with enabled subshell in FreeBSD (workaround)
    * Hang on start randomly with zsh as subshell
    * If command line is invisible it's partially displayed
    * Broken handling of zip archives
    * Broken handling of jar files as zip archives
    * Timestamps of symlinks, sockets, fifos, etc are not preserved after copy/move
    * %view action in the user menu doesn't work on no-exec filesystem
    * Hardlinks are not colored by file type or extension
    * mcedit: silent macro makes terminal disrupted
    * mcedit: disrupting of TAGS file path
    * vfs: unable to browse compressed tar archives
    * sftpfs vfs: CVE-2021-36370: server fingerprint isn't verified (discovered by AUT-milCERT during an audit of open source software)
    * ftpfs vfs: month of file is always January
    * Tests: log files are written by libcheck and automake simultaneously


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/sysutils/mc/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/mc/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/mc/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c

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

Modified files:

Index: pkgsrc/sysutils/mc/Makefile
diff -u pkgsrc/sysutils/mc/Makefile:1.123 pkgsrc/sysutils/mc/Makefile:1.124
--- pkgsrc/sysutils/mc/Makefile:1.123   Wed Sep 29 19:01:21 2021
+++ pkgsrc/sysutils/mc/Makefile Mon Oct 18 13:36:45 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.123 2021/09/29 19:01:21 adam Exp $
+# $NetBSD: Makefile,v 1.124 2021/10/18 13:36:45 nia Exp $
 
-DISTNAME=      mc-4.8.26
-PKGREVISION=   2
+DISTNAME=      mc-4.8.27
 CATEGORIES=    sysutils
 # Supports HTTPS, but cert is invalid...
 MASTER_SITES=  http://ftp.midnight-commander.org/

Index: pkgsrc/sysutils/mc/PLIST
diff -u pkgsrc/sysutils/mc/PLIST:1.21 pkgsrc/sysutils/mc/PLIST:1.22
--- pkgsrc/sysutils/mc/PLIST:1.21       Sun Jan 24 16:45:03 2021
+++ pkgsrc/sysutils/mc/PLIST    Mon Oct 18 13:36:45 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/01/24 16:45:03 nia Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/10/18 13:36:45 nia Exp $
 bin/mc
 bin/mcdiff
 bin/mcedit
@@ -195,7 +195,6 @@ share/mc/hints/mc.hint.uk
 share/mc/hints/mc.hint.zh
 share/mc/hints/mc.hint.zh_CN
 share/mc/hints/mc.hint.zh_TW
-share/mc/mc.charsets
 share/mc/mc.lib
 share/mc/skins/dark.ini
 share/mc/skins/darkfar.ini
@@ -267,6 +266,7 @@ share/mc/syntax/j.syntax
 share/mc/syntax/jal.syntax
 share/mc/syntax/java.syntax
 share/mc/syntax/js.syntax
+share/mc/syntax/json.syntax
 share/mc/syntax/kotlin.syntax
 share/mc/syntax/latex.syntax
 share/mc/syntax/lisp.syntax

Index: pkgsrc/sysutils/mc/distinfo
diff -u pkgsrc/sysutils/mc/distinfo:1.40 pkgsrc/sysutils/mc/distinfo:1.41
--- pkgsrc/sysutils/mc/distinfo:1.40    Thu Oct  7 14:58:04 2021
+++ pkgsrc/sysutils/mc/distinfo Mon Oct 18 13:36:45 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.40 2021/10/07 14:58:04 nia Exp $
+$NetBSD: distinfo,v 1.41 2021/10/18 13:36:45 nia Exp $
 
-RMD160 (mc-4.8.26.tar.xz) = 5a5eea55bd90fb8f2687062e00ef040233bb9679
-SHA512 (mc-4.8.26.tar.xz) = f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
-Size (mc-4.8.26.tar.xz) = 2492612 bytes
+RMD160 (mc-4.8.27.tar.xz) = d1d9aff2bcd569018ef1a66bc58785acc20c3749
+SHA512 (mc-4.8.27.tar.xz) = c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
+Size (mc-4.8.27.tar.xz) = 2510296 bytes
 SHA1 (patch-contrib_Makefile.in) = 0b9ad555c2f702cba12b6b5e5f0ae07c16499903
 SHA1 (patch-misc_Makefile.in) = b17cdebdcd0adae91a6cff3f25939cebeb1e964f
-SHA1 (patch-src_subshell_common.c) = b6d390da68aa0028d21683b1959340e51f67efd6
+SHA1 (patch-src_subshell_common.c) = f38eab7cae73799509c57e2fe507d085701e541f
 SHA1 (patch-src_vfs_sfs_Makefile.in) = 90ce81b0dcf2ef2134884137d86e147219d180ed

Index: pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c
diff -u pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c:1.2 pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c:1.3
--- pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c:1.2  Fri Jan 18 22:28:38 2019
+++ pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c      Mon Oct 18 13:36:45 2021
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_subshell_common.c,v 1.2 2019/01/18 22:28:38 bsiegert Exp $
+$NetBSD: patch-src_subshell_common.c,v 1.3 2021/10/18 13:36:45 nia Exp $
 
 Report error from read since tcsetattr can replace errno.
 Recognize /bin/sh as valid shell and don't complain about it.
 
---- src/subshell/common.c.orig 2018-12-28 19:35:25.000000000 +0000
+--- src/subshell/common.c.orig 2021-08-01 16:45:58.000000000 +0000
 +++ src/subshell/common.c
-@@ -317,6 +317,7 @@ init_subshell_child (const char *pty_nam
+@@ -345,6 +345,7 @@ init_subshell_child (const char *pty_nam
  
      case SHELL_ASH_BUSYBOX:
      case SHELL_DASH:
 +    case SHELL_SH:
          /* Do we have a custom init file ~/.local/share/mc/ashrc? */
-         init_file = mc_config_get_full_path ("ashrc");
+         init_file = mc_config_get_full_path (MC_ASHRC_FILE);
  
-@@ -510,7 +511,7 @@ static gboolean
+@@ -740,7 +741,7 @@ static gboolean
  feed_subshell (int how, gboolean fail_on_error)
  {
      fd_set read_set;            /* For 'select' */
@@ -22,7 +22,24 @@ Recognize /bin/sh as valid shell and don
      int i;                      /* Loop counter */
  
      struct timeval wtime;       /* Maximum time we wait for the subshell */
-@@ -565,19 +566,20 @@ feed_subshell (int how, gboolean fail_on
+@@ -774,6 +775,7 @@ feed_subshell (int how, gboolean fail_on
+ 
+         if (select (maxfdp + 1, &read_set, NULL, NULL, wptr) == -1)
+         {
++            serrno = errno;
+             /* Despite using SA_RESTART, we still have to check for this */
+             if (errno == EINTR)
+             {
+@@ -784,7 +786,7 @@ feed_subshell (int how, gboolean fail_on
+             }
+             tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
+             fprintf (stderr, "select (FD_SETSIZE, &read_set...): %s\r\n",
+-                     unix_error_string (errno));
++                     unix_error_string (serrno));
+             exit (EXIT_FAILURE);
+         }
+ 
+@@ -797,19 +799,20 @@ feed_subshell (int how, gboolean fail_on
              /* for (i=0; i<5; ++i)  * FIXME -- experimental */
          {
              bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer));
@@ -46,3 +63,27 @@ Recognize /bin/sh as valid shell and don
                  exit (EXIT_FAILURE);
  #endif
              }
+@@ -827,9 +830,10 @@ feed_subshell (int how, gboolean fail_on
+             bytes = read (subshell_pipe[READ], subshell_cwd, sizeof (subshell_cwd));
+             if (bytes <= 0)
+             {
++                serrno = errno;
+                 tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
+                 fprintf (stderr, "read (subshell_pipe[READ]...): %s\r\n",
+-                         unix_error_string (errno));
++                         unix_error_string (serrno));
+                 exit (EXIT_FAILURE);
+             }
+ 
+@@ -854,9 +858,10 @@ feed_subshell (int how, gboolean fail_on
+             bytes = read (STDIN_FILENO, pty_buffer, sizeof (pty_buffer));
+             if (bytes <= 0)
+             {
++                serrno = errno;
+                 tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
+                 fprintf (stderr,
+-                         "read (STDIN_FILENO, pty_buffer...): %s\r\n", unix_error_string (errno));
++                         "read (STDIN_FILENO, pty_buffer...): %s\r\n", unix_error_string (serrno));
+                 exit (EXIT_FAILURE);
+             }
+