me
/
guix
Archived
1
0
Fork 0
Code

gnu: json-c: Fix CVE-2020-12762. 

* gnu/packages/web.scm (json-c)[replacement]: New field.
(json-c-0.13, json-c-0.12)[source]: Add patch.
(json-c/fixed): New variable.
* gnu/packages/patches/json-c-CVE-2020-12762.patch,
gnu/packages/patches/json-c--0.13-CVE-2020-12762.patch,
gnu/packages/patches/json-c--0.12-CVE-2020-12762.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register them.
master
Efraim Flashner 2020-08-06 09:43:40 +03:00
parent 7941e05947
commit 10b4048974
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
5 changed files with 613 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/local.mk
View File

@ -1137,6 +1137,9 @@ dist_patch_DATA = \
%D%/packages/patches/iputils-libcap-compat.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/json-c-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
%D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \
%D%/packages/patches/jamvm-arm.patch \

175
gnu/packages/patches/json-c-0.12-CVE-2020-12762.patch 100644
View File

File diff suppressed because one or more lines are too long

230
gnu/packages/patches/json-c-0.13-CVE-2020-12762.patch 100644
View File

File diff suppressed because one or more lines are too long

193
gnu/packages/patches/json-c-CVE-2020-12762.patch 100644
View File

File diff suppressed because one or more lines are too long

12
gnu/packages/web.scm
View File

@ -770,6 +770,7 @@ data.")
(define-public json-c
(package
(replacement json-c/fixed)
(name "json-c")
(version "0.14")
(source (origin
@ -790,6 +791,15 @@ parse JSON-formatted strings back into the C representation of JSON objects.
It aims to conform to RFC 7159.")
(license license:x11)))
(define json-c/fixed
(package
(inherit json-c)
(name "json-c")
(version "0.14")
(source (origin
(inherit (package-source json-c))
(patches (search-patches "json-c-CVE-2020-12762.patch"))))))
;; TODO: Remove these old versions when all dependents have been updated.
(define-public json-c-0.13
(package
@ -802,6 +812,7 @@ It aims to conform to RFC 7159.")
version ".tar.gz"))
(sha256
(base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
(patches (search-patches "json-c-0.13-CVE-2020-12762.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -824,6 +835,7 @@ It aims to conform to RFC 7159.")
version ".tar.gz"))
(sha256
(base32 "08qibrq29a5v7g23wi5icy6l4fbfw90h9ccps6vq0bcklx8n84ra"))
(patches (search-patches "json-c-0.12-CVE-2020-12762.patch"))
(modules '((guix build utils)))
(snippet
'(begin