diff --git a/miniz-2.2.0-Fix-MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8-not-being-s.patch b/miniz-2.2.0-Fix-MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8-not-being-s.patch new file mode 100644 index 0000000..ec6c03d --- /dev/null +++ b/miniz-2.2.0-Fix-MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8-not-being-s.patch @@ -0,0 +1,39 @@ +From aff8d486584f91d5b8358f7aa9be759ddb2cd005 Mon Sep 17 00:00:00 2001 +From: Martin +Date: Sat, 11 Dec 2021 12:51:50 +0100 +Subject: [PATCH] Fix MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 not being set +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Petr Písař: Ported to 2.2.0. + +Signed-off-by: Petr Písař +--- + miniz.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/miniz.c b/miniz.c +index 071367f..95e4186 100644 +--- a/miniz.c ++++ b/miniz.c +@@ -6407,13 +6407,13 @@ mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pA + mz_zip_internal_state *pState; + mz_uint64 file_ofs = 0, cur_archive_header_file_ofs; + +- if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) +- gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; +- + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + level = level_and_flags & 0xF; + ++ if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) ++ gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; ++ + /* Sanity checks */ + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); +-- +2.34.1 + diff --git a/miniz.spec b/miniz.spec index 3b16ac7..b916cad 100644 --- a/miniz.spec +++ b/miniz.spec @@ -22,6 +22,8 @@ Patch0: miniz-2.2.0-Examples-to-include-system-miniz.h.patch Patch1: miniz-2.2.0-Fix-use-of-uninitialized-memory-in-tinfl_decompress_.patch # Fix an unaligned memory access, in upstream after 2.2.0. Patch2: miniz-2.2.0-Fix-unaligned-pointer-access.patch +# Fix setting MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8, in upstream after 2.2.0. +Patch3: miniz-2.2.0-Fix-MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8-not-being-s.patch BuildRequires: coreutils # diffutils for cmp BuildRequires: diffutils @@ -62,6 +64,7 @@ unzip -e '%{SOURCE0}' %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Normalize end-of-lines sed -e 's/\r$//' ChangeLog.md > ChangeLog.md.new touch -r ChangeLog.md ChangeLog.md.new @@ -141,6 +144,7 @@ install -m 0644 %{name}.h '%{buildroot}/%{_includedir}' * Mon Jan 24 2022 Petr Pisar - 2.2.0-2 - Fix an unitialized memory in tinfl_decompress_mem_to_callback() (GH#197) - Fix an unaligned memory access +- Fix setting MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 * Wed Aug 11 2021 Petr Pisar - 2.2.0-1 - 2.2.0 bump