amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libgd: Incorporate grafted changes.

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/php.scm
View file

@ -50,16 +50,6 @@
#:use-module (guix build-system gnu)
#: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
(package
(name "php")
@ -312,7 +302,7 @@
("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl)
("freetype" ,freetype)
("gd" ,gd-for-php)
("gd" ,gd)
("gdbm" ,gdbm)
("glibc" ,glibc)
("gmp" ,gmp)