;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
- #:use-module (gnu packages databases)
+ #:use-module (gnu packages dbm)
#:use-module (gnu packages libdaemon)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
(package
(name "avahi")
(version "0.7")
- (home-page "http://avahi.org")
+ (home-page "https://avahi.org")
(source (origin
(method url-fetch)
(uri (string-append home-page "/download/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"
(define-public nss-mdns
(package
(name "nss-mdns")
- (version "0.11")
+ (version "0.14.1")
+ (home-page "https://github.com/lathiat/nss-mdns")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/lathiat/nss-mdns"
- "/releases/download/v" version "/"
+ (uri (string-append home-page "/releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
- "14jwy6mklzgjz3mfmw67mxhszrw9d3d3yjjhg87j4crci6m19i39"))))
+ "134wdr0n9cm5ab4g6dwq76lvzqns9dcylr470i2xxjimnw0l22d2"))))
(build-system gnu-build-system)
(arguments
- ;; The Avahi daemon socket is expected by src/Makefile.am to be at
- ;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir)
- ;; appropriately.
- '(#:configure-flags '("--localstatedir=/var")))
- (home-page "https://github.com/lathiat/nss-mdns")
+ ;; The Avahi daemon socket is expected by 'configure.ac' to be at
+ ;; "$(localstatedir)/run/avahi-daemon/socket", but nowadays it lives in
+ ;; /run/avahi-daemon/socket. Remove the "$(localstatedir)" bit.
+ '(#:configure-flags '("AVAHI_SOCKET=/run/avahi-daemon/socket")))
(synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in")
(description
"Nss-mdns is a plug-in for the GNU C Library's Name Service Switch