tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
graphicsmagick: 1.3.25 -> 1.3.26
Franz Pletz
8 years ago
cb234482
1cf41005
+2
-67
2 changed files
expand all
collapse all
unified
split
pkgs
applications
graphics
graphicsmagick
cmyka-bounds.patch
default.nix
-36
pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
···
1
1
-
# HG changeset patch
2
2
-
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
3
3
-
# Date 1487905610 21600
4
4
-
# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8
5
5
-
# Parent 0392c4305a4369984ec8069055acc470c0a73647
6
6
-
Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel.
7
7
-
8
8
-
diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c
9
9
-
--- a/coders/tiff.c Sun Jan 29 10:04:57 2017 -0600
10
10
-
+++ b/coders/tiff.c Thu Feb 23 21:06:50 2017 -0600
11
11
-
@@ -1230,8 +1230,8 @@
12
12
-
case 0:
13
13
-
if (samples_per_pixel == 1)
14
14
-
*quantum_type=GrayQuantum;
15
15
-
- else
16
16
-
- *quantum_type=RedQuantum;
17
17
-
+ else
18
18
-
+ *quantum_type=RedQuantum;
19
19
-
break;
20
20
-
case 1:
21
21
-
*quantum_type=GreenQuantum;
22
22
-
@@ -1411,12 +1411,12 @@
23
23
-
}
24
24
-
else
25
25
-
{
26
26
-
- if (image->matte)
27
27
-
+ if (image->matte && samples_per_pixel >= 5)
28
28
-
{
29
29
-
*quantum_type=CMYKAQuantum;
30
30
-
*quantum_samples=5;
31
31
-
}
32
32
-
- else
33
33
-
+ else if (samples_per_pixel >= 4)
34
34
-
{
35
35
-
*quantum_type=CMYKQuantum;
36
36
-
*quantum_samples=4;
+2
-31
pkgs/applications/graphics/graphicsmagick/default.nix
···
2
2
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
3
3
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
4
4
5
5
-
let version = "1.3.25"; in
5
5
+
let version = "1.3.26"; in
6
6
7
7
stdenv.mkDerivation {
8
8
name = "graphicsmagick-${version}";
9
9
10
10
src = fetchurl {
11
11
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
12
12
-
sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn";
12
12
+
sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v";
13
13
};
14
14
15
15
patches = [
16
16
./disable-popen.patch
17
17
-
(fetchpatch {
18
18
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch";
19
19
-
sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2";
20
20
-
})
21
21
-
(fetchpatch {
22
22
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch";
23
23
-
sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn";
24
24
-
})
25
25
-
(fetchpatch {
26
26
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch";
27
27
-
sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
28
28
-
})
29
29
-
(fetchpatch {
30
30
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch";
31
31
-
sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5";
32
32
-
})
33
33
-
(fetchpatch {
34
34
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch";
35
35
-
sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif";
36
36
-
})
37
37
-
(fetchpatch {
38
38
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
39
39
-
sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
40
40
-
})
41
41
-
(fetchpatch {
42
42
-
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
43
43
-
sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
44
44
-
})
45
45
-
./cmyka-bounds.patch
46
17
];
47
18
48
19
configureFlags = [