diff options
author | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
commit | 7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df (patch) | |
tree | 504a250d235a3bc39571e6af1c755077390a371f /gnu/packages/glib.scm | |
parent | f20d1cfb51ed14f325da000406807076323f70bc (diff) | |
parent | b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 (diff) | |
download | guix-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.tar.gz guix-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.zip |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/glib.scm')
-rw-r--r-- | gnu/packages/glib.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 12ba6e939b..94dc6adf6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -88,6 +88,7 @@ (package (name "dbus") (version "1.12.16") + (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -164,6 +165,15 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (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 (package (name "glib") |