4 files changed, 18 insertions, 73 deletions
diff --git a/source/ap/mc/mc-3611-fish-fix-perl-ls-helper.patch b/source/ap/mc/mc-3611-fish-fix-perl-ls-helper.patch
deleted file mode 100644
index 4010bd058..000000000
--- a/source/ap/mc/mc-3611-fish-fix-perl-ls-helper.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e274e58cb7dff1683480f5538fd1bfa41a85c0c7 Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <and@gmx.li>
-Date: Sun, 13 Mar 2016 20:59:47 +0000
-Subject: [PATCH] Fish: fix perl ls helper
-
-With #3599 I introduce a perl warning in fish_list_perl()
-so fish_list_perl() was skipped (return code 255) and fallback ls
-function was used instead.
-
-Plus all % chars must quoted because of g_strconcat() after reading
-script file into string.
-
-Fix it!
-
-Signed-off-by: Andreas Mohr <and@gmx.li>
----
- src/vfs/fish/helpers/ls | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vfs/fish/helpers/ls b/src/vfs/fish/helpers/ls
-index 1284e17..909a77d 100755
---- a/src/vfs/fish/helpers/ls
-+++ b/src/vfs/fish/helpers/ls
-@@ -138,8 +138,8 @@ while((my $filename = readdir (DIR))){
-         my $linkname = readlink ("$dirname/$filename");
-         $linkname =~ $strutils_shell_escape_regex;
-         printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"%%s\" -> \"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename, $linkname);
--    } elseif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
--        my $minor = $rdev % 256;
-+    } elsif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
-+        my $minor = $rdev %% 256;
-         my $major = int( $rdev / 256 );
-         printf("R%%o %%o $uid.$gid\nE$major,$minor\nd$mloctime\n:\"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename);
-     } else {
diff --git a/source/ap/mc/mc-syntax-error.patch b/source/ap/mc/mc-syntax-error.patch
deleted file mode 100644
index 8b7b7d393..000000000
--- a/source/ap/mc/mc-syntax-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/vfs/extfs/helpers/patchfs.in
-+++ src/vfs/extfs/helpers/patchfs.in
-@@ -80,10 +80,10 @@
-     my ($qfname)=(quotemeta $_[0]);
- 
-     $_=`$fileutil $qfname`;
--    } elsif (/^'*lzip/) {
--	return "$lzip -dc $qfname";
-     if (/^'*lz4/) {
- 	return "$lz4 -dc $qfname";
-+    } elsif (/^'*lzip/) {
-+	return "$lzip -dc $qfname";
-     } elsif (/^'*lzma/) {
- 	return "$lzma -dc $qfname";
-     } elsif (/^'*xz/) {
-@@ -104,10 +104,10 @@
-     my ($sep) = $append ? '>>' : '>';
- 
-     $_=`$fileutil $qfname`;
--    } elsif (/^'*lzip/) {
--	return "$lzip -c $sep $qfname";
-     if (/^'*lz4/) {
- 	return "$lz4 -c $sep $qfname";
-+    } elsif (/^'*lzip/) {
-+	return "$lzip -c $sep $qfname";
-     } elsif (/^'*lzma/) {
- 	return "$lzma -c $sep $qfname";
-     } elsif (/^'*xz/) {
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index b66b432db..abab4c715 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,7 +20,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
+PKGNAM=mc
 VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
 BUILD=${BUILD:-2}
 
@@ -34,6 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i586" ]; then
@@ -46,7 +56,6 @@ else
   SLKCFLAGS="-O2"
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mc
 rm -rf $PKG
@@ -69,8 +78,6 @@ zcat $CWD/mc.image.sh.geeqie.diff.gz | patch -p1 --verbose || exit 1
 
 # Upstream fixes:
 zcat $CWD/mc-3605-extfs.c-fix-buffer-overflow.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mc-3611-fish-fix-perl-ls-helper.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/mc-syntax-error.patch.gz | patch -p0 --verbose || exit 1
 
 if [ ! -x ./configure ]; then
   ./autogen.sh
diff --git a/source/ap/mc/slack-desc b/source/ap/mc/slack-desc
index be6ca439a..f2e1e238c 100644
--- a/source/ap/mc/slack-desc
+++ b/source/ap/mc/slack-desc
@@ -1,17 +1,17 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
   |-----handy-ruler------------------------------------------------------|
 mc: mc (Midnight Commander file manager)
 mc:
 mc: The Midnight Commander is a Norton Commander clone, a program that
-mc: manipulates and manages files and directories.  Useful, fast, and has
-mc: color displays on the Linux console.  Mouse support is provided
-mc: through the gpm mouse server.  This is a lightweight compilation of
+mc: manipulates and manages files and directories. Useful, fast, and has
+mc: color displays on the Linux console. Mouse support is provided
+mc: through the gpm mouse server. This is a lightweight compilation of
 mc: mc for use on the text console or in an xterm.
 mc:
 mc: mc was written by Miguel de Icaza and Mauricio Plaza.