[pacman-dev] [PATCH] Support application/gzip MIME type in extraction
From: Kevin Mihelich <kevin@archlinuxarm.org> file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- Sending on behalf of @leming who noticed this with gzipped patch files, and pinged me via IRC. scripts/libmakepkg/source/file.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 08b8bef8..8492ba11 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -102,7 +102,7 @@ extract_file() { case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) cmd="bsdtar" ;; - *application/x-gzip*) + *application/x-gzip*|*application/gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; *) return;; -- 2.21.0
On 21/5/19 11:21 am, Eli Schwartz wrote:
From: Kevin Mihelich <kevin@archlinuxarm.org>
file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> ---
Sending on behalf of @leming who noticed this with gzipped patch files, and pinged me via IRC.
Thanks. Will hit master today. Hopefully whoever packages pacman for distros can pull this in.
scripts/libmakepkg/source/file.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 08b8bef8..8492ba11 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -102,7 +102,7 @@ extract_file() { case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) cmd="bsdtar" ;; - *application/x-gzip*) + *application/x-gzip*|*application/gzip*) case "$ext" in gz|z|Z) cmd="gzip" ;; *) return;;
On 5/27/19 8:49 PM, Allan McRae wrote:
On 21/5/19 11:21 am, Eli Schwartz wrote:
From: Kevin Mihelich <kevin@archlinuxarm.org>
file 5.37 changed the gzip MIME type from application/x-gzip to application/gzip, so support this when checking to extract source files.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> ---
Sending on behalf of @leming who noticed this with gzipped patch files, and pinged me via IRC.
Thanks. Will hit master today. Hopefully whoever packages pacman for distros can pull this in.
archlinuxarm already has it backported, on our end this is covered by https://bugs.archlinux.org/task/62746 -- Eli Schwartz Bug Wrangler and Trusted User
participants (2)
-
Allan McRae
-
Eli Schwartz