Ticket #4411: compressed_encryption_fix.patch

File compressed_encryption_fix.patch, 1.8 KB (added by maxz, 20 months ago)

existing patch with 7z addition

  • src/vfs/extfs/helpers/urar.in

    diff --git a/src/vfs/extfs/helpers/urar.in b/src/vfs/extfs/helpers/urar.in
    index 5453d31..b35cd03 100644
    a b fi 
    3535 
    3636mcrar4fs_list () 
    3737{ 
    38      $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' 
     38     $UNRAR v -c- -p- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' 
    3939BEGIN { flag=0 } 
    4040/^-------/ { flag++; if (flag > 1) exit 0; next } 
    4141flag==1 { 
    flag==1 { 
    5353 
    5454mcrar5fs_list () 
    5555{ 
    56     $UNRAR vt -c- -cfg- "$1" | @AWK@ -F ':' -v uid=`id -u` -v gid=`id -g` ' 
     56    $UNRAR vt -c- -p- -cfg- "$1" | @AWK@ -F ':' -v uid=`id -u` -v gid=`id -g` ' 
    5757    { 
    5858        ### remove space after the ":" of the field name 
    5959        sub ("^ ", "", $2); 
  • src/vfs/extfs/helpers/uzip.in

    diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
    index 22466db..60a1158 100644
    a b my $cmd_addlink = "$app_zip -g -y"; 
    3232# Command used to delete a file from the archive 
    3333my $cmd_delete = "$app_zip -d"; 
    3434# Command used to extract a file to standard out 
    35 my $cmd_extract = "$app_unzip -p"; 
     35my $cmd_extract = "$app_unzip -p -P \"\""; 
    3636 
    3737# -rw-r--r--  2.2 unx     2891 tx     1435 defN 20000330.211927 ./edit.html 
    3838# (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd).(HH)(MM)(SS) (fname) 
  • src/vfs/extfs/helpers/u7z

    diff --git a/src/vfs/extfs/helpers/u7z b/src/vfs/extfs/helpers/u7z
    index 91301c3d9..603c976d3 100755
    a b mcu7zip_copyout () 
    7474        #first we check if we have old p7zip archive with prefix ./ in filename 
    7575        $P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \ 
    7676        EXFNAME='*./'"$2" || EXFNAME="$2" 
    77         $P7ZIP e -so "$1" "$EXFNAME" > "$3" 2>/dev/null 
     77        $P7ZIP e -so -p- "$1" "$EXFNAME" > "$3" 2>/dev/null 
    7878} 
    7979 
    8080mcu7zip_copyin ()