diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:29:55 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:58:58 +0100 |
| commit | 3d46333539e4a8271d61108574f69bc323de5f19 (patch) | |
| tree | 12d9f5e7cccb56a479e28ad8765d3026eb2444a0 | |
| parent | 9d5aa009062a49bd035ae33e37f6562526e7d38c (diff) | |
| download | patches-3d46333539e4a8271d61108574f69bc323de5f19.tar patches-3d46333539e4a8271d61108574f69bc323de5f19.tar.gz | |
gnu: libjpeg-turbo: Remove graft for 2.0.3.
* gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.3.
[replacement]: Remove.
[source](patches): New field.
| -rw-r--r-- | gnu/packages/image.scm | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0536779b64..b8640227f9 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1486,15 +1486,15 @@ is hereby granted.")))) (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.2") - (replacement libjpeg-turbo/fixed) + (version "2.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version "/libjpeg-turbo-" version ".tar.gz")) + (patches (search-patches "libjpeg-turbo-CVE-2019-2201.patch")) (sha256 (base32 - "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))) + "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) @@ -1517,20 +1517,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -;; Replacement package to fix CVE-2019-13960 and CVE-2019-2201. -(define libjpeg-turbo/fixed - (package - (inherit libjpeg-turbo) - (version "2.0.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/libjpeg-turbo/" - version "/libjpeg-turbo-" version ".tar.gz")) - (sha256 - (base32 - "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2")) - (patches (search-patches "libjpeg-turbo-CVE-2019-2201.patch")))))) - (define-public niftilib (package (name "niftilib") |