diff options
| author | Ludovic Courtès <[email protected]> | 2019-10-08 11:23:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2019-10-08 11:37:07 +0200 |
| commit | cf3d1763ede1a329c2bc932c84591ab594bb6c96 (patch) | |
| tree | 665f92418f8671474de3815241fb657384463c94 /gnu/packages/gd.scm | |
| parent | d57660c54907cc6fba8b0adf6295fd2311ada6cf (diff) | |
| parent | 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/gd.scm')
| -rw-r--r-- | gnu/packages/gd.scm | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index a1593827a0..5b3f8509f8 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -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") |