Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e8188006144
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2dc4153633f2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. avahi: apply patches for CVE-2017-6519 & CVE-2018-1000845

    @andir
    andir committed Mar 26, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    87a7622 View commit details

  2. Merge pull request #58406 from andir/avahi 

    avahi: apply patches for CVE-2017-6519 & CVE-2018-1000845
    @flokli
    flokli authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2dc4153 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/development/libraries/avahi/default.nix
11 changes: 9 additions & 2 deletions pkgs/development/libraries/avahi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ])