[arch-commits] Commit in mc/repos/community-x86_64 (5 files)

Balló György bgyorgy at archlinux.org
Mon Mar 16 21:32:32 UTC 2020


    Date: Monday, March 16, 2020 @ 21:32:32
  Author: bgyorgy
Revision: 599875

archrelease: copy trunk to community-x86_64

Added:
  mc/repos/community-x86_64/PKGBUILD
    (from rev 599874, mc/trunk/PKGBUILD)
  mc/repos/community-x86_64/mc-mksh-subshell-v2.patch
    (from rev 599874, mc/trunk/mc-mksh-subshell-v2.patch)
  mc/repos/community-x86_64/mc-python3.patch
    (from rev 599874, mc/trunk/mc-python3.patch)
Deleted:
  mc/repos/community-x86_64/PKGBUILD
  mc/repos/community-x86_64/mc-mksh-subshell-v2.patch

---------------------------+
 PKGBUILD                  |  137 ++++++++++++++++++++--------------------
 mc-mksh-subshell-v2.patch |  148 ++++++++++++++++++++++----------------------
 mc-python3.patch          |   70 ++++++++++++++++++++
 3 files changed, 213 insertions(+), 142 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 21:32:28 UTC (rev 599874)
+++ PKGBUILD	2020-03-16 21:32:32 UTC (rev 599875)
@@ -1,68 +0,0 @@
-# Maintainer: Alad Wenter <alad at archlinux.org>
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=mc
-pkgver=4.8.24
-pkgrel=1
-pkgdesc="A file manager that emulates Norton Commander"
-arch=('x86_64')
-url="https://midnight-commander.org/"
-license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
-makedepends=('libxt' 'libx11' 'unzip')
-optdepends=('aspell: spelling corrections'
-            'cabextract: ucab extfs'
-            'cdparanoia: audio extfs'
-            'cdrkit: iso9660 extfs'
-            'cvs: CVS support'
-            'gawk: hp48+ extfs'
-            'mtools: a+ extfs'
-            'p7zip: support for 7zip archives'
-            'perl: needed by several extfs scripts'
-            'python2-boto: s3+ extfs'
-            'python2-pytz: s3+ extfs'
-            'samba: VFS support'
-            'unace: uace extfs'
-            'unarj: uarj extfs'
-            'unrar: urar extfs'
-            'zip: uzip extfs')
-backup=('etc/mc/edit.indent.rc'
-        'etc/mc/filehighlight.ini'
-        'etc/mc/mc.ext'
-        'etc/mc/mc.keymap'
-        'etc/mc/mc.menu'
-        'etc/mc/mcedit.menu'
-        'etc/mc/sfs.ini')
-options=('!emptydirs')
-source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
-        "mc-mksh-subshell-v2.patch")
-sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
-            '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch
-}
-
-build() {
-  export PYTHON=/usr/bin/python2
-
-  cd ${pkgname}-${pkgver}
-  ./configure \
-      --prefix=/usr \
-      --libexecdir=/usr/lib \
-      --sysconfdir=/etc \
-      --enable-vfs-smb \
-      --with-screen=slang \
-      --with-x
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # Replace mc.keymap symlink with target file to fix backup mechanism (FS#50889).
-  rm "${pkgdir}"/etc/mc/mc.keymap && cp "${pkgdir}"/etc/mc/mc{.default,}.keymap
-}

Copied: mc/repos/community-x86_64/PKGBUILD (from rev 599874, mc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-16 21:32:32 UTC (rev 599875)
@@ -0,0 +1,69 @@
+# Maintainer: Alad Wenter <alad at archlinux.org>
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=mc
+pkgver=4.8.24
+pkgrel=2
+pkgdesc="A file manager that emulates Norton Commander"
+arch=('x86_64')
+url="https://midnight-commander.org/"
+license=('GPL')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+makedepends=('libxt' 'libx11' 'unzip')
+optdepends=('aspell: spelling corrections'
+            'cabextract: ucab extfs'
+            'cdparanoia: audio extfs'
+            'cdrkit: iso9660 extfs'
+            'cvs: CVS support'
+            'gawk: hp48+ extfs'
+            'mtools: a+ extfs'
+            'p7zip: support for 7zip archives'
+            'perl: needed by several extfs scripts'
+            'python-boto: s3+ extfs'
+            'python-pytz: s3+ extfs'
+            'samba: VFS support'
+            'unace: uace extfs'
+            'unarj: uarj extfs'
+            'unrar: urar extfs'
+            'zip: uzip extfs')
+backup=('etc/mc/edit.indent.rc'
+        'etc/mc/filehighlight.ini'
+        'etc/mc/mc.ext'
+        'etc/mc/mc.keymap'
+        'etc/mc/mc.menu'
+        'etc/mc/mcedit.menu'
+        'etc/mc/sfs.ini')
+options=('!emptydirs')
+source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
+        "mc-mksh-subshell-v2.patch"
+        "mc-python3.patch")
+sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
+            '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96'
+            '10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch
+  patch -p1 < "$srcdir"/mc-python3.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure \
+      --prefix=/usr \
+      --libexecdir=/usr/lib \
+      --sysconfdir=/etc \
+      --enable-vfs-smb \
+      --with-screen=slang \
+      --with-x
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  # Replace mc.keymap symlink with target file to fix backup mechanism (FS#50889).
+  rm "${pkgdir}"/etc/mc/mc.keymap && cp "${pkgdir}"/etc/mc/mc{.default,}.keymap
+}

Deleted: mc-mksh-subshell-v2.patch
===================================================================
--- mc-mksh-subshell-v2.patch	2020-03-16 21:32:28 UTC (rev 599874)
+++ mc-mksh-subshell-v2.patch	2020-03-16 21:32:32 UTC (rev 599875)
@@ -1,74 +0,0 @@
-# Support mksh for mc subshell
-# https://midnight-commander.org/ticket/3748
-diff -Naur mc-4.8.18.orig/lib/shell.c mc-4.8.18/lib/shell.c
---- mc-4.8.18.orig/lib/shell.c	2016-09-22 18:24:12.000000000 +0000
-+++ mc-4.8.18/lib/shell.c	2017-02-16 13:47:34.933939000 +0000
-@@ -66,6 +66,8 @@
-     /* 3rd choice: look for existing shells supported as MC subshells.  */
-     if (access ("/bin/bash", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/bash");
-+    else if (access ("/bin/mksh", X_OK) == 0)
-+        mc_shell->path = g_strdup ("/bin/mksh");
-     else if (access ("/bin/ash", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/ash");
-     else if (access ("/bin/dash", X_OK) == 0)
-@@ -149,6 +153,12 @@
-         mc_shell->type = SHELL_ZSH;
-         mc_shell->name = "zsh";
-     }
-+    else if (strstr (mc_shell->path, "/mksh") != NULL
-+             || strstr (mc_shell->real_path, "/mksh") != NULL)
-+    {
-+        mc_shell->type = SHELL_MKSH;
-+        mc_shell->name = "mksh";
-+    }
-     else if (strstr (mc_shell->path, "/tcsh") != NULL
-              || strstr (mc_shell->real_path, "/tcsh") != NULL)
-     {
-diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
---- mc-4.8.18.orig/lib/shell.h	2016-03-12 15:45:47.000000000 +0000
-+++ mc-4.8.18/lib/shell.h	2017-02-15 21:57:39.000000000 +0000
-@@ -12,6 +12,7 @@
- typedef enum
- {
-     SHELL_NONE,
-+    SHELL_MKSH,
-     SHELL_SH,
-     SHELL_BASH,
-     SHELL_ASH_BUSYBOX,          /* BusyBox default shell (ash) */
-diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
---- mc-4.8.18.orig/src/subshell/common.c	2016-09-22 18:24:12.000000000 +0000
-+++ mc-4.8.18/src/subshell/common.c	2017-02-20 18:48:22.681514000 +0000
-@@ -320,6 +320,12 @@
- 
-         break;
- 
-+    case SHELL_MKSH:
-+        init_file = g_strdup (".shrc");
-+        putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
-+        putenv (putenv_str);
-+        break;
-+
-         /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
-     case SHELL_TCSH:
-     case SHELL_ZSH:
-@@ -367,6 +373,7 @@
- 
-     case SHELL_ASH_BUSYBOX:
-     case SHELL_DASH:
-+    case SHELL_MKSH:
-     case SHELL_TCSH:
-     case SHELL_FISH:
-         execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
-@@ -801,6 +808,11 @@
-                     "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
-         break;
- 
-+    case SHELL_MKSH:
-+        g_snprintf (precmd, buff_size,
-+                    "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
-+        break;
-+
-     case SHELL_ASH_BUSYBOX:
-         /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital
-          * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway.

Copied: mc/repos/community-x86_64/mc-mksh-subshell-v2.patch (from rev 599874, mc/trunk/mc-mksh-subshell-v2.patch)
===================================================================
--- mc-mksh-subshell-v2.patch	                        (rev 0)
+++ mc-mksh-subshell-v2.patch	2020-03-16 21:32:32 UTC (rev 599875)
@@ -0,0 +1,74 @@
+# Support mksh for mc subshell
+# https://midnight-commander.org/ticket/3748
+diff -Naur mc-4.8.18.orig/lib/shell.c mc-4.8.18/lib/shell.c
+--- mc-4.8.18.orig/lib/shell.c	2016-09-22 18:24:12.000000000 +0000
++++ mc-4.8.18/lib/shell.c	2017-02-16 13:47:34.933939000 +0000
+@@ -66,6 +66,8 @@
+     /* 3rd choice: look for existing shells supported as MC subshells.  */
+     if (access ("/bin/bash", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/bash");
++    else if (access ("/bin/mksh", X_OK) == 0)
++        mc_shell->path = g_strdup ("/bin/mksh");
+     else if (access ("/bin/ash", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/ash");
+     else if (access ("/bin/dash", X_OK) == 0)
+@@ -149,6 +153,12 @@
+         mc_shell->type = SHELL_ZSH;
+         mc_shell->name = "zsh";
+     }
++    else if (strstr (mc_shell->path, "/mksh") != NULL
++             || strstr (mc_shell->real_path, "/mksh") != NULL)
++    {
++        mc_shell->type = SHELL_MKSH;
++        mc_shell->name = "mksh";
++    }
+     else if (strstr (mc_shell->path, "/tcsh") != NULL
+              || strstr (mc_shell->real_path, "/tcsh") != NULL)
+     {
+diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
+--- mc-4.8.18.orig/lib/shell.h	2016-03-12 15:45:47.000000000 +0000
++++ mc-4.8.18/lib/shell.h	2017-02-15 21:57:39.000000000 +0000
+@@ -12,6 +12,7 @@
+ typedef enum
+ {
+     SHELL_NONE,
++    SHELL_MKSH,
+     SHELL_SH,
+     SHELL_BASH,
+     SHELL_ASH_BUSYBOX,          /* BusyBox default shell (ash) */
+diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
+--- mc-4.8.18.orig/src/subshell/common.c	2016-09-22 18:24:12.000000000 +0000
++++ mc-4.8.18/src/subshell/common.c	2017-02-20 18:48:22.681514000 +0000
+@@ -320,6 +320,12 @@
+ 
+         break;
+ 
++    case SHELL_MKSH:
++        init_file = g_strdup (".shrc");
++        putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
++        putenv (putenv_str);
++        break;
++
+         /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
+     case SHELL_TCSH:
+     case SHELL_ZSH:
+@@ -367,6 +373,7 @@
+ 
+     case SHELL_ASH_BUSYBOX:
+     case SHELL_DASH:
++    case SHELL_MKSH:
+     case SHELL_TCSH:
+     case SHELL_FISH:
+         execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
+@@ -801,6 +808,11 @@
+                     "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
+         break;
+ 
++    case SHELL_MKSH:
++        g_snprintf (precmd, buff_size,
++                    "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
++        break;
++
+     case SHELL_ASH_BUSYBOX:
+         /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital
+          * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway.

Copied: mc/repos/community-x86_64/mc-python3.patch (from rev 599874, mc/trunk/mc-python3.patch)
===================================================================
--- mc-python3.patch	                        (rev 0)
+++ mc-python3.patch	2020-03-16 21:32:32 UTC (rev 599875)
@@ -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')



More information about the arch-commits mailing list