Skip to contentSkip to conversation

imagemagick: bump version to 7.0.5-0 (security)

PATCH New Vicente Olivert Riera 3 participants 3 messages Mar 10, 2017 – Mar 13, 2017

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 imagemagick: bump version to 7.0.5-0 (security)

- Fixed memory leak when creating nested exceptions in Magick++
https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634

- Fixed fd leak for webp coder
https://github.com/ImageMagick/ImageMagick/pull/382

- Fixed Spurious memory allocation message
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31438

Full changelog: http://imagemagick.org/script/changelog.php

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...-png.c-unbreak-build-without-JPEG-support.patch | 47 ----------------------
 package/imagemagick/imagemagick.hash               |  2 +-
 package/imagemagick/imagemagick.mk                 |  2 +-
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch
package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch deleted +0 -47
deleted file mode 100644
index 00a1045..0000000
@@ -1,47 +0,0 @@
-From 5d0e9c53f49022df5154eb3c04900f48b1c6448e Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Mon, 6 Feb 2017 17:39:31 +0100
-Subject: [PATCH] png.c: unbreak build without JPEG support
-
-Since commit a9e228f8ac26 (Implemented a private PNG caNv (canvas) chunk),
-PNGsLong gets called unconditionally, but it is only defined if JPEG
-support is enabled (which defines JNG_SUPPORTED), breaking the build:
-
-MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function `WriteOnePNGImage':
-png.c:(.text+0x748d): undefined reference to `PNGsLong'
-png.c:(.text+0x74b7): undefined reference to `PNGsLong'
-
-For build log, see:
-http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log
-
-Fix it by unconditionally defining the helper function.
-
-Submitted-upstream: https://github.com/ImageMagick/ImageMagick/pull/373
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- coders/png.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/coders/png.c b/coders/png.c
-index aebe59281..1328b1aab 100644
---- a/coders/png.c
-+++ b/coders/png.c
-@@ -1229,7 +1229,6 @@ static void PNGLong(png_bytep p,png_uint_32 value)
-   *p++=(png_byte) (value & 0xff);
- }
- 
--#if defined(JNG_SUPPORTED)
- static void PNGsLong(png_bytep p,png_int_32 value)
- {
-   *p++=(png_byte) ((value >> 24) & 0xff);
-@@ -1237,7 +1236,6 @@ static void PNGsLong(png_bytep p,png_int_32 value)
-   *p++=(png_byte) ((value >> 8) & 0xff);
-   *p++=(png_byte) (value & 0xff);
- }
--#endif
- 
- static void PNGShort(png_bytep p,png_uint_16 value)
- {
--- 
-2.11.0
-
package/imagemagick/imagemagick.hash +1 -1
index 90e1db5..75bc9a9 100644
@@ -1,2 +1,2 @@
 # From http://www.imagemagick.org/download/releases/digest.rdf
-sha256 1ee004740b7ab47fff3c92ae4a89dcbd0181c4d5f31fcb7e3697412ea384a0da  ImageMagick-7.0.4-6.tar.xz
+sha256 7362805eaa9f9b90cdb67a1f8762782bef4a42ca44939629aecad3c40305bf4c  ImageMagick-7.0.5-0.tar.xz
package/imagemagick/imagemagick.mk +1 -1
index a917297..d1cd608 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMAGEMAGICK_VERSION = 7.0.4-6
+IMAGEMAGICK_VERSION = 7.0.5-0
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
 IMAGEMAGICK_LICENSE = Apache-2.0
Signature · 1 line
2.10.2
Applied
#1 lore raw

PATCH 1/1 imagemagick: bump version to 7.0.5-0 (security)

Hello,

Quoted 11 lines · Vicente Olivert Riera

- Fixed memory leak when creating nested exceptions in Magick++
https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634

- Fixed fd leak for webp coder
https://github.com/ImageMagick/ImageMagick/pull/382

- Fixed Spurious memory allocation message
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31438

Full changelog: http://imagemagick.org/script/changelog.php

Quoted 7 lines
Signed-off-by Vicente Olivert Riera <[email protected]>
---
 ...-png.c-unbreak-build-without-JPEG-support.patch | 47 ----------------------
 package/imagemagick/imagemagick.hash               |  2 +-
 package/imagemagick/imagemagick.mk                 |  2 +-
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch

Applied to master, thanks. Peter: this one is needed for the LTS branch I believe.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 imagemagick: bump version to 7.0.5-0 (security)

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 11 lines · Vicente Olivert Riera

- Fixed memory leak when creating nested exceptions in Magick++
https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634

- Fixed fd leak for webp coder
https://github.com/ImageMagick/ImageMagick/pull/382

- Fixed Spurious memory allocation message
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31438

Full changelog: http://imagemagick.org/script/changelog.php

Quoted 7 lines
Signed-off-by Vicente Olivert Riera <[email protected]>

---

...-png.c-unbreak-build-without-JPEG-support.patch | 47 ----------------------
package/imagemagick/imagemagick.hash               |  2 +-
package/imagemagick/imagemagick.mk                 |  2 +-
3 files changed, 2 insertions(+), 49 deletions(-)

delete mode 100644 package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch

Quoted 2 lines

Applied to master, thanks. Peter: this one is needed for the LTS branch I believe.

Agreed. Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard