diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
| commit | 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09 (patch) | |
| tree | c2c35f733d250f86eb052d174fcb1c24a54fea79 /gnu/packages/glib.scm | |
| parent | 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 (diff) | |
| parent | 010689e7067df1288af29176f4a8639de816b1ef (diff) | |
| download | guix-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b2d4bf5554..d93a928c20 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -83,6 +83,7 @@ (package (name "dbus") (version "1.12.14") + (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -156,6 +157,14 @@ 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 +(define dbus/fixed + (package + (inherit dbus) + (source (origin + (inherit (package-source dbus)) + (patches (append (search-patches "dbus-CVE-2019-12749.patch") + (origin-patches (package-source dbus)))))))) + (define glib (package (name "glib") @@ -492,7 +501,7 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.1") + (version "2.10.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsigc++/" @@ -500,7 +509,7 @@ by GDBus included in Glib.") name "-" version ".tar.xz")) (sha256 (base32 - "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9")))) + "163s14d1rqp82gc1vsm3q0wzsbdicb9q6307kz0zk5lm6x9h5jmi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("m4" ,m4))) |