diff options
author | Robert Scott <code@humanleg.org.uk> | 2019-07-05 21:10:40 +0100 |
---|---|---|
committer | Robert Scott <code@humanleg.org.uk> | 2019-07-06 01:20:26 +0100 |
commit | 9826490d5ea330e8c0dd944e5d131b569beed247 (patch) | |
tree | f0f5c0b69051464cbd868dc54be4addbb05dd1bf /pkgs/applications/graphics/graphicsmagick | |
parent | df738814d1bed1a554eac1536e99253ab75ba012 (diff) | |
download | nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar.gz nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar.bz2 nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar.lz nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar.xz nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.tar.zst nixpkgs-9826490d5ea330e8c0dd944e5d131b569beed247.zip |
graphicsmagick: 1.3.31 -> 1.3.32
security release fixing numerous issues, darwin requires patch to fix issue with pngs
Diffstat (limited to 'pkgs/applications/graphics/graphicsmagick')
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch | 42 | ||||
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 5 |
2 files changed, 45 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch new file mode 100644 index 00000000000..91eacecbf8c --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch @@ -0,0 +1,42 @@ +# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 +# from upstream hg repository: +RegisterPNGImage(): Pass correct size value to strlcat(). + +diff -r 95c4711e8bee -r f30492f40f78 coders/png.c +--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 ++++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 +@@ -6427,26 +6427,26 @@ + + *version='\0'; + #if defined(PNG_LIBPNG_VER_STRING) +- (void) strlcat(version,"libpng ",MaxTextExtent); +- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); ++ (void) strlcat(version,"libpng ",sizeof(version)); ++ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); + #if (PNG_LIBPNG_VER > 10005) + if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); + } + #endif + #endif + + #if defined(ZLIB_VERSION) + if (*version != '\0') +- (void) strlcat(version,", ",MaxTextExtent); +- (void) strlcat(version,"zlib ",MaxTextExtent); +- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); ++ (void) strlcat(version,", ",sizeof(version)); ++ (void) strlcat(version,"zlib ",sizeof(version)); ++ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); + if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,zlib_version,MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,zlib_version,sizeof(version)); + } + #endif diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c93b4fe958d..84d1450da82 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,15 +4,16 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.31"; + version = "1.3.32"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"; + sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; }; patches = [ ./disable-popen.patch + ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ |