 @@ -1,17 +1,16 @@
-# $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
+DISTNAME=	mc-4.8.27
 PKGREVISION=	2
 CATEGORIES=	sysutils
 # Supports HTTPS, but cert is invalid...
 MASTER_SITES=	http://ftp.midnight-commander.org/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	cheusov@NetBSD.org
 HOMEPAGE=	https://www.midnight-commander.org/
 COMMENT=	User-friendly file manager and visual shell
 LICENSE=	gnu-gpl-v2
 USE_TOOLS+=		pkg-config unzip:run perl:build gmake
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes

 @@ -1,14 +1,14 @@
-@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
 bin/mcview
 libexec/mc/ext.d/archive.sh
 libexec/mc/ext.d/doc.sh
 libexec/mc/ext.d/image.sh
 libexec/mc/ext.d/misc.sh
 libexec/mc/ext.d/package.sh
 libexec/mc/ext.d/sound.sh
 libexec/mc/ext.d/text.sh
 libexec/mc/ext.d/video.sh
 libexec/mc/ext.d/web.sh
 @@ -185,27 +185,26 @@ share/mc/hints/mc.hint.pl
 share/mc/hints/mc.hint.pt
 share/mc/hints/mc.hint.pt_BR
 share/mc/hints/mc.hint.ro
 share/mc/hints/mc.hint.ru
 share/mc/hints/mc.hint.sk
 share/mc/hints/mc.hint.sr
 share/mc/hints/mc.hint.sv
 share/mc/hints/mc.hint.sv_SE
 share/mc/hints/mc.hint.tr
 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
 share/mc/skins/default.ini
 share/mc/skins/double-lines.ini
 share/mc/skins/featured-plus.ini
 share/mc/skins/featured.ini
 share/mc/skins/gotar.ini
 share/mc/skins/gray-green-purple256.ini
 share/mc/skins/gray-orange-blue256.ini
 share/mc/skins/julia256.ini
 share/mc/skins/mc46.ini
 share/mc/skins/modarcon16-defbg.ini
 @@ -257,26 +256,27 @@ share/mc/syntax/f90.syntax
 share/mc/syntax/filehighlight.syntax
 share/mc/syntax/fortran.syntax
 share/mc/syntax/glsl.syntax
 share/mc/syntax/go.syntax
 share/mc/syntax/haskell.syntax
 share/mc/syntax/hive.syntax
 share/mc/syntax/html.syntax
 share/mc/syntax/idl.syntax
 share/mc/syntax/ini.syntax
 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
 share/mc/syntax/lkr.syntax
 share/mc/syntax/lsm.syntax
 share/mc/syntax/lua.syntax
 share/mc/syntax/m4.syntax
 share/mc/syntax/mail.syntax
 share/mc/syntax/makefile.syntax
 share/mc/syntax/markdown.syntax
 share/mc/syntax/meson.syntax
 share/mc/syntax/ml.syntax
 share/mc/syntax/named.syntax

 @@ -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
+RMD160 (mc-4.8.27.tar.xz) = d1d9aff2bcd569018ef1a66bc58785acc20c3749
-SHA512 (mc-4.8.26.tar.xz) = f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
+SHA512 (mc-4.8.27.tar.xz) = c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
-Size (mc-4.8.26.tar.xz) = 2492612 bytes
+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

 @@ -1,48 +1,89 @@
-$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' */
 -    int bytes;                  /* For the return value from 'read' */
 +    int serrno, bytes;                  /* For the return value from 'read' */
      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));
 +            serrno = errno;
              /* The subshell has died */
 -            if (bytes == -1 && errno == EIO && !subshell_alive)
 +            if (((bytes == -1 && errno == EIO) || bytes == 0) && !subshell_alive)
                  return FALSE;
 -            if (bytes <= 0)
 +            if (bytes < 0)
+             {
  #ifdef PTY_ZEROREAD
                  /* On IBM i, read(1) can return 0 for a non-closed fd */
                  continue;
  #else
                  tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
 -                fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (errno));
 +                fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (serrno));
                  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);
+             }