gnu: gd: Incorporate grafted changes.

* gnu/packages/gd.scm (gd)[replacement]: Remove.
[source](patches): Add gd-CVE-2019-6977.patch and gd-CVE-2019-6978.patch.
(gd/fixed): Remove variable.
master
Marius Bakke 2019-02-23 19:32:16 +01:00
parent 9b070277f9
commit db91596a78
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 11 deletions

View File

@ -39,7 +39,6 @@
(define-public gd
(package
(name "gd")
(replacement gd/fixed)
;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing.
@ -55,6 +54,8 @@
(patches (search-patches "gd-CVE-2018-5711.patch"
"gd-CVE-2018-1000222.patch"
"gd-CVE-2019-6977.patch"
"gd-CVE-2019-6978.patch"
"gd-fix-tests-on-i686.patch"
"gd-freetype-test-failure.patch"))))
(build-system gnu-build-system)
@ -95,16 +96,6 @@ most common applications of GD involve website development.")
"See COPYING file in the distribution."))
(properties '((cpe-name . "libgd")))))
(define-public gd/fixed
(hidden-package
(package
(inherit gd)
(source (origin
(inherit (package-source gd))
(patches (append (origin-patches (package-source gd))
(search-patches "gd-CVE-2019-6977.patch"
"gd-CVE-2019-6978.patch"))))))))
(define-public perl-gd
(package
(name "perl-gd")