diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-25 12:55:26 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-25 13:23:26 -0500 |
| commit | 66707558b61c69edb3b3ee7dbec28a75acf75cd3 (patch) | |
| tree | 53b7636dcca7cc0b3ec84752d3455b25c93d0ed2 | |
| parent | 29705bc29f891919edf67af4c8368af4c84bf9e0 (diff) | |
| download | guix-66707558b61c69edb3b3ee7dbec28a75acf75cd3.tar guix-66707558b61c69edb3b3ee7dbec28a75acf75cd3.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/image.scm | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 613d344b97..59113e3066 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -429,8 +429,7 @@ work.") (define-public openjpeg (package (name "openjpeg") - (replacement openjpeg-2.1.2) - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) @@ -440,9 +439,11 @@ work.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2")) + "19yz4g0c45sm8y1z01j9djsrl1mkz3pmw7fykc6hkvrqymp7prsc")) (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) (arguments ;; 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") (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 (package (inherit openjpeg) (name "openjpeg") - (replacement #f) (version "1.5.2") (source (origin |