3e801931dc
Security fixes: - gzip: prevent a hang when processing a malformed gzip inside a gzip (#2366, OSS-Fuzz) - tar: don't crash on truncated tar archives (#2364, OSS-Fuzz) - tar: fix two leaks in tar header parsing (#2377) Important bugfixes: - 7-zip: read/write symlink paths as UTF-8 (#2252) - cpio: exit with an error code if an entry could not be extracted (#2371) - rar5: report encrypted entries (#2096) - tar: fix truncation of entry pathnames in specific archives (#2360) Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 55d0c9a9a6f89ed5c4d2e0d25cf499f180a99ee1) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 3879afd473a256173cc626e16293f3fe8875f2d6 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 6 Jan 2024 09:53:23 +0100
|
|
Subject: [PATCH] Revert "Only add "iconv" to the .pc file if needed (#1825)"
|
|
|
|
This reverts commit 1f35c466aaa9444335a1b854b0b7223b0d2346c2.
|
|
|
|
Upstream: no dedicated PR for this revert but there is already plenty of PRs/issues to fix iconv build ...
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
configure.ac | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 93f7af94..204a4e69 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -455,9 +455,7 @@ if test "x$with_iconv" != "xno"; then
|
|
AC_CHECK_HEADERS([localcharset.h])
|
|
am_save_LIBS="$LIBS"
|
|
LIBS="${LIBS} ${LIBICONV}"
|
|
- if test -n "$LIBICONV"; then
|
|
- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
|
|
- fi
|
|
+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
|
|
AC_CHECK_FUNCS([locale_charset])
|
|
LIBS="${am_save_LIBS}"
|
|
if test "x$ac_cv_func_locale_charset" != "xyes"; then
|
|
--
|
|
2.43.0
|
|
|