diff --git a/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch b/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch deleted file mode 100644 index 82bca05..0000000 --- a/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 17a924a2275b3e7721dc05e0670cae638371a98f Mon Sep 17 00:00:00 2001 -From: Jake Dane <3689-jakedane@users.noreply.gitlab.gnome.org> -Date: Fri, 19 Aug 2022 06:12:25 +0000 -Subject: [PATCH] jpeg: Increase memory limit for loading image data - -As fix for security issue #205 when loading image data the memory size -was limited to 100 MB. That seemed like a good threshold. For larger -images, from around 18 megapixels (MP) and up though not for all such -images, this threshold was too low. Increasing the threshold too 300 MB -seems to work better and lets larger images load. - -Fixes #216. ---- - gdk-pixbuf/io-jpeg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c -index 22f4174fe..6317e20d3 100644 ---- a/gdk-pixbuf/io-jpeg.c -+++ b/gdk-pixbuf/io-jpeg.c -@@ -1091,7 +1091,7 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data, - rc = jpeg_read_header (cinfo, TRUE); - context->src_initialized = TRUE; - -- cinfo->mem->max_memory_to_use = 100 * 1024 * 1024; -+ cinfo->mem->max_memory_to_use = 300 * 1024 * 1024; - - if (rc == JPEG_SUSPENDED) - continue; --- -2.37.2 - diff --git a/_service b/_service index 156c7cb..032b678 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ - + https download.gnome.org - sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.tar.xz + sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz - + diff --git a/gdk-pixbuf-2.42.10.zip b/gdk-pixbuf-2.42.10.zip new file mode 100644 index 0000000..041d7ae --- /dev/null +++ b/gdk-pixbuf-2.42.10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da136ee80b526ef905b8d90fd200ae4c67aec61aadf025de3954331235e24fe2 +size 7779796 diff --git a/gdk-pixbuf-2.42.9.zip b/gdk-pixbuf-2.42.9.zip deleted file mode 100644 index 8689cee..0000000 --- a/gdk-pixbuf-2.42.9.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77ce44e314d8e2f4731b91b3d2dd6f6d3687b9b8b3aac52abd2201f92b3f113d -size 8423841 diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 8f2e4cb..f2a4812 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 26 11:58:08 UTC 2022 - Bjørn Lie + +- Update to version 2.42.10: + + Search for rst2man.py. + + Update the memory size limit for JPEG images. + + Updated translations. +- Drop patch fixed upstream (with different limit): + + 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch + ------------------------------------------------------------------- Tue Aug 30 16:49:32 UTC 2022 - Michael Gorse diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 46a54ca..578cec4 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -20,7 +20,7 @@ %define gdk_pixbuf_binary_version 2.10.0 Name: gdk-pixbuf -Version: 2.42.9 +Version: 2.42.10 Release: 0 Summary: An image loading library License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source1: macros.gdk-pixbuf Source2: README.SUSE Source3: gdk-pixbuf-rpmlintrc Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch mgorse@suse.com -- fix loading of larger images. -Patch0: 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: docutils