diff --git a/mupdf-1.21.1-fix-png_write_band.patch b/mupdf-1.21.1-fix-png_write_band.patch deleted file mode 100644 index 65f49b5fac6a3aace9b3f3a5c3881671f7e58ed2..0000000000000000000000000000000000000000 --- a/mupdf-1.21.1-fix-png_write_band.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Mamoru TASAKA -Date: Sun, 18 Dec 2022 00:22:04 +0000 (+0900) -Subject: Bug 706227: png_write_band: initialize stream before calling deflateBound -X-Git-Url: http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=a76b4ed0d3a2c7e52bba2d6c10b44d11d5ade2fe - -Bug 706227: png_write_band: initialize stream before calling deflateBound - -zlib deflateBound manual says when calling this function, -stream should have been initialized via a call to deflateInit_() -or deflateInit2_(), so change so. - -Note that without this fix, "mutool draw -F png" segfaults on s390x, -perhaps on big endian, uninitialized bytes of a value (which is -not wholly initialized) is read, on the other hand, on little endian -initialized bytes of the value is read, so it happens not to cause -segfault. - -Fixes https://bugs.ghostscript.com/show_bug.cgi?id=706227 ---- - -diff --git a/source/fitz/output-png.c b/source/fitz/output-png.c -index 17279f913..979c75eeb 100644 ---- a/source/fitz/output-png.c -+++ b/source/fitz/output-png.c -@@ -236,6 +236,12 @@ png_write_band(fz_context *ctx, fz_band_writer *writer_, int stride, int band_st - if (usize > SIZE_MAX / band_height) - fz_throw(ctx, FZ_ERROR_GENERIC, "png data too large."); - usize *= band_height; -+ writer->stream.opaque = ctx; -+ writer->stream.zalloc = fz_zlib_alloc; -+ writer->stream.zfree = fz_zlib_free; -+ err = deflateInit(&writer->stream, Z_DEFAULT_COMPRESSION); -+ if (err != Z_OK) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "compression error %d", err); - writer->usize = usize; - /* Now figure out how large a buffer we need to compress into. - * deflateBound always expands a bit, and it's limited by being -@@ -245,12 +251,6 @@ png_write_band(fz_context *ctx, fz_band_writer *writer_, int stride, int band_st - writer->csize = UINT32_MAX; - writer->udata = Memento_label(fz_malloc(ctx, writer->usize), "png_write_udata"); - writer->cdata = Memento_label(fz_malloc(ctx, writer->csize), "png_write_cdata"); -- writer->stream.opaque = ctx; -- writer->stream.zalloc = fz_zlib_alloc; -- writer->stream.zfree = fz_zlib_free; -- err = deflateInit(&writer->stream, Z_DEFAULT_COMPRESSION); -- if (err != Z_OK) -- fz_throw(ctx, FZ_ERROR_GENERIC, "compression error %d", err); - } - - dp = writer->udata; diff --git a/mupdf-1.21.1-source.tar.gz b/mupdf-1.22.0-source.tar.gz similarity index 79% rename from mupdf-1.21.1-source.tar.gz rename to mupdf-1.22.0-source.tar.gz index d449f20339320033c8d9592ef51dd3c8e89c2dbd..cf78ea095d85f42ca6f57ca8c3b605ca734a8c58 100644 Binary files a/mupdf-1.21.1-source.tar.gz and b/mupdf-1.22.0-source.tar.gz differ diff --git a/mupdf.spec b/mupdf.spec index c823ded65fdce95ef5c93984b207341a306e6881..91175fd3f5f1d40ca73999a4ca18587cc8f890e8 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -7,7 +7,7 @@ %global upversion %{version} Name: mupdf -Version: 1.21.1 +Version: 1.22.0 Release: %{anolis_release}%{?dist} Summary: A lightweight PDF viewer and toolkit License: AGPL-3.0-or-later @@ -16,8 +16,6 @@ Source0: http://mupdf.com/downloads/archive/%{name}-%{upversion}-source.t Source1: %{name}.desktop Source2: %{name}-gl.desktop -Patch: mupdf-1.21.1-fix-png_write_band.patch - BuildRequires: gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig BuildRequires: openjpeg2-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel @@ -133,5 +131,8 @@ cd %{buildroot}/%{_bindir} && ln -s %{name}-x11 %{name} %doc README CHANGES docs/* %changelog +* Thu Apr 20 2023 Funda Wang - 1.22.0-1 +- New version 1.22.0 + * Fri Mar 17 2023 happy_orange - 1.21.1-1 - package init from upstream