Compare commits

...

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

10 changed files with 81 additions and 299 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
/*.tar.gz
SOURCES/mc-4.8.19.tar.xz
/mc-4.8.19.tar.xz

1
EMPTY Normal file
View File

@ -0,0 +1 @@

View File

@ -0,0 +1,20 @@
--- contrib/mc-wrapper.csh.in~ 2017-02-24 14:25:57.000000000 -0600
+++ contrib/mc-wrapper.csh.in 2017-05-17 07:39:06.830108548 -0500
@@ -3,7 +3,7 @@
if ($?TMPDIR) then
setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
else
- setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
+ setenv MC_PWD_FILE /var/tmp/mc-$MC_USER/mc.pwd.$$
endif
@bindir@/mc -P "$MC_PWD_FILE" $*
--- contrib/mc-wrapper.sh.in~ 2017-02-24 14:25:57.000000000 -0600
+++ contrib/mc-wrapper.sh.in 2017-05-17 07:38:48.348215251 -0500
@@ -1,5 +1,5 @@
MC_USER=`id | sed 's/[^(]*(//;s/).*//'`
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
+MC_PWD_FILE="${TMPDIR-/var/tmp}/mc-$MC_USER/mc.pwd.$$"
@bindir@/mc -P "$MC_PWD_FILE" "$@"
if test -r "$MC_PWD_FILE"; then

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,13 +0,0 @@
--- mc-4.8.23.orig/src/setup.c 2019-06-16 18:49:31.000000000 +0100
+++ mc-4.8.23/src/setup.c 2019-07-06 13:13:22.792243501 +0100
@@ -138,8 +138,8 @@
.fast_reload_msg_shown = FALSE,
.mark_moves_down = TRUE,
.reverse_files_only = TRUE,
- .auto_save_setup = FALSE,
- .navigate_with_arrows = FALSE,
+ .auto_save_setup = TRUE,
+ .navigate_with_arrows = TRUE,
.scroll_pages = TRUE,
.scroll_center = FALSE,
.mouse_move_pages = TRUE,

View File

@ -1,70 +0,0 @@
diff -up mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 mc-4.8.24/src/vfs/extfs/helpers/uc1541
--- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 2020-01-20 14:40:30.637996501 +0100
+++ mc-4.8.24/src/vfs/extfs/helpers/uc1541 2020-01-20 14:37:55.253442507 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
UC1541 Virtual filesystem
--- a/src/vfs/extfs/helpers/s3+.in (original)
+++ b/src/vfs/extfs/helpers/s3+.in (refactored)
@@ -153,16 +153,16 @@
Propagates exception safely.
"""
from threading import Thread
- import Queue
+ import queue
items = list(iterable)
nitems = len(items)
if nitems < 2:
- return map(fun, items)
+ return list(map(fun, items))
# Create and fill input queue
- input = Queue.Queue()
- output = Queue.Queue()
+ input = queue.Queue()
+ output = queue.Queue()
for i,item in enumerate(items):
input.put( (i,item) )
@@ -181,7 +181,7 @@
output.put( (i,result) )
except:
output.put( (None,sys.exc_info()) )
- except Queue.Empty:
+ except queue.Empty:
return
# Start threads
@@ -196,8 +196,8 @@
try:
i,res = output.get()
if i == None:
- raise res[0],res[1],res[2]
- except Queue.Empty:
+ raise res[0](res[1]).with_traceback(res[2])
+ except queue.Empty:
break
ret.append(res)
@@ -241,7 +241,7 @@
b = s3.get_bucket(name, validate=False)
b.get_location() # just to raise an exception on error
return b
- except boto.exception.S3ResponseError, e:
+ except boto.exception.S3ResponseError as e:
# Seems this is the only proper way to switch to the bucket's region.
# Requesting of the default region for "?location" does not work unfortunately.
m = re.search(r'<Region>(.*?)</Region>', e.body)
@@ -340,7 +340,7 @@
expr = re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d{3}Z$')
def convDate(awsdatetime):
m = expr.match(awsdatetime)
- ye,mo,da,ho,mi,se = map(int,m.groups())
+ ye,mo,da,ho,mi,se = list(map(int,m.groups()))
dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc)
return dt.astimezone(tz).strftime('%m-%d-%Y %H:%M')

View File

@ -1,54 +0,0 @@
--- mc-4.8.23/misc/syntax/spec.syntax~ 2019-06-16 18:49:31.000000000 +0100
+++ mc-4.8.23/misc/syntax/spec.syntax 2019-04-18 06:02:53.000000000 +0100
@@ -5,25 +5,24 @@
keyword whole Build\{Aa\}rch: green
keyword whole Build\{Cc\}onflicts: green
keyword whole Build\{Pp\}re\{Rr\}eq: green
- keyword whole Build\{Rr\}oot: green
+ keyword whole Build\{Rr\}oot: blue
keyword whole Build\{Rr\}equires: green
keyword whole Conflicts: green
- keyword whole Copyright: white
+ keyword whole Copyright: blue
keyword whole Description: green
- keyword whole Distribution: green
- keyword whole Doc\{Dd\}ir: green
+ keyword whole Distribution: blue
+ keyword whole Doc\{Dd\}ir: blue
keyword whole Epoch: green
- keyword whole Enhances: green
keyword whole Exclude\{Aa\}rch: green
keyword whole Exclusive\{Aa\}rch: green
keyword whole Exclusive\{Oo\}\{Ss\}: green
- keyword whole Group: green
+ keyword whole Group: blue
keyword whole Icon: green
keyword whole License: green
keyword whole Name: green
keyword whole NoSource\[0123456789\]: green
keyword whole Obsoletes: green
- keyword whole Packager: green
+ keyword whole Packager: blue
keyword whole Patch\[0123456789\]: green
keyword whole Prefix: green
keyword whole Pre\{Rr\}eq: green
@@ -37,8 +36,8 @@
keyword whole Source\[0123456789\]: green
keyword whole Suggests: green
keyword whole Summary: green
- keyword whole Supplements: green
- keyword whole Vendor: green
+ keyword whole VCS: green
+ keyword whole Vendor: blue
keyword whole Version: green
keyword whole U\{Rr\}\{Ll\}: green
@@ -92,7 +91,7 @@
keyword whole PATCH\[0123456789\] cyan
keyword whole SOURCE\[0123456789\] cyan
-context Group( ): green
+context Group( ): blue
keyword whole af yellow
keyword whole az yellow
keyword whole bg yellow

View File

@ -1,16 +1,6 @@
diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.sh.in
--- mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir 2020-01-27 09:17:46.815515791 +0100
+++ mc-4.8.24/contrib/mc-wrapper.sh.in 2020-01-27 09:18:01.430712110 +0100
@@ -1,5 +1,5 @@
MC_USER=`whoami`
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
+MC_PWD_FILE="${TMPDIR-/var/tmp}/mc-$MC_USER/mc.pwd.$$"
@bindir@/mc -P "$MC_PWD_FILE" "$@"
if test -r "$MC_PWD_FILE"; then
--- mc-4.8.21/lib/global.h~
+++ mc-4.8.21/lib/global.h
@@ -131,7 +131,7 @@
--- lib/global.h~ 2016-09-22 20:24:12.000000000 +0200
+++ lib/global.h 2016-12-09 11:34:47.376367101 +0100
@@ -125,7 +125,7 @@
#define PATH_SEP_STR "/"
#define IS_PATH_SEP(c) ((c) == PATH_SEP)
#define PATH_ENV_SEP ':'
@ -18,15 +8,4 @@ diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.
+#define TMPDIR_DEFAULT "/var/tmp"
#define SCRIPT_SUFFIX ""
#define get_default_editor() "vi"
#define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
--- mc-4.8.22/contrib/mc-wrapper.csh.in~
+++ mc-4.8.22/contrib/mc-wrapper.csh.in
@@ -3,7 +3,7 @@
if ($?TMPDIR) then
setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
else
- setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
+ setenv MC_PWD_FILE /var/tmp/mc-$MC_USER/mc.pwd.$$
endif
@bindir@/mc -P "$MC_PWD_FILE" $*
#define OS_SORT_CASE_SENSITIVE_DEFAULT 1

178
mc.spec
View File

@ -2,36 +2,26 @@
Summary: User-friendly text console file manager and visual shell
Name: mc
Version: 4.8.19
Release: 9%{?dist}
Epoch: 1
Version: 4.8.26
Release: 5%{?dist}
License: GPLv3+
URL: http://www.midnight-commander.org/
Source0: https://github.com/MidnightCommander/mc/archive/%{version}.tar.gz
Patch1: %{name}-spec.syntax.patch
Patch3: %{name}-python3.patch
Patch4: %{name}-default_setup.patch
Patch5: %{name}-tmpdir.patch
# deps for autogen.sh
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libtool
# other build deps
Source0: http://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
# Downstream-only patch to make mc use /var/tmp for large temporary
# files. See also: https://bugzilla.redhat.com/show_bug.cgi?id=895444
Patch0: %{name}-tmpdir.patch
Patch1: Extends-TMPDIR_DEFAULT-to-mc-wrapper-scripts.patch
BuildRequires: aspell-devel
BuildRequires: e2fsprogs-devel
BuildRequires: gcc
BuildRequires: glib2-devel
BuildRequires: gpm-devel
BuildRequires: groff-base
# disabled (needs to be ported to use libssh instead of libssh2)
#Disabled for rhel8 (need to be ported to use libssh instead of libssh2)
#BuildRequires: libssh2-devel >= 1.2.5
# (configure line was also changed from --enable-vfs-sftp to --disable-vfs-sftp
# - this is the only part of mc which uses libssh2)
BuildRequires: %{?with_slang:slang-devel}%{!?with_slang:ncurses-devel}
BuildRequires: pkgconfig
BuildRequires: perl-generators
Suggests: mc-python
BuildRequires: pkgconfig
%description
Midnight Commander is a visual shell much like a file manager, only with
@ -39,23 +29,14 @@ many more features. It is a text mode application, but it also includes
mouse support. Midnight Commander's best features are its ability to FTP,
view tar and zip files, and to poke into RPMs for specific files.
%package python
Summary: Midnight Commander s3+ and UC1541 EXTFS backend scripts
BuildArch: noarch
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: python3-boto
%description python
Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%prep
%autosetup -p1
%autosetup -p0
%build
./autogen.sh
%configure \
PYTHON=%{__python3} \
CFLAGS="%{optflags} -Wno-strict-aliasing" \
--disable-rpath \
--enable-aspell \
--enable-charset \
--enable-largefile \
--enable-vfs-cpio \
@ -70,12 +51,19 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
--with-gpm-mouse \
--with-screen=%{?with_slang:slang}%{!?with_slang:ncurses} \
%{nil}
%make_build
%{make_build}
%install
%make_install
install -d %{buildroot}%{_sysconfdir}/profile.d
%__install contrib/mc.{sh,csh} -Dt %{buildroot}%{_sysconfdir}/profile.d
%{make_install}
install contrib/mc.{sh,csh} %{buildroot}%{_sysconfdir}/profile.d
# These scripts do not support Python 3
%if 0%{?rhel} > 7
rm -f %{buildroot}%{_libexecdir}/mc/extfs.d/{s3+,uc1541}
%endif
%find_lang %{name} --with-man
@ -84,8 +72,10 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%doc doc/FAQ doc/NEWS doc/README
/etc/profile.d/*
%dir %{_sysconfdir}/mc
%{_sysconfdir}/mc/edit*
%config(noreplace) %{_sysconfdir}/mc/mc*
%config(noreplace) %{_sysconfdir}/mc/mc.ext
%config(noreplace) %{_sysconfdir}/mc/*edit*
%config(noreplace) %{_sysconfdir}/mc/mc*.keymap
%config(noreplace) %{_sysconfdir}/mc/mc.menu*
%config(noreplace) %{_sysconfdir}/mc/*.ini
%{_bindir}/*
%dir %{_libexecdir}/mc
@ -96,106 +86,14 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%{_libexecdir}/mc/fish
%{_datadir}/mc
%{_mandir}/man1/*
%exclude %{_libexecdir}/mc/extfs.d/{s3+,uc1541}
%files python
%{_libexecdir}/mc/extfs.d/{s3+,uc1541}
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.8.26-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue May 22 2018 Tomáš Mráz <tmraz@redhat.com> - 1:4.8.19-9
- Avoid shipping extfs scripts requiring Python 2
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.8.26-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Feb 02 2021 Denys Vlasenko <dvlasenk@redhat.com> - 1:4.8.26-3
* Thu Apr 05 2018 Denys Vlasenko <dvlasenk@redhat.com> - 1:4.8.19-8
- Avoid usage of libssh2
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jan 21 2021 Jindrich Novy <jnovy@redhat.com> - 1:4.8.26-1
- update to 4.8.26
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.25-2
- update BR
* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.25-1
- update to 4.8.25
* Fri Jan 31 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-4
- fix gcc-10 build failure
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 27 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-2
- be sure to use /var/tmp instead of /tmp (#1795006)
* Mon Jan 20 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-1
- update to 4.8.24
- drop merged tmpdir patch
* Wed Oct 09 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-7
- disable aspell support until it is clear how to set up
aspell dependencies or avoiding annoying error message
when no dictionary is found every time a file is edited
* Mon Oct 07 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-6
- re-add BR: perl-generators, it is required for generating
rpm deps from the embedded VFS perl scriptlets
* Mon Oct 07 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-5
- just keep perl-interpreter BR because of man2hlp,
it is a perl script required by build
- require aspell-en, otherwise an annoying error prompt
is displayed while editing any file
* Mon Oct 07 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-4
- drop unneeded BR: perl-generators
* Sat Sep 28 2019 Tomasz Kłoczko <kloczek@fedoraproject.org> - 1:4.8.23-3
- add python3 patch: port to python3
- added python subpackage with s3+ and uc1541 extfs backend scrips to minimise
base package dependencies
- added python3-boto to python subpackage dependencies
- use -Wno-strict-aliasing in CFLAGS is no longer needed
- added spec.syntax patch: improve rpm spec files syntax colouring
- added default_setup patch: enable by default lynx navigate with arrows keys
and auto save setup
* Tue Sep 24 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-2
- fix rpmlint warnings and simplify filelist
* Thu Aug 22 2019 Jindrich Novy <jnovy@redhat.com> - 1:4.8.23-1
- update to 4.8.23
- set the Python path properly as env var, don't sed the configure directly
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 07 2018 Tomasz Kłoczko <kloczek@fedoraproject.org> - 1:4.8.21-1
- updated to 4.8.21
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:4.8.20-3
- Escape macros in %%changelog
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 22 2018 Tomasz Kłoczko <kloczek@fedoraproject.org> - 1:4.8.20-1
- updated to 4.8.20
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
@ -1292,7 +1190,7 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
script
* Sat Sep 25 1999 Bill Nottingham <notting@redhat.com>
- chkconfig --del in %%preun, not %%postun
- chkconfig --del in %%preun, not %postun
* Wed Sep 22 1999 Michael Fulbright <drmike@redhat.com>
- updated to 4.5.39-pre9
@ -1408,13 +1306,16 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
- Added more documentation files on termcap, terminfo, xterm
* Thu Oct 30 1997 Michael K. Johnson <johnsonm@redhat.com>
- Added dependency on portmap
* Wed Oct 29 1997 Michael K. Johnson <johnsonm@redhat.com>
- fixed spec file.
- Updated to 4.1.8
* Sun Oct 26 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- updated to 4.1.6
- added %%attr macros in %%files,
- a few simplification in %%install,
@ -1422,22 +1323,27 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
- fixed installing %%{_sysconfdir}/X11/wmconfig/tkmc.
* Thu Oct 23 1997 Michael K. Johnson <johnsonm@redhat.com>
- updated to 4.1.5
- added wmconfig
* Wed Oct 15 1997 Erik Troan <ewt@redhat.com>
- chkconfig is for mcserv package, not mc one
* Tue Oct 14 1997 Erik Troan <ewt@redhat.com>
- patched init script for chkconfig
- don't turn on the service by default
* Fri Oct 10 1997 Michael K. Johnson <johnsonm@redhat.com>
- Converted to new PAM conventions.
- Updated to 4.1.3
- No longer needs glibc patch.
* Thu May 22 1997 Michele Marziani <marziani@fe.infn.it>
- added support for mc alias in %%{_sysconfdir}/profile.d/mc.csh (for csh and tcsh)
- lowered number of SysV init scripts in %%{_sysconfdir}/rc.d/rc[0,1,6].d
(mcserv needs to be killed before inet)
@ -1446,12 +1352,14 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
- minor cleanup of spec file: redundant directives and comments removed
* Sun May 18 1997 Michele Marziani <marziani@fe.infn.it>
- removed all references to non-existent mc.rpmfs
- added mcedit.1 to the %%files section
- reverted to un-gzipped man pages (RedHat style)
- removed double install line for mcserv.pamd
* Tue May 13 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- added new rpmfs script,
- removed mcfn_install from mc (adding mc() to bash enviroment is in
%%{_sysconfdir}/profile.d/mc.sh),
@ -1460,21 +1368,25 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
- removed %%{prefix}/lib/mc/term.
* Fri May 9 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- changed source url,
- fixed link mcedit to mc,
* Wed May 7 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- new version 3.5.27,
- %%dir %%{prefix}/lib/mc/icons and icons removed from tkmc,
- added commented xmc part.
* Tue Apr 22 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- FIX spec:
- added URL field,
- in mc added missing %%{prefix}/lib/mc/mc.ext, %%{prefix}/lib/mc/mc.hint,
%%{prefix}/lib/mc/mc.hlp, %%{prefix}/lib/mc/mc.lib, %%{prefix}/lib/mc/mc.menu.
* Fri Apr 18 1997 Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
- added making packages: tkmc, mcserv (xmc not work yet),
- gziped man pages,
- added %%{_sysconfdir}/pamd.d/mcserv PAM config file.

View File

@ -1 +1 @@
SHA512 (4.8.26.tar.gz) = 65bd7cd1de4b03684d9bfd6a922768cf98711af9e53c5af5dfa305031d09010967daa2d4ef996066a9a01814c4b6bfd65aaba8d23ecabe04a620f68c35298e9d
SHA512 (mc-4.8.19.tar.xz) = aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531