TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: dbus: Remove replacement.

Browse source 
* gnu/packages/glib.scm (dbus)[replacement]: Remove.
[source]: Add "dbus-CVE-2020-12049.patch".
(dbus/fixed): Remove.
This commit is contained in:
Ludovic Courtès 2020-11-19 22:24:57 +01:00
parent 55d095c653
commit 4078b9acff
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/glib.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -90,7 +90,6 @@ (define dbus
(package (package
(name "dbus") (name "dbus")
(version "1.12.16") (version "1.12.16")
(replacement dbus/fixed)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -99,7 +98,8 @@ (define dbus
(sha256 (sha256
(base32 (base32
"107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl")) "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"))
(patches (search-patches "dbus-helper-search-path.patch")))) (patches (search-patches "dbus-CVE-2020-12049.patch"
"dbus-helper-search-path.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -167,15 +167,6 @@ (define dbus
shared NFS home directories.") shared NFS home directories.")
(license license:gpl2+))) ; or Academic Free License 2.1 (license license:gpl2+))) ; or Academic Free License 2.1
;; Replacement package to fix CVE-2020-12049.
(define dbus/fixed
(package
(inherit dbus)
(source (origin
(inherit (package-source dbus))
(patches (append (search-patches "dbus-CVE-2020-12049.patch")
(origin-patches (package-source dbus))))))))
(define glib (define glib
(package (package
(name "glib") (name "glib")