Compare commits

...

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/mc-4.8.31.tar.gz SOURCES/4.8.26.tar.gz

@ -1 +1 @@
0d6042222b3eff2078c30ce0ec1db8592d9f63f9 SOURCES/mc-4.8.31.tar.gz d62a246b25c6e501c0553351d4c76c6dc69828fe SOURCES/4.8.26.tar.gz

@ -1,5 +1,5 @@
--- a/src/setup.c --- mc-4.8.23.orig/src/setup.c 2019-06-16 18:49:31.000000000 +0100
+++ b/src/setup.c +++ mc-4.8.23/src/setup.c 2019-07-06 13:13:22.792243501 +0100
@@ -138,8 +138,8 @@ @@ -138,8 +138,8 @@
.fast_reload_msg_shown = FALSE, .fast_reload_msg_shown = FALSE,
.mark_moves_down = TRUE, .mark_moves_down = TRUE,

@ -0,0 +1,70 @@
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')

@ -1,5 +1,5 @@
--- a/misc/syntax/spec.syntax --- mc-4.8.23/misc/syntax/spec.syntax~ 2019-06-16 18:49:31.000000000 +0100
+++ b/misc/syntax/spec.syntax +++ mc-4.8.23/misc/syntax/spec.syntax 2019-04-18 06:02:53.000000000 +0100
@@ -5,25 +5,24 @@ @@ -5,25 +5,24 @@
keyword whole Build\{Aa\}rch: green keyword whole Build\{Aa\}rch: green
keyword whole Build\{Cc\}onflicts: green keyword whole Build\{Cc\}onflicts: green

@ -1,5 +1,6 @@
--- a/contrib/mc-wrapper.sh.in diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.sh.in
+++ b/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 @@ @@ -1,5 +1,5 @@
MC_USER=`whoami` MC_USER=`whoami`
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$" -MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
@ -18,8 +19,8 @@
#define SCRIPT_SUFFIX "" #define SCRIPT_SUFFIX ""
#define get_default_editor() "vi" #define get_default_editor() "vi"
#define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
--- a/contrib/mc-wrapper.csh.in --- mc-4.8.22/contrib/mc-wrapper.csh.in~
+++ b/contrib/mc-wrapper.csh.in +++ mc-4.8.22/contrib/mc-wrapper.csh.in
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
if ($?TMPDIR) then if ($?TMPDIR) then
setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$ setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$

@ -1,36 +1,36 @@
# NOTE: disabled sftp (needs to be ported to use libssh instead of libssh2) %bcond_without slang
%bcond gpm %[!(0%{?rhel} >= 10)]
%bcond slang 1
Summary: User-friendly text console file manager and visual shell Summary: User-friendly text console file manager and visual shell
Name: mc Name: mc
Epoch: 1 Epoch: 1
Version: 4.8.31 Version: 4.8.26
Release: 3%{?dist} Release: 5%{?dist}
License: GPL-3.0-or-later License: GPLv3+
URL: https://midnight-commander.org/ URL: http://www.midnight-commander.org/
VCS: https://github.com/MidnightCommander/mc/ Source0: https://github.com/MidnightCommander/mc/archive/%{version}.tar.gz
Source: %{VCS}/archive/%{version}/%{name}-%{version}.tar.gz Patch1: %{name}-spec.syntax.patch
Patch: %{name}-spec.syntax.patch Patch3: %{name}-python3.patch
Patch: %{name}-default_setup.patch Patch4: %{name}-default_setup.patch
Patch: %{name}-tmpdir.patch Patch5: %{name}-tmpdir.patch
# deps for autogen.sh
BuildRequires: make
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc
BuildRequires: gettext-devel BuildRequires: gettext-devel
%if %{with gpm} BuildRequires: libtool
# other build deps
BuildRequires: e2fsprogs-devel
BuildRequires: gcc
BuildRequires: glib2-devel
BuildRequires: gpm-devel BuildRequires: gpm-devel
%endif
BuildRequires: groff-base BuildRequires: groff-base
BuildRequires: libtool # disabled (needs to be ported to use libssh instead of libssh2)
BuildRequires: make #BuildRequires: libssh2-devel >= 1.2.5
BuildRequires: perl-generators # (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: pkgconfig
BuildRequires: pkgconfig(ext2fs) BuildRequires: perl-generators
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gmodule-2.0) >= 2.30
#BuildRequires: pkgconfig(libssh2) >= 1.2.8
BuildRequires: %[%{?with_slang}?"pkgconfig(slang) >= 2.0":"ncurses-devel"]
Suggests: mc-python Suggests: mc-python
%description %description
@ -52,23 +52,23 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%autosetup -p1 %autosetup -p1
%build %build
%__sed -i "s,PREV_MC_VERSION=\"unknown\",PREV_MC_VERSION=\"%{version}\"," version.sh
./autogen.sh ./autogen.sh
%configure \ %configure \
PYTHON=%__python3 \ PYTHON=%{__python3} \
--disable-rpath \ --disable-rpath \
--disable-vfs-sftp \
--enable-charset \ --enable-charset \
--enable-largefile \ --enable-largefile \
--enable-vfs-cpio \ --enable-vfs-cpio \
--enable-vfs-extfs \ --enable-vfs-extfs \
--enable-vfs-shell \ --enable-vfs-fish \
--enable-vfs-ftp \ --enable-vfs-ftp \
--enable-vfs-sfs \ --enable-vfs-sfs \
--disable-vfs-sftp \
--enable-vfs-smb \
--enable-vfs-tar \ --enable-vfs-tar \
--with%{!?with_gpm:out}-gpm-mouse \
--with-screen=%[%{?with_slang}?"slang":"ncurses"] \
--with-x \ --with-x \
--with-gpm-mouse \
--with-screen=%{?with_slang:slang}%{!?with_slang:ncurses} \
%{nil} %{nil}
%make_build %make_build
@ -93,7 +93,7 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%{_libexecdir}/mc/mc* %{_libexecdir}/mc/mc*
%{_libexecdir}/mc/extfs.d %{_libexecdir}/mc/extfs.d
%{_libexecdir}/mc/ext.d %{_libexecdir}/mc/ext.d
%{_libexecdir}/mc/shell %{_libexecdir}/mc/fish
%{_datadir}/mc %{_datadir}/mc
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_libexecdir}/mc/extfs.d/{s3+,uc1541} %exclude %{_libexecdir}/mc/extfs.d/{s3+,uc1541}
@ -102,68 +102,12 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%{_libexecdir}/mc/extfs.d/{s3+,uc1541} %{_libexecdir}/mc/extfs.d/{s3+,uc1541}
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:4.8.31-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.8.26-5
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.8.31-2
- Bump release for June 2024 mass rebuild
* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 1:4.8.31-1
- update to 4.8.31
- drop upstreamed python3 patch
- rename fish -> shell
- drop obsolete smb option
* Tue Feb 06 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1:4.8.30-4
- Disable gpm on ELN
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.30-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Aug 28 2023 Jindrich Novy <jnovy@redhat.com> - 1:4.8.30-1
- update to 4.8.30
- remove upstreamed mc-configure-c99.patch
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Apr 04 2023 Jindrich Novy <jnovy@redhat.com> - 1:4.8.29-1
- update to 4.8.29
* Sun Feb 05 2023 Florian Weimer <fweimer@redhat.com> - 1:4.8.28-5
- Port configure script to C99
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.28-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Jindrich Novy <jnovy@redhat.com> - 1:4.8.28-2
- fix file sort by version
- Resolves: #2091504
* Fri Apr 29 2022 Jindrich Novy <jnovy@redhat.com> - 1:4.8.28-1
- update to https://github.com/MidnightCommander/mc/releases/tag/v4.8.28
- Related: #1993686
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 1:4.8.27-2
- disable samba VFS
- Related: #2002331
* Mon Aug 16 2021 Jindrich Novy <jnovy@redhat.com> - 1:4.8.27-1
- update to https://github.com/MidnightCommander/mc/releases/tag/v4.8.27
- fix mc --version (#1858573)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.26-4 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.8.26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - 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 * Tue Feb 02 2021 Denys Vlasenko <dvlasenk@redhat.com> - 1:4.8.26-3
- Avoid usage of libssh2 - Avoid usage of libssh2

Loading…
Cancel
Save