Fri Jan 18 22:28:38 2019 UTC ()
Update mc to 4.8.22.

Major changes since 4.8.21

Core

  - Support BTRFS's file clone operation (#1983)
  - Find file: show pattern and content in the results window title (#3453)
  - Find file: remember state (empty or not) of Content field (#3924)
  - Improve support IBM i (#3927)
  - Improve handling of hard link creation errors (#3678)
  - Support user-defined prompt in the Fish subshell (#3944)

VFS

  - sftp: preserve atime and mtime (#3917)

Editor

  - man page cleanup (#3918)
  - syntax:
      - PHP - highlight keyword 'null' (#3920)
      - Meson - initial implementation (#3940)

Misc

  - ext.d: use MPV as a fallback for mplayer -identify (#3919)
  - ext.d: improve recognition of MS Office formats (#3929)
  - Code cleanup (#3915)
  - Cleanup hint files

Fixes

  - Won't compile for Apple (#3930)
  - "Cannot create target file" when target has backslash space in the name (#
    3923)
  - Quiet single file overwrite (#3908)
  - Show error message for each not-installed program when view documents in MS
    Word and Excel formats (#3926)
  - Crash when trying some sftp connections (#3937)
  - Crash when return to filemanager from subshell (#3943)


(bsiegert)
diff -r1.112 -r1.113 pkgsrc/sysutils/mc/Makefile
diff -r1.16 -r1.17 pkgsrc/sysutils/mc/PLIST
diff -r1.32 -r1.33 pkgsrc/sysutils/mc/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c
cvs diff -r1.112 -r1.113 pkgsrc/sysutils/mc/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/mc/Makefile 2018/11/20 08:04:59 1.112
+++ pkgsrc/sysutils/mc/Makefile 2019/01/18 22:28:38 1.113
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.112 2018/11/20 08:04:59 maya Exp $ 1# $NetBSD: Makefile,v 1.113 2019/01/18 22:28:38 bsiegert Exp $
2 2
3DISTNAME= mc-4.8.21 3DISTNAME= mc-4.8.22
4PKGREVISION= 1 
5CATEGORIES= sysutils 4CATEGORIES= sysutils
6MASTER_SITES= http://www.midnight-commander.org/downloads/ 5MASTER_SITES= http://www.midnight-commander.org/downloads/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= cheusov@NetBSD.org 8MAINTAINER= cheusov@NetBSD.org
10HOMEPAGE= http://www.midnight-commander.org/ 9HOMEPAGE= http://www.midnight-commander.org/
11COMMENT= User-friendly file manager and visual shell 10COMMENT= User-friendly file manager and visual shell
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14USE_TOOLS+= pkg-config unzip:run perl:build gmake 13USE_TOOLS+= pkg-config unzip:run perl:build gmake
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
17 16
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/mc/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/mc/PLIST 2018/06/17 08:21:58 1.16
+++ pkgsrc/sysutils/mc/PLIST 2019/01/18 22:28:38 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2018/06/17 08:21:58 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.17 2019/01/18 22:28:38 bsiegert Exp $
2bin/mc 2bin/mc
3bin/mcdiff 3bin/mcdiff
4bin/mcedit 4bin/mcedit
5bin/mcview 5bin/mcview
6libexec/mc/ext.d/archive.sh 6libexec/mc/ext.d/archive.sh
7libexec/mc/ext.d/doc.sh 7libexec/mc/ext.d/doc.sh
8libexec/mc/ext.d/image.sh 8libexec/mc/ext.d/image.sh
9libexec/mc/ext.d/misc.sh 9libexec/mc/ext.d/misc.sh
10libexec/mc/ext.d/package.sh 10libexec/mc/ext.d/package.sh
11libexec/mc/ext.d/sound.sh 11libexec/mc/ext.d/sound.sh
12libexec/mc/ext.d/text.sh 12libexec/mc/ext.d/text.sh
13libexec/mc/ext.d/video.sh 13libexec/mc/ext.d/video.sh
14libexec/mc/ext.d/web.sh 14libexec/mc/ext.d/web.sh
@@ -273,26 +273,27 @@ share/mc/syntax/ini.syntax @@ -273,26 +273,27 @@ share/mc/syntax/ini.syntax
273share/mc/syntax/j.syntax 273share/mc/syntax/j.syntax
274share/mc/syntax/jal.syntax 274share/mc/syntax/jal.syntax
275share/mc/syntax/java.syntax 275share/mc/syntax/java.syntax
276share/mc/syntax/js.syntax 276share/mc/syntax/js.syntax
277share/mc/syntax/latex.syntax 277share/mc/syntax/latex.syntax
278share/mc/syntax/lisp.syntax 278share/mc/syntax/lisp.syntax
279share/mc/syntax/lkr.syntax 279share/mc/syntax/lkr.syntax
280share/mc/syntax/lsm.syntax 280share/mc/syntax/lsm.syntax
281share/mc/syntax/lua.syntax 281share/mc/syntax/lua.syntax
282share/mc/syntax/m4.syntax 282share/mc/syntax/m4.syntax
283share/mc/syntax/mail.syntax 283share/mc/syntax/mail.syntax
284share/mc/syntax/makefile.syntax 284share/mc/syntax/makefile.syntax
285share/mc/syntax/markdown.syntax 285share/mc/syntax/markdown.syntax
 286share/mc/syntax/meson.syntax
286share/mc/syntax/ml.syntax 287share/mc/syntax/ml.syntax
287share/mc/syntax/named.syntax 288share/mc/syntax/named.syntax
288share/mc/syntax/nemerle.syntax 289share/mc/syntax/nemerle.syntax
289share/mc/syntax/nroff.syntax 290share/mc/syntax/nroff.syntax
290share/mc/syntax/octave.syntax 291share/mc/syntax/octave.syntax
291share/mc/syntax/opencl.syntax 292share/mc/syntax/opencl.syntax
292share/mc/syntax/osl.syntax 293share/mc/syntax/osl.syntax
293share/mc/syntax/pascal.syntax 294share/mc/syntax/pascal.syntax
294share/mc/syntax/perl.syntax 295share/mc/syntax/perl.syntax
295share/mc/syntax/php.syntax 296share/mc/syntax/php.syntax
296share/mc/syntax/po.syntax 297share/mc/syntax/po.syntax
297share/mc/syntax/povray.syntax 298share/mc/syntax/povray.syntax
298share/mc/syntax/procmail.syntax 299share/mc/syntax/procmail.syntax
cvs diff -r1.32 -r1.33 pkgsrc/sysutils/mc/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/mc/distinfo 2018/06/17 08:21:58 1.32
+++ pkgsrc/sysutils/mc/distinfo 2019/01/18 22:28:38 1.33
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.32 2018/06/17 08:21:58 wiz Exp $ 1$NetBSD: distinfo,v 1.33 2019/01/18 22:28:38 bsiegert Exp $
2 2
3SHA1 (mc-4.8.21.tar.bz2) = bb1c3b7107cc0fa877edf669628e7c7a8ffdc962 3SHA1 (mc-4.8.22.tar.bz2) = ec30588765ecab685f37b825d1b318a35f9f88b5
4RMD160 (mc-4.8.21.tar.bz2) = 9e74eafcce2c59afc25fd17d4caa0ee2ddd1c031 4RMD160 (mc-4.8.22.tar.bz2) = 870be10c5b8eff5ed6193fe245a1e77308910e0e
5SHA512 (mc-4.8.21.tar.bz2) = 20799b5936f0cc166869af42b5bf7b737bbccee4adfc24be16d3b4ebd2f911d60d48359a081f69ecd06cf02182aeeab98e8ac352bc219fe3560c4cfe5374451e 5SHA512 (mc-4.8.22.tar.bz2) = 7eb0b3bdc57bd39b76c13297721ac94d3b215675f9a69dfb69ef4c7eb13ccbcb42dd15c7b57fdf3dd92b52dad1152d6d620851683d37e9d6adc3ed88aebc6f2f
6Size (mc-4.8.21.tar.bz2) = 3381888 bytes 6Size (mc-4.8.22.tar.bz2) = 3415985 bytes
7SHA1 (patch-ac) = d01357b685acd8e863510248ed7519ae2821757f 7SHA1 (patch-ac) = d01357b685acd8e863510248ed7519ae2821757f
8SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95 8SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95
9SHA1 (patch-configure) = 8fdc579fb4d8d4c018488b9b160bb24f9a82aa42 9SHA1 (patch-configure) = 8fdc579fb4d8d4c018488b9b160bb24f9a82aa42
10SHA1 (patch-src_subshell_common.c) = 6fc3a92e6116527f7ead9d9515906add0b30ff5e 10SHA1 (patch-src_subshell_common.c) = b6d390da68aa0028d21683b1959340e51f67efd6
11SHA1 (patch-src_vfs_extfs_helpers_Makefile.in) = c5d4735ce9548714731fdb1227e1acac78f11332 11SHA1 (patch-src_vfs_extfs_helpers_Makefile.in) = c5d4735ce9548714731fdb1227e1acac78f11332
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c (expand / switch to unified diff)

--- pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c 2016/12/16 00:02:28 1.1
+++ pkgsrc/sysutils/mc/patches/patch-src_subshell_common.c 2019/01/18 22:28:38 1.2
@@ -1,44 +1,48 @@ @@ -1,44 +1,48 @@
1$NetBSD: patch-src_subshell_common.c,v 1.1 2016/12/16 00:02:28 joerg Exp $ 1$NetBSD: patch-src_subshell_common.c,v 1.2 2019/01/18 22:28:38 bsiegert Exp $
2 2
3Report error from read since tcsetattr can replace errno. 3Report error from read since tcsetattr can replace errno.
4Recognize /bin/sh as valid shell and don't complain about it. 4Recognize /bin/sh as valid shell and don't complain about it.
5 5
6--- src/subshell/common.c.orig 2016-09-22 18:24:12.000000000 +0000 6--- src/subshell/common.c.orig 2018-12-28 19:35:25.000000000 +0000
7+++ src/subshell/common.c 7+++ src/subshell/common.c
8@@ -303,6 +303,7 @@ init_subshell_child (const char *pty_nam 8@@ -317,6 +317,7 @@ init_subshell_child (const char *pty_nam
9  9
10 case SHELL_ASH_BUSYBOX: 10 case SHELL_ASH_BUSYBOX:
11 case SHELL_DASH: 11 case SHELL_DASH:
12+ case SHELL_SH: 12+ case SHELL_SH:
13 /* Do we have a custom init file ~/.local/share/mc/ashrc? */ 13 /* Do we have a custom init file ~/.local/share/mc/ashrc? */
14 init_file = mc_config_get_full_path ("ashrc"); 14 init_file = mc_config_get_full_path ("ashrc");
15  15
16@@ -496,7 +497,7 @@ static gboolean 16@@ -510,7 +511,7 @@ static gboolean
17 feed_subshell (int how, gboolean fail_on_error) 17 feed_subshell (int how, gboolean fail_on_error)
18 { 18 {
19 fd_set read_set; /* For 'select' */ 19 fd_set read_set; /* For 'select' */
20- int bytes; /* For the return value from 'read' */ 20- int bytes; /* For the return value from 'read' */
21+ int serrno, bytes; /* For the return value from 'read' */ 21+ int serrno, bytes; /* For the return value from 'read' */
22 int i; /* Loop counter */ 22 int i; /* Loop counter */
23  23
24 struct timeval wtime; /* Maximum time we wait for the subshell */ 24 struct timeval wtime; /* Maximum time we wait for the subshell */
25@@ -551,15 +552,16 @@ feed_subshell (int how, gboolean fail_on 25@@ -565,19 +566,20 @@ feed_subshell (int how, gboolean fail_on
26 /* for (i=0; i<5; ++i) * FIXME -- experimental */ 26 /* for (i=0; i<5; ++i) * FIXME -- experimental */
27 { 27 {
28 bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer)); 28 bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer));
29+ serrno = errno; 29+ serrno = errno;
30  30
31 /* The subshell has died */ 31 /* The subshell has died */
32- if (bytes == -1 && errno == EIO && !subshell_alive) 32- if (bytes == -1 && errno == EIO && !subshell_alive)
33+ if (((bytes == -1 && errno == EIO) || bytes == 0) && !subshell_alive) 33+ if (((bytes == -1 && errno == EIO) || bytes == 0) && !subshell_alive)
34 return FALSE; 34 return FALSE;
35  35
36- if (bytes <= 0) 36- if (bytes <= 0)
37+ if (bytes < 0) 37+ if (bytes < 0)
38 { 38 {
 39 #ifdef PTY_ZEROREAD
 40 /* On IBM i, read(1) can return 0 for a non-closed fd */
 41 continue;
 42 #else
39 tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode); 43 tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode);
40- fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (errno)); 44- fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (errno));
41+ fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (serrno)); 45+ fprintf (stderr, "read (subshell_pty...): %s\r\n", unix_error_string (serrno));
42 exit (EXIT_FAILURE); 46 exit (EXIT_FAILURE);
 47 #endif
43 } 48 }
44