From 7b4c9b1007cbd5a55563063213c494151e4b889bde2f2320536dc4e9aa267a86 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 10 Apr 2020 13:31:39 +0000 Subject: [PATCH] Accepting request 785833 from home:polslinux:branches:Base:System - Update to 4.8.24 * Implement the file edit and view history * sftpfs: support keyborad interactive authentication * add yabasic (Yet Another BASIC) syntax highlighting * File highlighting updates * New skins * Lots of other fixes - Remove sftp_interactive_password.patch - Remove mc-no-common.patch OBS-URL: https://build.opensuse.org/request/show/785833 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=131 --- mc-4.8.23.sha256 | 2 - mc-4.8.23.tar.xz | 3 - mc-4.8.24.sha256 | 2 + mc-4.8.24.tar.xz | 3 + mc-no-common.patch | 71 --------------------- mc.changes | 14 ++++ mc.spec | 8 +-- sftp_interactive_password.patch | 110 -------------------------------- 8 files changed, 21 insertions(+), 192 deletions(-) delete mode 100644 mc-4.8.23.sha256 delete mode 100644 mc-4.8.23.tar.xz create mode 100644 mc-4.8.24.sha256 create mode 100644 mc-4.8.24.tar.xz delete mode 100644 mc-no-common.patch delete mode 100644 sftp_interactive_password.patch diff --git a/mc-4.8.23.sha256 b/mc-4.8.23.sha256 deleted file mode 100644 index 67f628d..0000000 --- a/mc-4.8.23.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d mc-4.8.23.tar.bz2 -dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c mc-4.8.23.tar.xz diff --git a/mc-4.8.23.tar.xz b/mc-4.8.23.tar.xz deleted file mode 100644 index f38cb7d..0000000 --- a/mc-4.8.23.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c -size 2552944 diff --git a/mc-4.8.24.sha256 b/mc-4.8.24.sha256 new file mode 100644 index 0000000..0060231 --- /dev/null +++ b/mc-4.8.24.sha256 @@ -0,0 +1,2 @@ +cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34 mc-4.8.24.tar.bz2 +859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46 mc-4.8.24.tar.xz diff --git a/mc-4.8.24.tar.xz b/mc-4.8.24.tar.xz new file mode 100644 index 0000000..2aa28cc --- /dev/null +++ b/mc-4.8.24.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46 +size 2434988 diff --git a/mc-no-common.patch b/mc-no-common.patch deleted file mode 100644 index 3e40a3f..0000000 --- a/mc-no-common.patch +++ /dev/null @@ -1,71 +0,0 @@ -commit 093571938a6c31706f918b011335b8ab30602336 -Author: Andrew Borodin -Date: Sat Nov 23 17:41:58 2019 +0300 - - Ticket #4035: fix compile failure on OS X 10.9. - - Fix duplication of menu_map definition. - - Move menu_map definition to lib/widget/menu.c. - - Signed-off-by: Andrew Borodin - -diff --git a/lib/widget/menu.c b/lib/widget/menu.c -index b7476b62b..68ae6f6ce 100644 ---- a/lib/widget/menu.c -+++ b/lib/widget/menu.c -@@ -46,7 +46,7 @@ - - /*** global variables ****************************************************************************/ - --const global_keymap_t *menu_map; -+const global_keymap_t *menu_map = NULL; - - /*** file scope macro definitions ****************************************************************/ - -diff --git a/lib/widget/menu.h b/lib/widget/menu.h -index c522a16c8..fad6fa639 100644 ---- a/lib/widget/menu.h -+++ b/lib/widget/menu.h -@@ -39,6 +39,8 @@ typedef struct WMenuBar - - /*** global variables defined in .c file *********************************************************/ - -+extern const global_keymap_t *menu_map; -+ - /*** declarations of public functions ************************************************************/ - - menu_entry_t *menu_entry_create (const char *name, long command); -diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c -index 10ba341ee..0ba4840df 100644 ---- a/src/keybind-defaults.c -+++ b/src/keybind-defaults.c -@@ -28,7 +28,7 @@ - #include - - #include "lib/global.h" --#include "lib/widget.h" /* dialog_map, input_map, listbox_map */ -+#include "lib/widget.h" /* dialog_map, input_map, listbox_map, menu_map */ - - #include "keybind-defaults.h" - -@@ -56,7 +56,6 @@ GArray *diff_keymap = NULL; - const global_keymap_t *main_map = NULL; - const global_keymap_t *main_x_map = NULL; - const global_keymap_t *panel_map = NULL; --const global_keymap_t *menu_map = NULL; - const global_keymap_t *tree_map = NULL; - const global_keymap_t *help_map = NULL; - -diff --git a/src/keybind-defaults.h b/src/keybind-defaults.h -index edb05c67f..6b7266589 100644 ---- a/src/keybind-defaults.h -+++ b/src/keybind-defaults.h -@@ -35,7 +35,6 @@ extern GArray *diff_keymap; - extern const global_keymap_t *main_map; - extern const global_keymap_t *main_x_map; - extern const global_keymap_t *panel_map; --extern const global_keymap_t *menu_map; - extern const global_keymap_t *tree_map; - extern const global_keymap_t *help_map; - diff --git a/mc.changes b/mc.changes index 61bfacc..b0b6eba 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Mar 17 07:57:20 UTC 2020 - Paolo Stivanin + +- Update to 4.8.24 + * Implement the file edit and view history + * sftpfs: support keyborad interactive authentication + * add yabasic (Yet Another BASIC) syntax highlighting + * File highlighting updates + * New skins + * Lots of other fixes + +- Remove sftp_interactive_password.patch +- Remove mc-no-common.patch + ------------------------------------------------------------------- Wed Jan 15 10:11:03 UTC 2020 - Adam Majer diff --git a/mc.spec b/mc.spec index 7d62a14..974f5e4 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: mc -Version: 4.8.23 +Version: 4.8.24 Release: 0 Summary: Midnight Commander License: GPL-3.0-or-later @@ -57,8 +57,6 @@ Patch64: mc-extd-sound.patch Patch69: mc-extd-xdg.patch Patch71: mc-ext-audio.patch Patch100: xls2csv_update.patch -Patch101: sftp_interactive_password.patch -Patch102: mc-no-common.patch BuildRequires: audiofile-devel BuildRequires: e2fsprogs-devel BuildRequires: gettext >= 0.18.1 @@ -114,8 +112,6 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch52 -p1 %patch60 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 %build autoreconf -fvi diff --git a/sftp_interactive_password.patch b/sftp_interactive_password.patch deleted file mode 100644 index afe09b3..0000000 --- a/sftp_interactive_password.patch +++ /dev/null @@ -1,110 +0,0 @@ -commit 7910ef3ee50a847edf72d755381699f169d46278 -Author: Adam Majer -Date: Mon Jun 25 15:06:38 2018 +0200 - - Ticket #3921: Enable keyboard interactive authentication - - If SSH server does not support cleartext tunneled password - authentication and only 'keyboard interactive' authentication - instead, then we need to use different authentication - function along with a interactive callback. - - Signed-off-by: Adam Majer - -diff --git a/src/vfs/sftpfs/connection.c b/src/vfs/sftpfs/connection.c -index 537159129..a6b7d1b2c 100644 ---- a/src/vfs/sftpfs/connection.c -+++ b/src/vfs/sftpfs/connection.c -@@ -292,6 +292,53 @@ sftpfs_open_connection_ssh_key (struct vfs_s_super *super, GError ** mcerror) - return ret_value; - } - -+ -+/** -+ * Keyboard-interactive password helper for opening connection to host by -+ * sftpfs_open_connection_ssh_password -+ * -+ * Uses global kbi_super (data with existing connection) and kbi_passwd (password) -+ * -+ * @param name username -+ * @param name_len length of @name -+ * @param instruction unused -+ * @param instruction_len unused -+ * @param num_prompts number of possible problems to process -+ * @param prompts array of prompts to process -+ * @param responses array of responses, one per prompt -+ * @param abstract unused -+ */ -+ -+static const char *kbi_passwd; -+static const struct vfs_s_super *kbi_super; -+static -+LIBSSH2_USERAUTH_KBDINT_RESPONSE_FUNC (keyboard_interactive_helper) -+{ -+ int i; -+ int len; -+ -+ (void) instruction; -+ (void) instruction_len; -+ (void) abstract; -+ -+ if (!kbi_super || !kbi_passwd) -+ return; -+ -+ if (strncmp (name, kbi_super->path_element->user, name_len) != 0) -+ return; -+ -+ // assume these are password prompts -+ len = strlen (kbi_passwd); -+ for (i = 0; i < num_prompts; ++i) -+ { -+ if (strncmp (prompts[i].text, "Password: ", prompts[i].length) == 0) -+ { -+ responses[i].text = strdup (kbi_passwd); -+ responses[i].length = len; -+ } -+ } -+} -+ - /* --------------------------------------------------------------------------------------------- */ - /** - * Open connection to host using password. -@@ -323,6 +370,18 @@ sftpfs_open_connection_ssh_password (struct vfs_s_super *super, GError ** mcerro - LIBSSH2_ERROR_EAGAIN); - if (rc == 0) - return TRUE; -+ -+ kbi_super = super; -+ kbi_passwd = super->path_element->password; -+ while ((rc = -+ libssh2_userauth_keyboard_interactive (sftpfs_super->session, -+ super->path_element->user, -+ keyboard_interactive_helper)) == -+ LIBSSH2_ERROR_EAGAIN); -+ kbi_super = NULL; -+ kbi_passwd = NULL; -+ if (rc == 0) -+ return TRUE; - } - - p = g_strdup_printf (_("sftp: Enter password for %s "), super->path_element->user); -@@ -337,6 +396,19 @@ sftpfs_open_connection_ssh_password (struct vfs_s_super *super, GError ** mcerro - passwd)) == LIBSSH2_ERROR_EAGAIN) - ; - -+ if (rc != 0) -+ { -+ kbi_super = super; -+ kbi_passwd = passwd; -+ while ((rc = -+ libssh2_userauth_keyboard_interactive (sftpfs_super->session, -+ super->path_element->user, -+ keyboard_interactive_helper)) == -+ LIBSSH2_ERROR_EAGAIN); -+ kbi_super = NULL; -+ kbi_passwd = NULL; -+ } -+ - if (rc == 0) - { - ret_value = TRUE;