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.
This commit is contained in:
Marius Bakke 2019-12-05 17:29:55 +01:00
parent 9d5aa00906
commit 3d46333539
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -1486,15 +1486,15 @@ (define-public pngsuite
(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 @@ (define-public libjpeg-turbo
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")