Accepting request 226074 from home:dnh:branches:Base:System

Just so we get this upstream(ed) (security) fix in B:S, even though fish is and should stay disabled for now (bnc#856501 / mc ticket #3128). I'm committing this so that we have a common ground to work from.

OBS-URL: https://build.opensuse.org/request/show/226074
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=88

mc.spec

@@ -45,11 +45,20 @@ Patch17:        mc-rpm.patch
 Patch20:        mc-f-keys.patch
 Patch21:        mc-extfs-helpers-deb.patch
 
+# add patch. bnc#856501
+# http://www.midnight-commander.org/ticket/3128
+Patch22:        mc-vfs-fish-deleted_source_file.patch
+
 # add mc-extfs-iso9660-xorriso.patch
 # fixing iso9660 extfs directory handling using xorriso
 # http://www.midnight-commander.org/ticket/3122
 Patch23:        mc-extfs-iso9660-xorriso.patch
 
+# add mc-vfs_fish_helpers_ls-formatstring.diff
+# fixing possible format-string attack via filename
+# bnc#850803, http://www.midnight-commander.org/ticket/2983
+Patch25:        mc-vfs_fish_helpers_ls-formatstring.diff
+
 #debian fixes for vfs
 Patch24:        02_ignore_ftp_chmod_error.patch
 #Debian fixes
@@ -118,6 +127,8 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
 %patch18
 %patch20
 %patch21
+%patch22 -p1
+%patch25
 %patch23 -p1
 %patch24
 %patch31