mc: update to 4.8.27, split -skins

* fixes CVE-2021-36370
* add a new subpackage mc-skins
* drop 030-fix-cchat_t.patch, fixed upstream
* refresh patches

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>

diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index c201c6fffd06d8124d9a5f739a4e007173aa791a..8ca3093e9787f49cf628efd192283759808ac1ce 100644 (file)
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mc
-PKG_VERSION:=4.8.26
+PKG_VERSION:=4.8.27
 PKG_RELEASE:=1
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0-or-later
@@ -14,7 +14,7 @@ PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
-PKG_HASH:=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
+PKG_HASH:=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf gettext-version
 PKG_BUILD_DEPENDS:=MC_VFS:libtirpc
@@ -33,12 +33,12 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
 define Package/mc
-       SECTION:=utils
-       CATEGORY:=Utilities
-       DEPENDS:=+glib2 +libncurses +libmount +MC_VFS:libssh2 $(ICONV_DEPENDS)
-       TITLE:=Midnight Commander - a powerful visual file manager
-       URL:=https://www.midnight-commander.org/
-       MENU:=1
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+glib2 +libncurses +libmount +MC_VFS:libssh2 $(ICONV_DEPENDS)
+  TITLE:=Midnight Commander - a powerful visual file manager
+  URL:=https://www.midnight-commander.org/
+  MENU:=1
 endef
 
 define Package/mc/config
@@ -125,4 +125,23 @@ define Package/mc/conffiles
 /etc/mc/skins/default.ini
 endef
 
+define Package/mc-skins
+  TITLE:=Midnight Commander - a powerful visual file manager - skins
+  URL:=https://www.midnight-commander.org/
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+mc
+endef
+
+define Package/mc-skins/install
+       $(INSTALL_DIR) $(1)/etc/mc/skins
+       $(CP) $(PKG_BUILD_DIR)/misc/skins/*.ini $(1)/etc/mc/skins/
+       $(RM) $(1)/etc/mc/skins/default.ini
+endef
+
+define Package/mc-skins/conffiles
+/etc/mc/skins/
+endef
+
 $(eval $(call BuildPackage,mc))
+$(eval $(call BuildPackage,mc-skins))

diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch
index 73fde76c7b12cd0cb1766b876effa62a853c0d1a..bc7ddee5fa6ef4ed412e6411ba666343c4c0a8dd 100644 (file)
--- a/utils/mc/patches/010-subshell.patch
+++ b/utils/mc/patches/010-subshell.patch
@@ -1,6 +1,6 @@
 --- a/src/subshell/common.c
 +++ b/src/subshell/common.c
-@@ -1128,7 +1128,7 @@ init_subshell_precmd (char *precmd, size
+@@ -1140,7 +1140,7 @@ init_subshell_precmd (char *precmd, size
                      "else "
                      "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
                      "fi; "

diff --git a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
index 8da79f680c10a68e79e0877df05c6c22a7c26615..bf6853a710245088d9e0f861d207c0bb488dff38 100644 (file)
--- a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
+++ b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
@@ -1,6 +1,6 @@
 --- a/lib/tty/tty.c
 +++ b/lib/tty/tty.c
-@@ -393,7 +393,7 @@ tty_init_xterm_support (gboolean is_xter
+@@ -402,7 +402,7 @@ tty_init_xterm_support (gboolean is_xter
      if (xmouse_seq != NULL)
      {
          if (strcmp (xmouse_seq, ESC_STR "[<") == 0)

diff --git a/utils/mc/patches/030-fix-cchat_t.patch b/utils/mc/patches/030-fix-cchat_t.patch
deleted file mode 100644 (file)
index 8b05e42..0000000
--- a/utils/mc/patches/030-fix-cchat_t.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/tty/tty-ncurses.h
-+++ b/lib/tty/tty-ncurses.h
-@@ -3,6 +3,7 @@
- #define MC__TTY_NCURSES_H
- 
- #ifdef USE_NCURSES
-+#define _XOPEN_SOURCE_EXTENDED
- #ifdef HAVE_NCURSES_CURSES_H
- #include <ncurses/curses.h>
- #elif defined (HAVE_NCURSES_NCURSES_H)