From a9a78d8bfbabcd306115684c99d3b2aa8fc75be8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 20 Jun 2019 23:40:52 +0200
Subject: gnu: dbus: Update to 1.12.16.

* gnu/packages/patches/dbus-CVE-2019-12749.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/glib.scm (dbus): Update to 1.12.16.
[replacement]: Remove.
(dbus/fixed): Remove variable.
---
 gnu/packages/glib.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'gnu/packages/glib.scm')

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d93a928c20..9fba2310d6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -82,8 +82,7 @@
 (define dbus
   (package
     (name "dbus")
-    (version "1.12.14")
-    (replacement dbus/fixed)
+    (version "1.12.16")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -91,7 +90,7 @@
                     version ".tar.gz"))
               (sha256
                (base32
-                "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4"))
+                "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"))
               (patches (search-patches "dbus-helper-search-path.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -157,14 +156,6 @@ 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")
-- 
cgit v1.2.3