From a05b783d91a22f3381f3c2ebc2d226e227ceaa696ac28fe5bbc9683df16405f3 Mon Sep 17 00:00:00 2001
From: David Haller <dnh@opensuse.org>
Date: Sat, 23 Nov 2013 06:51:59 +0000
Subject: [PATCH] Accepting request 207993 from home:dnh:branches:Base:System

make urar-helper patch portable

OBS-URL: https://build.opensuse.org/request/show/207993
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=73
---
 mc-extfs-helpers-urar.patch | 21 ++++++++++++---------
 mc.changes                  |  5 +++++
 mc.spec                     | 10 ++--------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch
index ad12a52..58fc0f6 100644
--- a/mc-extfs-helpers-urar.patch
+++ b/mc-extfs-helpers-urar.patch
@@ -1,6 +1,7 @@
---- src/vfs/extfs/helpers/urar.in.orig	2013-11-12 18:27:16.000000000 +0100
-+++ src/vfs/extfs/helpers/urar.in	2013-11-12 19:05:31.000000000 +0100
-@@ -42,14 +42,36 @@
+diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs/extfs/helpers/urar.in
+--- mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in	2013-08-02 17:02:39.000000000 +0200
++++ mc-4.8.10/src/vfs/extfs/helpers/urar.in	2013-11-22 19:30:40.000000000 +0100
+@@ -42,14 +42,38 @@
       $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
  BEGIN { flag=0 }
  /^-----------/ { flag++; if (flag > 1) exit 0; next }
@@ -13,10 +14,12 @@
 -	    $1="-rw-r--r--"
 -    printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8
 +flag == 1 {
-+    name="";
++    name=""; delete fields; delete seps;
 +
-+    ### split line, save n-fields and save seperators in 'seps'
-+    nf = split($0, fields, " ", seps);
++    ### split line, save n-fields and save seperators in "seps"
++    ### tested with busybox awk
++    nameparts = split($0, fields, " ");
++    split($0, seps, "[^ \t]+");
 +
 +    ### split date for reformatting
 +    split(fields[5], date, "-");
@@ -30,9 +33,9 @@
 +        }
 +    }
 +
-+    ### join filename from fields 8 .. nf (saved above)
-+    for(i = 8; i <= nf; i++) {
-+        name=name fields[i] seps[i];
++    ### join filename from fields 8 .. nameparts (saved above)
++    for(i = 8; i <= nameparts; i++) {
++        name=name fields[i] seps[i+1];
 +    }
 +    ### remove padding blanks from short names
 +    if (length(name)<13) {
diff --git a/mc.changes b/mc.changes
index 9644984..26d77e6 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 22 18:34:57 UTC 2013 - dnh@opensuse.org
+
+- make urar-helper patch portable (tested with busybox awk)
+
 -------------------------------------------------------------------
 Fri Nov 15 07:31:20 UTC 2013 - dnh@opensuse.org
 
diff --git a/mc.spec b/mc.spec
index 4cf9864..78ab467 100644
--- a/mc.spec
+++ b/mc.spec
@@ -44,12 +44,7 @@ Patch20:        mc-f-keys.patch
 Patch21:        mc-extfs-helpers-deb.patch
 
 # add mc-extfs-helpers-urar.patch (by dnh@opensuse.org) - Fix urar
-# extfs failing on files with spaces (bnc#849082), needs gawk >= 4.0.0
-# and is not portable to other awks, so expect upstream changes. As of
-# now (Fri Nov 15 09:43:39 2013), upstream uses a "index by the CRC
-# field" approach as mentioned in bnc#849082. I prefer the gawk >=
-# 4.0.0 version with the "seps" fourth argument to the "split"
-# function. YOpinionMV ;)
+# extfs failing on files with spaces (bnc#849082). Forwarded to upstream.
 Patch22:        mc-extfs-helpers-urar.patch
 
 #debian fixes for vfs
@@ -89,7 +84,6 @@ BuildRequires:  xdg-utils
 BuildRequires:  xorg-x11-devel
 BuildRequires:  xz
 Requires(pre):  permissions
-Requires:       gawk >= 4.0.0
 Recommends:     %{name}-lang = %{version}
 
 %description
@@ -129,7 +123,7 @@ target directory.
 %patch18
 %patch20
 %patch21
-%patch22
+%patch22 -p1
 %patch24
 %patch31
 %patch32