rpm/libXpm
SHA256
1
0
Fork 0
forked from pool/libXpm
Code Pull Requests Activity
a6d21eef27
libXpm/n_no-compress-on-sle.patch

25 lines
1.2 KiB
Diff
Raw Normal View History

- n_no-compress-on-sle.patch * we can't handle .Z files, since we don't have ncompress package on SLE; so disable this feature as before (bsc#1207031) - BuildRequires * removed again ncompress * added again autoconf, automake, libtool - run again autoreconf due to patch above - update to 3.5.15: * Use gzip -d instead of gunzip * Prevent a double free in the error code path * Fix CVE-2022-4883: compression commands depend on $PATH * Fix CVE-2022-44617: Runaway loop with width of 0 and enormous height * test: add test cases for CVE-2022-44617 (zero-width w/enormous height) * Fix CVE-2022-46285: Infinite loop on unclosed comments * test: add test case for CVE-2022-46285 (unclosed comments) * cxpm: getc/ungetc wrappers should not adjust position when c == EOF * test: Add unit tests using glib framework * configure: add --disable-open-zfile instead of requiring -DNO_ZPIPE * man pages: Apply standard man page style/formatting * man pages: Replace "See Also" entries with more useful ones * man pages: Fix typos and other minor editing - drop U_0001-configure-add-disable-open-zfile-instead-of-requirin.patch, U_0002-Fix-CVE-2022-46285-Infinite-loop-on-unclosed-comment.patch, U_0004-Fix-CVE-2022-44617-Runaway-loop-with-width-of-0-and-.patch, U_0005-Fix-CVE-2022-4883-compression-commands-depend-on-PAT.patch, U_regression-bug1207029_1207030_1207031.patch U_regression2-bug1207029_1207030_1207031.patch: upstream - switch urls to https - spec file cleanups OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=20
2023-04-03 22:33:37 +02:00
diff -u -r libXpm-3.5.15.orig/configure.ac libXpm-3.5.15/configure.ac
--- libXpm-3.5.15.orig/configure.ac 2023-04-03 22:10:42.223223000 +0200
+++ libXpm-3.5.15/configure.ac 2023-04-03 22:11:35.264112000 +0200
@@ -74,7 +74,6 @@
if test x$OPEN_ZFILE = xno ; then
AC_DEFINE(NO_ZPIPE, 1, [Define to 1 to disable decompression via pipes])
else
- XPM_PATH_PROG([XPM_PATH_COMPRESS], [compress])
XPM_PATH_PROG([XPM_PATH_UNCOMPRESS], [uncompress])
XPM_PATH_PROG([XPM_PATH_GZIP], [gzip])
AC_CHECK_FUNCS([closefrom close_range], [break])
diff -u -r libXpm-3.5.15.orig/src/WrFFrI.c libXpm-3.5.15/src/WrFFrI.c
--- libXpm-3.5.15.orig/src/WrFFrI.c 2023-04-03 22:10:41.615310000 +0200
+++ libXpm-3.5.15/src/WrFFrI.c 2023-04-03 22:17:45.861160000 +0200
@@ -342,8 +342,7 @@
#ifndef NO_ZPIPE
len = strlen(filename);
if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
- mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_COMPRESS, NULL, "w");
- mdata->type = XPMPIPE;
+ mdata->stream.file = NULL;
} else if (len > 3 && !strcmp(".gz", filename + (len - 3))) {
mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GZIP, "-q", "w");
mdata->type = XPMPIPE;
Copy Permalink