pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 206949 from Base:System

Browse Source 
add mc-extfs-helpers-urar.patch to fix urar extfs failing on files with spaces when unrar5 is used (bnc#849082).

OBS-URL: https://build.opensuse.org/request/show/206949
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=53
This commit is contained in:
Tomáš Chvátal 2013-11-15 07:37:42 +00:00 committed by Git OBS Bridge
commit d10650da33
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mc-extfs-helpers-urar.patch Normal file
View File

@ -0,0 +1,47 @@
--- 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 @@
$UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
BEGIN { flag=0 }
/^-----------/ { flag++; if (flag > 1) exit 0; next }
-flag==1 {
- split($5, a, "-")
- if (index($1, "D") != 0)
- $1="drwxr-xr-x"
- else
- if (index($1, ".") != 0)
- $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="";
+
+ ### split line, save n-fields and save seperators in 'seps'
+ nf = split($0, fields, " ", seps);
+
+ ### split date for reformatting
+ split(fields[5], date, "-");
+
+ ### check/adjust rights
+ if (index(fields[1], "D") != 0) {
+ fields[1] = "drwxr-xr-x";
+ } else {
+ if (index(fields[1], ".") != 0) {
+ fields[1] = "-rw-r--r--";
+ }
+ }
+
+ ### join filename from fields 8 .. nf (saved above)
+ for(i = 8; i <= nf; i++) {
+ name=name fields[i] seps[i];
+ }
+ ### remove padding blanks from short names
+ if (length(name)<13) {
+ sub(" *$", "", name);
+ }
+
+ printf("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n",
+ fields[1], uid, gid, fields[2], date[2],
+ date[1], date[3], fields[6], name);
}'
}

7
mc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 12 21:09:36 UTC 2013 - dnh@opensuse.org
- add mc-extfs-helpers-urar.patch to fix urar extfs failing on files
with spaces when unrar5 is used (bnc#849082). Thanks to D. Werner
for finding the problem and proposing the fix.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 30 17:23:48 CEST 2013 - sbrabec@suse.cz Mon Sep 30 17:23:48 CEST 2013 - sbrabec@suse.cz

3
mc.spec
View File

@ -42,6 +42,8 @@ Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch Patch17: mc-rpm.patch
Patch20: mc-f-keys.patch Patch20: mc-f-keys.patch
Patch21: mc-extfs-helpers-deb.patch Patch21: mc-extfs-helpers-deb.patch
# mc-extfs-helpers-urar.patch dnh@opensuse.org - Fix urar extfs failing on files with spaces (bnc#849082)
Patch22: mc-extfs-helpers-urar.patch
#debian fixes for vfs #debian fixes for vfs
Patch24: 02_ignore_ftp_chmod_error.patch Patch24: 02_ignore_ftp_chmod_error.patch
#Debian fixes #Debian fixes
@ -118,6 +120,7 @@ target directory.
%patch18 %patch18
%patch20 %patch20
%patch21 %patch21
%patch22
%patch24 %patch24
%patch31 %patch31
%patch32 %patch32