From a9bda74bf908ea2e29600fe6c82b7d649a35e8f19c714aad03cd24dce9f5cefa Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Thu, 3 Apr 2014 07:11:41 +0000
Subject: [PATCH] Accepting request 228797 from home:dnh:branches:Base:System

- update to 4.8.12
- remove mc-vfs_fish_helpers_ls-formatstring.diff (fixed upstream)
- change mc-extfs-iso9660-xorriso.patch to work with upstream fix

OBS-URL: https://build.opensuse.org/request/show/228797
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=89
---
 mc-4.8.11.tar.xz               |  3 ---
 mc-4.8.12.tar.xz               |  3 +++
 mc-extfs-iso9660-xorriso.patch | 34 +++++++++-------------------------
 mc.changes                     |  7 +++++++
 mc.spec                        | 15 ++++-----------
 5 files changed, 23 insertions(+), 39 deletions(-)
 delete mode 100644 mc-4.8.11.tar.xz
 create mode 100644 mc-4.8.12.tar.xz

diff --git a/mc-4.8.11.tar.xz b/mc-4.8.11.tar.xz
deleted file mode 100644
index 702a836..0000000
--- a/mc-4.8.11.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a
-size 2211144
diff --git a/mc-4.8.12.tar.xz b/mc-4.8.12.tar.xz
new file mode 100644
index 0000000..9121e36
--- /dev/null
+++ b/mc-4.8.12.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe
+size 2237892
diff --git a/mc-extfs-iso9660-xorriso.patch b/mc-extfs-iso9660-xorriso.patch
index 91bf1f2..4ffbbc4 100644
--- a/mc-extfs-iso9660-xorriso.patch
+++ b/mc-extfs-iso9660-xorriso.patch
@@ -1,30 +1,14 @@
----
- src/vfs/extfs/helpers/iso9660.in |   13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-Index: mc-4.8.11/src/vfs/extfs/helpers/iso9660.in
-===================================================================
---- mc-4.8.11.orig/src/vfs/extfs/helpers/iso9660.in	2014-01-01 19:44:49.000000000 +0000
-+++ mc-4.8.11/src/vfs/extfs/helpers/iso9660.in	2014-01-01 19:46:02.000000000 +0000
-@@ -38,13 +38,16 @@ xorriso_list() {
-         return 1
-     fi
-     local dir attr ln usr gr sz dt1 dt2 dt3 nm len name
--    dir="$2"
--    $XORRISO -dev stdio:"$1" -cd "$dir" -lsl 2> /dev/null | @GREP@ "^[-d]" | \
-+    dir="${2:-/}"
-+    lsl=$( $XORRISO -abort_on FATAL -dev stdio:"$1" -cd "$dir" -lsl 2> /dev/null )
-+    r=$?
-+    test $r -gt 0 && return $r
-+    echo "$lsl" | /usr/bin/grep "^[-d]" | \
+--- src/vfs/extfs/helpers/iso9660.in.orig	2014-04-02 21:42:18.000000000 +0200
++++ src/vfs/extfs/helpers/iso9660.in	2014-04-02 21:43:40.000000000 +0200
+@@ -46,9 +46,9 @@
+     echo "$lsl" | @GREP@ "^[-d]" | \
      while read attr ln usr gr sz dt1 dt2 dt3 nm ; do
          len=$((${#nm} - 1))
--        name=$(printf "$nm" | cut -c2-$len)  # remove quotes
--        if test $(printf "$nm" | cut -c1-2) != "d"; then
--            printf "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name"
+-        name=$(printf -- "$nm" | cut -c2-$len)  # remove quotes
 +        name=$(printf -- '%s' "$nm" | cut -c2-$len)  # remove quotes
-+        if test $(printf -- '%s' "$attr" | cut -c1) != "d"; then
-+            printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name"
+ 
+-        if test $(printf -- "$attr" | cut -c1-1) != "d"; then
++        if test $(printf -- '%s' "$attr" | cut -c1-1) != "d"; then
+             printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name"
          else
              xorriso_list "$1" "$dir/$name"
-         fi
diff --git a/mc.changes b/mc.changes
index 6e3515c..3962825 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  2 19:35:48 UTC 2014 - dnh@opensuse.org
+
+- update to 4.8.12
+- remove mc-vfs_fish_helpers_ls-formatstring.diff (fixed upstream)
+- change mc-extfs-iso9660-xorriso.patch to work with upstream fix
+
 -------------------------------------------------------------------
 Sat Mar 15 15:35:23 UTC 2014 - dnh@opensuse.org
 
diff --git a/mc.spec b/mc.spec
index 7c74f30..b0489b5 100644
--- a/mc.spec
+++ b/mc.spec
@@ -21,7 +21,7 @@ Summary:        Midnight Commander
 License:        GPL-3.0+
 Group:          Productivity/File utilities
 Url:            http://midnight-commander.org/
-Version:        4.8.11
+Version:        4.8.12
 Release:        0
 
 #Git-Clone:	git://github.com/MidnightCommander/mc
@@ -49,16 +49,10 @@ Patch21:        mc-extfs-helpers-deb.patch
 # 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
+# changed mc-extfs-iso9660-xorriso.patch
+# to reflect upstream fix
 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
@@ -128,8 +122,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
 %patch20
 %patch21
 %patch22 -p1
-%patch25
-%patch23 -p1
+%patch23 -p0
 %patch24
 %patch31
 %patch32