Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package pillow
Matthias fixed the important bug #926552 (fails loading some PNG files)
in pillow/5.4.1-2. While the bug is not release critical, it breaks
operation of dedup.debian.net. The bug is well understood upstream and
Matthias essentially cherry-picked the relevant upstream patch. Would
you consider including this change in buster?
unblock pillow/5.4.1-2
Thank you for considering
Helmut
diff --minimal -Nru pillow-5.4.1/debian/changelog pillow-5.4.1/debian/changelog
--- pillow-5.4.1/debian/changelog 2019-01-18 11:05:56.000000000 +0100
+++ pillow-5.4.1/debian/changelog 2019-04-07 02:53:28.000000000 +0200
@@ -1,3 +1,9 @@
+pillow (5.4.1-2) unstable; urgency=medium
+
+ * Allow for unknown PNG chunks after image data. Closes: #926552.
+
+ -- Matthias Klose <d...@debian.org> Sun, 07 Apr 2019 02:53:28 +0200
+
pillow (5.4.1-1) unstable; urgency=medium
* New upstream version.
diff --minimal -Nru
pillow-5.4.1/debian/patches/4e0a73b4faf4c0b16c6b3912b64f4ad7a6c99acf.diff
pillow-5.4.1/debian/patches/4e0a73b4faf4c0b16c6b3912b64f4ad7a6c99acf.diff
--- pillow-5.4.1/debian/patches/4e0a73b4faf4c0b16c6b3912b64f4ad7a6c99acf.diff
1970-01-01 01:00:00.000000000 +0100
+++ pillow-5.4.1/debian/patches/4e0a73b4faf4c0b16c6b3912b64f4ad7a6c99acf.diff
2019-04-07 02:53:18.000000000 +0200
@@ -0,0 +1,43 @@
+Allow for unknown PNG chunks after image data
+
+diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
+index c94f8eaad..840174444 100644
+--- a/Tests/test_file_png.py
++++ b/Tests/test_file_png.py
+@@ -596,6 +596,7 @@ def test_apng(self):
+ im = Image.open("Tests/images/iss634.apng")
+ self.assertEqual(im.get_format_mimetype(), 'image/apng')
+
++ # This also tests reading unknown PNG chunks (fcTL and fdAT) in
load_end
+ expected = Image.open("Tests/images/iss634.webp")
+ self.assert_image_similar(im, expected, 0.23)
+
+diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
+index f3a2eaf21..0669ab216 100644
+--- a/src/PIL/PngImagePlugin.py
++++ b/src/PIL/PngImagePlugin.py
+@@ -533,14 +533,6 @@ def chunk_acTL(self, pos, length):
+ self.im_custom_mimetype = 'image/apng'
+ return s
+
+- def chunk_fcTL(self, pos, length):
+- s = ImageFile._safe_read(self.fp, length)
+- return s
+-
+- def chunk_fdAT(self, pos, length):
+- s = ImageFile._safe_read(self.fp, length)
+- return s
+-
+
+ # --------------------------------------------------------------------
+ # PNG reader
+@@ -682,6 +674,9 @@ def load_end(self):
+ break
+ except EOFError:
+ ImageFile._safe_read(self.fp, length)
++ except AttributeError:
++ logger.debug("%r %s %s (unknown)", cid, pos, length)
++ ImageFile._safe_read(self.fp, length)
+ self._text = self.png.im_text
+ self.png.close()
+ self.png = None
diff --minimal -Nru pillow-5.4.1/debian/patches/series
pillow-5.4.1/debian/patches/series
--- pillow-5.4.1/debian/patches/series 2019-01-18 11:05:56.000000000 +0100
+++ pillow-5.4.1/debian/patches/series 2019-04-07 02:53:28.000000000 +0200
@@ -1,3 +1,4 @@
toplevel-setup.py
generate-webp-file
js-script-file.diff
+4e0a73b4faf4c0b16c6b3912b64f4ad7a6c99acf.diff
