From 289e68037e0f00a945ef49a13d908f84bf1b3e0ad16f823c50412d88f8113c97 Mon Sep 17 00:00:00 2001 From: David Haller Date: Sat, 23 Nov 2013 18:16:12 +0000 Subject: [PATCH] Accepting request 208058 from home:dnh:branches:Base:System - fix the urar patch (thanks to D. Werner again) OBS-URL: https://build.opensuse.org/request/show/208058 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=75 --- mc-extfs-helpers-urar.patch | 7 ++++--- mc.changes | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch index 58fc0f6..aaef3a1 100644 --- a/mc-extfs-helpers-urar.patch +++ b/mc-extfs-helpers-urar.patch @@ -1,7 +1,7 @@ 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 @@ ++++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-23 19:09:46.000000000 +0100 +@@ -42,14 +42,39 @@ $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' BEGIN { flag=0 } /^-----------/ { flag++; if (flag > 1) exit 0; next } @@ -20,6 +20,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs + ### tested with busybox awk + nameparts = split($0, fields, " "); + split($0, seps, "[^ \t]+"); ++ sub("^ ", "", seps[8]); + + ### split date for reformatting + split(fields[5], date, "-"); @@ -35,7 +36,7 @@ diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs + + ### join filename from fields 8 .. nameparts (saved above) + for(i = 8; i <= nameparts; i++) { -+ name=name fields[i] seps[i+1]; ++ name=name seps[i] fields[i]; + } + ### remove padding blanks from short names + if (length(name)<13) { diff --git a/mc.changes b/mc.changes index c7823f2..e269897 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 23 18:11:35 UTC 2013 - dnh@opensuse.org + +- fix the urar patch (thanks to D. Werner again) + ------------------------------------------------------------------- Sat Nov 23 05:42:12 UTC 2013 - dnh@opensuse.org