Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,127 @@
|
||||
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"
|
||||
|
||||
The shebang's max length is usually 128 as defined in
|
||||
/usr/include/linux/binfmts.h:
|
||||
#define BINPRM_BUF_SIZE 128
|
||||
|
||||
There would be errors when @PERL@ is longer than 128, use
|
||||
'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w'
|
||||
doesn't work:
|
||||
|
||||
/usr/bin/env: perl -w: No such file or directory
|
||||
|
||||
So replace "perl -w" with "use warnings" to make it work.
|
||||
|
||||
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 +++-
|
||||
src/vfs/extfs/helpers/mailfs.in | 3 ++-
|
||||
src/vfs/extfs/helpers/patchfs.in | 3 ++-
|
||||
src/vfs/extfs/helpers/ulib.in | 4 +++-
|
||||
src/vfs/extfs/helpers/uzip.in | 3 ++-
|
||||
6 files changed, 13 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
|
||||
index 08765d8..8aa7131 100644
|
||||
--- a/src/man2hlp/man2hlp.in
|
||||
+++ b/src/man2hlp/man2hlp.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL_FOR_BUILD@ -w
|
||||
+#! @PERL_FOR_BUILD@
|
||||
#
|
||||
# Man page to help file converter
|
||||
# Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
|
||||
diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in
|
||||
index 579441c..fe446f4 100644
|
||||
--- a/src/vfs/extfs/helpers/a+.in
|
||||
+++ b/src/vfs/extfs/helpers/a+.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @PERL@
|
||||
#
|
||||
# External filesystem for mc, using mtools
|
||||
# Written Ludek Brukner <lubr@barco.cz>, 1997
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
# These mtools components must be in PATH for this to work
|
||||
|
||||
+use warnings;
|
||||
+
|
||||
sub quote {
|
||||
$_ = shift(@_);
|
||||
s/([^\w\/.+-])/\\$1/g;
|
||||
diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
|
||||
index 4bdd68b..5bb373b 100644
|
||||
--- a/src/vfs/extfs/helpers/mailfs.in
|
||||
+++ b/src/vfs/extfs/helpers/mailfs.in
|
||||
@@ -1,6 +1,7 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @PERL@
|
||||
|
||||
use bytes;
|
||||
+use warnings;
|
||||
|
||||
# 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 c20cd54..1f1e75b 100644
|
||||
--- a/src/vfs/extfs/helpers/patchfs.in
|
||||
+++ b/src/vfs/extfs/helpers/patchfs.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @PERL@
|
||||
#
|
||||
# Written by Adam Byrtek <alpha@debian.org>, 2002
|
||||
# Rewritten by David Sterba <dave@jikos.cz>, 2009
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
use bytes;
|
||||
use strict;
|
||||
+use warnings;
|
||||
use POSIX;
|
||||
use File::Temp 'tempfile';
|
||||
|
||||
diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in
|
||||
index 418611f..82c7ccf 100644
|
||||
--- a/src/vfs/extfs/helpers/ulib.in
|
||||
+++ b/src/vfs/extfs/helpers/ulib.in
|
||||
@@ -1,9 +1,11 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @PERL@
|
||||
#
|
||||
# VFS to manage the gputils archives.
|
||||
# Written by Molnár Károly (proton7@freemail.hu) 2012
|
||||
#
|
||||
|
||||
+use warnings;
|
||||
+
|
||||
my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03',
|
||||
'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 c468f3a..ceffb53 100644
|
||||
--- a/src/vfs/extfs/helpers/uzip.in
|
||||
+++ b/src/vfs/extfs/helpers/uzip.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @PERL@
|
||||
#
|
||||
# zip file archive Virtual File System for Midnight Commander
|
||||
# Version 1.4.0 (2001-08-07).
|
||||
@@ -9,6 +9,7 @@
|
||||
use POSIX;
|
||||
use File::Basename;
|
||||
use strict;
|
||||
+use warnings;
|
||||
|
||||
#
|
||||
# Configuration options
|
||||
@@ -0,0 +1,33 @@
|
||||
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
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The man page date can vary depending upon the host perl, e.g. in Russian
|
||||
some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'.
|
||||
Rather than depend upon perl-native to fix this, just remove the date from
|
||||
the manpages.
|
||||
|
||||
RP 2020/2/4
|
||||
|
||||
Upstream-Status: Inappropriate [OE specficic reproducibility workaround]
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
---
|
||||
doc/man/date-of-man-include.am | 2 +-
|
||||
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 c6b1e69..165a796 100644
|
||||
--- a/doc/man/date-of-man-include.am
|
||||
+++ b/doc/man/date-of-man-include.am
|
||||
@@ -1,5 +1,5 @@
|
||||
SED_PARAMETERS = \
|
||||
- -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{%sysconfdir%{@sysconfdir@{g" \
|
||||
-e "s{%libexecdir%{@libexecdir@{g" \
|
||||
Reference in New Issue
Block a user