TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: avahi: Incorporate grafted changes.

Browse source 
* gnu/packages/avahi.scm (avahi)[replacement]: Remove.
[source](patches): Add avahi-CVE-2018-1000845.patch.
[properties]: New field.
(avahi/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2019-12-03 00:40:45 +01:00
parent 6711ad08c7
commit edb8aa3a28
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/avahi.scm
View file

@ -35,7 +35,6 @@ (define-public avahi
(package
(name "avahi")
(version "0.7")
(replacement avahi/fixed)
(home-page "http://avahi.org")
(source (origin
(method url-fetch)
@ -44,7 +43,10 @@ (define-public avahi
(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 @@ (define-public avahi
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")