Ticket #3064: mc-4.8.10-rpm-ustar-payload.patch

src/vfs/extfs/helpers/rpm

@@ -196 +196 @@
         exit 1
     }
     DATE=`mcrpmfs_getRawOneTag "%{BUILDTIME:date}\n" | cut -c 5-11,21-24`
+    PAYLOAD=`mcrpmfs_getRawOneTag "%{PAYLOADFORMAT}\n" | sed s/ustar/tar/`
 
     HEADERSIZE=`echo "$DESC" | wc -c`
     printf '%s %s %s HEADER\n' "${FILEPREF}"  "${HEADERSIZE}" "${DATE}"
@@ -225 +226 @@
         mcrpmfs_list_fastRPM
     fi
 
-    echo "$FILEPREF 0 $DATE CONTENTS.cpio"
+    echo "$FILEPREF 0 $DATE CONTENTS.$PAYLOAD"
 }
 
 mcrpmfs_copyout ()
@@ -279 +280 @@
         INFO/SIZE)              mcrpmfs_getRawOneTag "%{SIZE} bytes\n" > "$2"; exit 0;;
         INFO/OBSOLETES)         mcrpmfs_getRawOneTag "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" > "$2"; exit 0;;
         INFO/CONFLICTS)         mcrpmfs_getRawOneTag "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" >"$2"; exit 0;;
-        CONTENTS.cpio)          $RPM2CPIO "${rpm_filename}" > "$2"; exit 0;;
+        CONTENTS.*)             $RPM2CPIO "${rpm_filename}" > "$2"; exit 0;;
         *)
             ;;
     esac