[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: gnu: dbus: Remove replacement.
From: |
guix-commits |
Subject: |
04/04: gnu: dbus: Remove replacement. |
Date: |
Thu, 19 Nov 2020 16:37:05 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 4078b9acffa7e6e119bd3cd8dea720d1ae807dfb
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Nov 19 22:24:57 2020 +0100
gnu: dbus: Remove replacement.
* gnu/packages/glib.scm (dbus)[replacement]: Remove.
[source]: Add "dbus-CVE-2020-12049.patch".
(dbus/fixed): Remove.
---
gnu/packages/glib.scm | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 845ab09..3f5dd93 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1,5 +1,5 @@
;;; 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 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
@@ -90,7 +90,6 @@
(package
(name "dbus")
(version "1.12.16")
- (replacement dbus/fixed)
(source (origin
(method url-fetch)
(uri (string-append
@@ -99,7 +98,8 @@
(sha256
(base32
"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)
(arguments
'(#:configure-flags
@@ -167,15 +167,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
-;; 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")