me
/
guix
Archived
1
0
Fork 0
Code

gnu: openjpeg: Incorporate grafted changes. 

* gnu/packages/image.scm (openjpeg)[replacement]: Remove field.
[source]: Update to 2.1.2. Add patches
'openjpeg-CVE-2016-9850-CVE-2016-9851.patch' and
'openjpeg-CVE-2016-9572-CVE-2016-9573.patch'.
(openjpeg-1)[replacement]: Remove field.
(openjpeg-2.1.2): Remove variable.
master
Leo Famulari 2017-01-25 12:55:26 -05:00
parent 29705bc29f
commit 66707558b6
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/image.scm
View File

@ -429,8 +429,7 @@ work.")
(define-public openjpeg (define-public openjpeg
(package (package
(name "openjpeg") (name "openjpeg")
(replacement openjpeg-2.1.2) (version "2.1.2")
(version "2.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -440,9 +439,11 @@ work.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2")) "19yz4g0c45sm8y1z01j9djsrl1mkz3pmw7fykc6hkvrqymp7prsc"))
(patches (search-patches "openjpeg-CVE-2016-5157.patch" (patches (search-patches "openjpeg-CVE-2016-5157.patch"
"openjpeg-CVE-2016-7163.patch")))) "openjpeg-CVE-2016-7163.patch"
"openjpeg-CVE-2016-9850-CVE-2016-9851.patch"
"openjpeg-CVE-2016-9572-CVE-2016-9573.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Trying to run `$ make check' results in a no rule fault. ;; Trying to run `$ make check' results in a no rule fault.
@ -466,28 +467,9 @@ error-resilience, a Java-viewer for j2k-images, ...")
(home-page "https://github.com/uclouvain/openjpeg") (home-page "https://github.com/uclouvain/openjpeg")
(license license:bsd-2))) (license license:bsd-2)))
(define openjpeg-2.1.2
(package
(inherit openjpeg)
(name "openjpeg")
(version "2.1.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/uclouvain/openjpeg/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"19yz4g0c45sm8y1z01j9djsrl1mkz3pmw7fykc6hkvrqymp7prsc"))
(patches
(search-patches "openjpeg-CVE-2016-9850-CVE-2016-9851.patch"
"openjpeg-CVE-2016-9572-CVE-2016-9573.patch"))))))
(define-public openjpeg-1 (define-public openjpeg-1
(package (inherit openjpeg) (package (inherit openjpeg)
(name "openjpeg") (name "openjpeg")
(replacement #f)
(version "1.5.2") (version "1.5.2")
(source (source
(origin (origin