diff options
Diffstat (limited to '0006-Use-gzip-d-instead-of-gunzip.patch')
| -rw-r--r-- | 0006-Use-gzip-d-instead-of-gunzip.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/0006-Use-gzip-d-instead-of-gunzip.patch b/0006-Use-gzip-d-instead-of-gunzip.patch new file mode 100644 index 0000000..ec399bc --- /dev/null +++ b/0006-Use-gzip-d-instead-of-gunzip.patch @@ -0,0 +1,68 @@ +From 999005133c928c841e98600c00e12d4c05846c91 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 16 Jan 2023 19:44:52 +1000 +Subject: [PATCH libXpm 6/6] Use gzip -d instead of gunzip + +GNU gunzip [1] is a shell script that exec's `gzip -d`. Even if we call +/usr/bin/gunzip with the correct built-in path, the actual gzip call +will use whichever gzip it finds first, making our patch pointless. + +Fix this by explicitly calling gzip -d instead. + +[1] https://git.savannah.gnu.org/cgit/gzip.git/tree/gunzip.in + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + README.md | 2 +- + configure.ac | 3 +-- + src/RdFToI.c | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/README.md b/README.md +index 0b1c886..d906954 100644 +--- a/README.md ++++ b/README.md +@@ -41,5 +41,5 @@ the first version found in the PATH used to run configure, and do not depend + on the PATH environment variable set at runtime. + + To specify paths to be used for these commands instead of searching $PATH, pass +-the XPM_PATH_COMPRESS, XPM_PATH_UNCOMPRESS, XPM_PATH_GZIP, and XPM_PATH_GUNZIP ++the XPM_PATH_COMPRESS, XPM_PATH_UNCOMPRESS, and XPM_PATH_GZIP + variables to the configure command. +diff --git a/configure.ac b/configure.ac +index 4fc370d..5535998 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,7 +58,7 @@ AC_DEFINE_UNQUOTED([$1], ["$$1"], [Path to $2]) + ]) dnl End of AC_DEFUN([XPM_PATH_PROG]... + + # Optional feature: When a filename ending in .Z or .gz is requested, +-# open a pipe to a newly forked compress/uncompress/gzip/gunzip command to ++# open a pipe to a newly forked compress/uncompress/gzip command to + # handle it. + AC_MSG_CHECKING([whether to handle compressed pixmaps]) + case $host_os in +@@ -76,7 +76,6 @@ else + XPM_PATH_PROG([XPM_PATH_COMPRESS], [compress]) + XPM_PATH_PROG([XPM_PATH_UNCOMPRESS], [uncompress]) + XPM_PATH_PROG([XPM_PATH_GZIP], [gzip]) +- XPM_PATH_PROG([XPM_PATH_GUNZIP], [gunzip]) + AC_CHECK_FUNCS([closefrom close_range], [break]) + fi + +diff --git a/src/RdFToI.c b/src/RdFToI.c +index a91d337..141c485 100644 +--- a/src/RdFToI.c ++++ b/src/RdFToI.c +@@ -251,7 +251,7 @@ OpenReadFile( + else if ( ext && !strcmp(ext, ".gz") ) + { + mdata->type = XPMPIPE; +- mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GUNZIP, "-qc", "r"); ++ mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GZIP, "-dqc", "r"); + } + else + #endif /* z-files */ +-- +2.39.0 + |