[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/94: gnu: avahi: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
05/94: gnu: avahi: Incorporate grafted changes. |
Date: |
Thu, 5 Dec 2019 12:15:27 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit edb8aa3a28d410ef6fcb9355b57f9be26f87caed
Author: Marius Bakke <address@hidden>
Date: Tue Dec 3 00:40:45 2019 +0100
gnu: avahi: Incorporate grafted changes.
* gnu/packages/avahi.scm (avahi)[replacement]: Remove.
[source](patches): Add avahi-CVE-2018-1000845.patch.
[properties]: New field.
(avahi/fixed): Remove variable.
---
gnu/packages/avahi.scm | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index e84fed6..f82a421 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -35,7 +35,6 @@
(package
(name "avahi")
(version "0.7")
- (replacement avahi/fixed)
(home-page "http://avahi.org")
(source (origin
(method url-fetch)
@@ -44,7 +43,10 @@
(sha256
(base32
"0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"))
- (patches (search-patches "avahi-localstatedir.patch"))))
+ (patches (search-patches "avahi-localstatedir.patch"
+ "avahi-CVE-2018-1000845.patch"))))
+ ;; Hide a duplicate of the CVE fixed above.
+ (properties `((lint-hidden-cve . ("CVE-2017-6519"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-distro=none"
@@ -75,17 +77,6 @@ network. It is an implementation of the mDNS (for
\"Multicast DNS\") and
DNS-SD (for \"DNS-Based Service Discovery\") protocols.")
(license lgpl2.1+)))
-(define avahi/fixed
- (package
- (inherit avahi)
- (source (origin
- (inherit (package-source avahi))
- (patches
- (append (search-patches "avahi-CVE-2018-1000845.patch")
- (origin-patches (package-source avahi))))))
- ;; Hide a duplicate of the CVE fixed above.
- (properties `((lint-hidden-cve . ("CVE-2017-6519"))))))
-
(define-public nss-mdns
(package
(name "nss-mdns")
- branch core-updates updated (60bd56c -> 8c42cee), guix-commits, 2019/12/05
- 02/94: gnu: libjpeg-turbo: Remove graft for 2.0.3., guix-commits, 2019/12/05
- 04/94: gnu: fribidi: Remove defunct replacement., guix-commits, 2019/12/05
- 03/94: gnu: perl: Remove obsolete workaround., guix-commits, 2019/12/05
- 08/94: gnu: nghttp2: Update to 1.40.0., guix-commits, 2019/12/05
- 05/94: gnu: avahi: Incorporate grafted changes.,
guix-commits <=
- 10/94: gnu: OpenSSL: Incorporate grafted changes., guix-commits, 2019/12/05
- 19/94: gnu: libtiff: Update to 4.1.0., guix-commits, 2019/12/05
- 09/94: gnu: curl: Update to 7.67.0., guix-commits, 2019/12/05
- 12/94: gnu: ghostscript: Update to 9.50., guix-commits, 2019/12/05
- 25/94: gnu: sqlite: Update to 3.30.1., guix-commits, 2019/12/05
- 28/94: gnu: libtasn1: Update to 4.15.0., guix-commits, 2019/12/05
- 39/94: gnu: python-fonttools: Update to 4.2.0., guix-commits, 2019/12/05
- 49/94: gnu: libxcomposite: Do not build static libraries., guix-commits, 2019/12/05
- 41/94: gnu: harfbuzz: Update to 2.6.4., guix-commits, 2019/12/05
- 54/94: gnu: libxpm: Do not build static libraries., guix-commits, 2019/12/05