gnu: libgd: Incorporate grafted changes.

* gnu/packages/gd.scm (gd)[replacement]: Remove field.
[source](patches): Add "gd-CVE-2018-5711.patch" and
"gd-CVE-2018-1000222.patch".
(gd/fixed): Remove variable.
* gnu/packages/php.scm (gd-for-php): Remove variable.
(php)[inputs]: Change GD-FOR-PHP to GD.
This commit is contained in:
Marius Bakke 2018-09-10 01:30:06 +02:00
parent fe79ce3b1f
commit 68a08dfbe5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 5 additions and 23 deletions

View file

@ -39,7 +39,6 @@ (define-module (gnu packages gd)
(define-public gd (define-public gd
(package (package
(name "gd") (name "gd")
(replacement gd/fixed)
;; Note: With libgd.org now pointing to github.com, genuine old ;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are ;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing. ;; missing.
@ -52,7 +51,10 @@ (define-public gd
(sha256 (sha256
(base32 (base32
"0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c")) "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"))
(patches (search-patches "gd-fix-tests-on-i686.patch"
(patches (search-patches "gd-CVE-2018-5711.patch"
"gd-CVE-2018-1000222.patch"
"gd-fix-tests-on-i686.patch"
"gd-freetype-test-failure.patch")))) "gd-freetype-test-failure.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -92,16 +94,6 @@ (define-public gd
"See COPYING file in the distribution.")) "See COPYING file in the distribution."))
(properties '((cpe-name . "libgd"))))) (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-2018-5711.patch"
"gd-CVE-2018-1000222.patch"))))))))
(define-public perl-gd (define-public perl-gd
(package (package
(name "perl-gd") (name "perl-gd")

View file

@ -50,16 +50,6 @@ (define-module (gnu packages php)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)) #:use-module ((guix licenses) #:prefix license:))
(define gd-for-php
(package
(inherit gd)
(source (origin
(inherit (package-source gd))
(patches (search-patches "gd-fix-tests-on-i686.patch"
"gd-freetype-test-failure.patch"
"gd-CVE-2018-5711.patch"
"gd-CVE-2018-1000222.patch"))))))
(define-public php (define-public php
(package (package
(name "php") (name "php")
@ -312,7 +302,7 @@ (define-public php
("curl" ,curl) ("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("freetype" ,freetype) ("freetype" ,freetype)
("gd" ,gd-for-php) ("gd" ,gd)
("gdbm" ,gdbm) ("gdbm" ,gdbm)
("glibc" ,glibc) ("glibc" ,glibc)
("gmp" ,gmp) ("gmp" ,gmp)