Accepting request 196155 from Base:System

Please test. SLE still does not work, I have no idea what's with the permission macros on SLE. But the build works now. (forwarded request 196151 from dnh)

OBS-URL: https://build.opensuse.org/request/show/196155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=50

mc-4.8.10.sha256

@@ -0,0 +1,2 @@
+5f4166fe78fbf4b42f51ed526ca7f79fea8c77d04355c2b97d4df2a6bd2a1b1a  mc-4.8.10.tar.bz2
+5bda5a10bd0447da4b3b36c55d10fdf26e279d29fd30792467d68bdb7c2f2788  mc-4.8.10.tar.xz

mc-4.8.10.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bda5a10bd0447da4b3b36c55d10fdf26e279d29fd30792467d68bdb7c2f2788
+size 2152000

mc-4.8.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1253fbed3d471473c4eb9709dd6b981333754e122ddbfaa99d7cfb57508477a2
-size 2169836

mc-Syntax.cmake.patch

@@ -1,8 +1,11 @@
---- misc/syntax/Syntax.in.orig	2012-12-28 12:47:48.000000000 +0400
+--- misc/syntax/Syntax.in.orig	2013-06-25 23:29:14.000000000 +0200
-+++ misc/syntax/Syntax.in	2013-03-07 09:36:14.233306543 +0400
++++ misc/syntax/Syntax.in	2013-08-23 21:55:31.216822402 +0200
-@@ -69,4 +69,4 @@
+@@ -67,7 +67,7 @@
+ file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|..\*\\.mak|Kbuild)$ Makefile
+ include makefile.syntax
  
 -file CMakeLists.txt$ CMake
 +file (\/CMakeLists.txt|.cmake)$ CMake
  include cmake.syntax
  
+ file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram

mc-bf3034-zip_in_tar.diff

@@ -1,19 +0,0 @@
-References: mc#3034
-            https://www.midnight-commander.org/ticket/3034
-Upstream: merged
-Subject: Cannot enter into zip archive in tar one
-
-Index: src/filemanager/ext.c
-===================================================================
---- src/filemanager/ext.c	(revision 2640b21bb9700aa51a70f35f9e10732c82a7366f)
-+++ src/filemanager/ext.c	(revision 8cb80dcc9c0c2f36111dd439f3e415cec58f7ffa)
-@@ -680,7 +680,7 @@
- #endif /* HAVE_CHARSET */
- 
-+        got_data = get_file_type_local (localfile_vpath, content_string, sizeof (content_string));
-+
-         mc_ungetlocalcopy (filename_vpath, localfile_vpath, FALSE);
--
--        got_data = get_file_type_local (localfile_vpath, content_string, sizeof (content_string));
- 
-         if (got_data > 0)

mc-bf3040-mcedit_fd_leak.diff

@@ -1,24 +0,0 @@
-References: mc#3040
-            https://www.midnight-commander.org/ticket/3040
-Upstream: merged
-Subject: File descriptor leak in mcedit
-
-Index: src/editor/edit.c
-===================================================================
---- src/editor/edit.c	(revision c5924af3c454585a2307a473e8c8e2dcc3cbe4a6)
-+++ src/editor/edit.c	(revision 4f1801ca11a50187b51916813a3a331e4e3190ba)
-@@ -326,4 +326,6 @@
- 
-   cleanup:
-+    (void) mc_close (file);
-+
-     if (errmsg != NULL)
-     {
-@@ -332,7 +334,4 @@
-         ret = FALSE;
-     }
--
--    if (!ret)
--        (void) mc_close (file);
- 
-     return ret;

mc-multi-press-f-keys.patch

@@ -1,9 +1,8 @@
 http://www.midnight-commander.org/ticket/287
-Index: lib/tty/key.c
+--- lib/tty/key.c.orig	2013-08-23 22:08:01.273850736 +0200
-===================================================================
++++ lib/tty/key.c	2013-08-23 22:08:01.285849858 +0200
---- lib/tty/key.c.orig
+@@ -1027,10 +1027,13 @@
-+++ lib/tty/key.c
+         }
-@@ -969,9 +969,12 @@ correct_key_code (int code)
      }
  
 -    /* F0 is the same as F10 for out purposes */
@@ -17,7 +16,7 @@ Index: lib/tty/key.c
      /*
       * We are not interested if Ctrl was pressed when entering control
       * characters, so assume that it was.  When checking for such keys,
-@@ -1058,6 +1061,16 @@ correct_key_code (int code)
+@@ -1116,6 +1119,16 @@
          mod &= ~KEY_M_SHIFT;
      }
  
@@ -34,7 +33,7 @@ Index: lib/tty/key.c
      if (!mc_global.tty.alternate_plus_minus)
          switch (c)
          {
-@@ -1928,7 +1928,7 @@ get_key_code (int no_delay)
+@@ -1928,7 +1941,7 @@
          {
              /* Convert escape-digits to F-keys */
              if (g_ascii_isdigit (c))
@@ -43,10 +42,8 @@ Index: lib/tty/key.c
              else if (c == ' ')
                  c = ESC_CHAR;
              else
-Index: lib/tty/tty-slang.h
+--- lib/tty/tty-slang.h.orig	2013-06-25 23:29:14.000000000 +0200
-===================================================================
++++ lib/tty/tty-slang.h	2013-08-23 22:08:01.285849858 +0200
---- lib/tty/tty-slang.h.orig
-+++ lib/tty/tty-slang.h
 @@ -11,6 +11,7 @@
  /*** typedefs(not structures) and defined constants **********************************************/
  

mc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug 23 18:10:44 UTC 2013 - dnh@opensuse.org
+
+- update to 4.8.10
+- remove patch90 mc-bf3034-zip_in_tar.diff, fixed upstream
+- remove patch91 mc-bf3040-mcedit_fd_leak.diff, fixed upstream
+- more bugfixes: #3041, #3043, #3047, #2713, #3036
+  see https://www.midnight-commander.org/ticket/<BUGNO>
+- add libssh2 for sftp
+
 -------------------------------------------------------------------
 Thu Jul 18 16:50:05 UTC 2013 - subchaser1@gmail.com
 

mc.spec

@@ -21,7 +21,7 @@ Summary:        Midnight Commander
 License:        GPL-3.0+
 Group:          Productivity/File utilities
 Url:            http://www.midnight-commander.org/
-Version:        4.8.9
+Version:        4.8.10
 Release:        0.0
 Source:         http://ftp.midnight-commander.org/mc-%{version}.tar.xz
 Source1:        x11_browser
@@ -53,13 +53,8 @@ Patch41:        mc-multi-press-f-keys.patch
 #Patch adding -fpie and -pie to compilation and linking of setuid binaries
 Patch52:        mc-pie.patch
 
-# bugfixes from upcomming verision
-Patch90:        mc-bf3034-zip_in_tar.diff
-Patch91:        mc-bf3040-mcedit_fd_leak.diff
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  audiofile-devel
-BuildRequires:  docbook-toys
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel
@@ -73,6 +68,7 @@ BuildRequires:  indent
 BuildRequires:  jpeg
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libssh2-devel
 BuildRequires:  readline-devel
 BuildRequires:  recode
 BuildRequires:  slang-devel
@@ -126,9 +122,6 @@ target directory.
 %patch41
 %patch52 -p1
 
-%patch90
-%patch91
-
 %build
 autoreconf --force --install
 %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
@@ -139,12 +132,13 @@ export X11_WWW="%{_datadir}/mc/x11_browser"
 %configure \
     --localstatedir=/var/lib \
     --enable-charset \
-    --enable-vfs-smb --with-smb-configdir=%{_sysconfdir}/samba
+    --enable-vfs-smb --with-smb-configdir=%{_sysconfdir}/samba \
 
-make %{?jobs:-j%{jobs}}
+make %{?jobs:-j%{jobs}} V=1
 
 %install
 make DESTDIR=%{buildroot} install
+
 # clean up this setuid problem for now
 chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver