Merge pull request #58406 from andir/avahi

avahi: apply patches for CVE-2017-6519 & CVE-2018-1000845
This commit is contained in:
Florian Klink 2019-03-27 00:03:36 +01:00 committed by GitHub
commit 2dc4153633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, gtk3Support ? false, gtk3 ? null
, qt4 ? null
@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap";
};
patches = [ ./no-mkdir-localstatedir.patch ];
patches = [
./no-mkdir-localstatedir.patch
(fetchpatch {
name ="CVE-2017-6519-CVE-2018-100084.patch";
url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch;
sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q";
})
];
buildInputs = [ libdaemon dbus glib expat libiconv ]
++ (with perlPackages; [ perl XMLParser ])