mc: update 4.8.28 -> 4.8.29

(From OE-Core rev: 46701b356d5d0e5ebe1aa7544a02b28a0fb0c035)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 12 insertions, 14 deletions

diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
index 012a499684..5ede82d342 100644
--- a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
+++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
@@ -1,4 +1,4 @@
-From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001
+From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Thu, 6 Apr 2017 02:24:28 -0700
 Subject: [PATCH] mc: replace "perl -w" with "use warnings"
@@ -20,6 +20,7 @@ The man2hlp.in already has "use warnings;", so just remove '-w' is OK.
 Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174]
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
 ---
  src/man2hlp/man2hlp.in           | 2 +-
  src/vfs/extfs/helpers/a+.in      | 4 +++-
@@ -30,12 +31,12 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  6 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
-index f095830..558a674 100644
+index 08765d8..8aa7131 100644
 --- a/src/man2hlp/man2hlp.in
 +++ b/src/man2hlp/man2hlp.in
 @@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @PERL@
+-#! @PERL_FOR_BUILD@ -w
++#! @PERL_FOR_BUILD@
  #
  #  Man page to help file converter
  #  Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -59,7 +60,7 @@ index 579441c..fe446f4 100644
      $_ = shift(@_);
      s/([^\w\/.+-])/\\$1/g;
 diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
-index e9455be..059f41f 100644
+index 4bdd68b..5bb373b 100644
 --- a/src/vfs/extfs/helpers/mailfs.in
 +++ b/src/vfs/extfs/helpers/mailfs.in
 @@ -1,6 +1,7 @@
@@ -72,7 +73,7 @@ index e9455be..059f41f 100644
  # MC extfs for (possibly compressed) Berkeley style mailbox files
  # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24)
 diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in
-index ef407de..3ad4b53 100644
+index c20cd54..1f1e75b 100644
 --- a/src/vfs/extfs/helpers/patchfs.in
 +++ b/src/vfs/extfs/helpers/patchfs.in
 @@ -1,4 +1,4 @@
@@ -107,7 +108,7 @@ index 418611f..82c7ccf 100644
               'apr' => '04', 'may' => '05', 'jun' => '06',
               'jul' => '07', 'aug' => '08', 'sep' => '09',
 diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
-index b1c4f90..c8eb335 100644
+index c468f3a..ceffb53 100644
 --- a/src/vfs/extfs/helpers/uzip.in
 +++ b/src/vfs/extfs/helpers/uzip.in
 @@ -1,4 +1,4 @@
@@ -124,6 +125,3 @@ index b1c4f90..c8eb335 100644
  
  #
  # Configuration options
--- 
-2.10.2
-
diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch
index c01d065b0e..4ebaaa2fa7 100644
--- a/meta/recipes-extended/mc/files/nomandate.patch
+++ b/meta/recipes-extended/mc/files/nomandate.patch
@@ -1,4 +1,4 @@
-From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001
+From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Tue, 4 Feb 2020 18:12:15 +0000
 Subject: [PATCH] mc: Fix manpage date indeterminism
@@ -21,7 +21,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
-index 3a4e599..f11e9b3 100644
+index c6b1e69..165a796 100644
 --- a/doc/man/date-of-man-include.am
 +++ b/doc/man/date-of-man-include.am
 @@ -1,5 +1,5 @@
@@ -29,5 +29,5 @@ index 3a4e599..f11e9b3 100644
 -       -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
 +       -e "s/%DATE_OF_MAN_PAGE%//g" \
         -e "s/%MAN_VERSION%/@MAN_VERSION@/g" \
-        -e "s{%prefix%{@prefix@{g" \
         -e "s{%sysconfdir%{@sysconfdir@{g" \
+        -e "s{%libexecdir%{@libexecdir@{g" \
diff --git a/meta/recipes-extended/mc/mc_4.8.28.bb b/meta/recipes-extended/mc/mc_4.8.29.bb
index 9a950a8cd0..c9db172183 100644
--- a/meta/recipes-extended/mc/mc_4.8.28.bb
+++ b/meta/recipes-extended/mc/mc_4.8.29.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://0001-mc-replace-perl-w-with-use-warnings.patch \
            file://nomandate.patch \
            "
-SRC_URI[sha256sum] = "6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c"
+SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1"
 
 # remove at next version upgrade or when output changes
 HASHEQUIV_HASH_VERSION .= ".2"