update mc, enable ssh2 support

4 files changed, 31 insertions, 50 deletions

diff --git a/package/libssh2/Makefile b/package/libssh2/Makefile
new file mode 100644
index 000000000..d0b8b7fe7
--- /dev/null
+++ b/package/libssh2/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libssh2
+PKG_VERSION:=		1.4.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		071004c60c5d6f90354ad1b701013a0b
+PKG_DESCR:=		client-side C library implementing SSH2 protocol
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.libssh2.org/
+PKG_SITES:=		http://www.libssh2.org/download/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSSH2,libssh2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libssh2-install:
+	$(INSTALL_DIR) $(IDIR_LIBSSH2)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libssh2*.so* \
+		$(IDIR_LIBSSH2)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mc/Makefile b/package/mc/Makefile
index a4931f94b..0ff198811 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mc
-PKG_VERSION:=		4.8.11
+PKG_VERSION:=		4.8.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1a2d74b75ddbff0b0d6cdc04bf4a7d31
+PKG_MD5SUM:=		7ecccc03df060cd0ca1414a5a14e6649
 PKG_DESCR:=		norton commander clone
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		glib libncurses
-PKG_BUILDDEP:=		glib ncurses
+PKG_DEPENDS:=		glib libncurses libssh2
+PKG_BUILDDEP:=		glib ncurses libssh2
 PKG_URL:=		http://www.midnight-commander.org/
 PKG_SITES:=		http://ftp.midnight-commander.org/
 PKG_NOPARALLEL:=	1
@@ -30,7 +30,8 @@ CONFIGURE_ARGS+=	--enable-charset \
 			--disable-netcode \
 			--without-libiconv-prefix \
 			--without-x \
-			--with-vfs \
+			--enable-vfs \
+			--enable-vfs-sftp \
 			--without-mcfs \
 			--without-samba \
 			--without-gpm-mouse \
diff --git a/package/mc/patches/patch-lib_tty_key_c b/package/mc/patches/patch-lib_tty_key_c
deleted file mode 100644
index 342eb8657..000000000
--- a/package/mc/patches/patch-lib_tty_key_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- mc-4.8.11.orig/lib/tty/key.c	2013-11-29 19:27:07.000000000 +0100
-+++ mc-4.8.11/lib/tty/key.c	2014-02-11 20:02:34.000000000 +0100
-@@ -1946,6 +1946,7 @@ int
- tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block)
- {
-     int c;
-+    static int flag = 0;    /* Return value from select */
- #ifdef HAVE_LIBGPM
-     static struct Gpm_Event ev; /* Mouse event */
- #endif
-@@ -1978,7 +1979,6 @@ tty_get_event (struct Gpm_Event *event,
-     while (pending_keys == NULL)
-     {
-         int nfd;
--        static int flag = 0;    /* Return value from select */
-         fd_set select_set;
- 
-         FD_ZERO (&select_set);
diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c
deleted file mode 100644
index 5058bd79e..000000000
--- a/package/mc/patches/patch-lib_tty_tty-ncurses_c
+++ /dev/null
@@ -1,27 +0,0 @@
---- mc-4.8.11.orig/lib/tty/tty-ncurses.c	2013-11-29 19:27:07.000000000 +0100
-+++ mc-4.8.11/lib/tty/tty-ncurses.c	2014-02-12 12:40:05.000000000 +0100
-@@ -65,7 +65,7 @@
- 
- /*** file scope macro definitions ****************************************************************/
- 
--#if defined(_AIX) && !defined(CTRL)
-+#if !defined(CTRL)
- #define CTRL(x) ((x) & 0x1f)
- #endif
- 
-@@ -530,6 +530,7 @@ tty_print_anychar (int c)
-     if (mc_global.utf8_display || c > 255)
-     {
-         int res;
-+        unsigned char str[UTF8_CHAR_LEN + 1];
- 
-         res = g_unichar_to_utf8 (c, (char *) str);
-         if (res == 0)
-@@ -540,7 +541,6 @@ tty_print_anychar (int c)
-         }
-         else
-         {
--            unsigned char str[UTF8_CHAR_LEN + 1];
-             const char *s;
- 
-             str[res] = '\0';