Accepting request 186648 from Base:System

import bugfixes from next version (forwarded request 186639 from subchaser)

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

mc-bf3034-zip_in_tar.diff

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,24 @@
+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.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jul 18 16:50:05 UTC 2013 - subchaser1@gmail.com
+
+- most annoying bug fixes imported from upcomming 4.8.10
+  * add mc-bf3034-zip_in_tar.diff: Cannot enter into zip archive
+    in tar one (mc#3034)
+  * add mc-bf3034-editor-fd-leak.diff: file descriptor leak in
+    mcedit (mc#3040)
+
 -------------------------------------------------------------------
 Wed Jul 17 10:24:58 UTC 2013 - subchaser1@gmail.com
 

mc.spec

@@ -53,6 +53,10 @@ 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
@@ -122,6 +126,9 @@ 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