Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 78e1f59812b1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 675884ffb1d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 8, 2019

  1. varnish6: add patch for CVE-2019-15892

    @risicle
    risicle committed Nov 8, 2019
    Copy the full SHA
    b795bab View commit details

  2. Merge pull request #73078 from risicle/ris-varnish-CVE-2019-15892-r19.03 

    [r19.03] varnish6: add patch for CVE-2019-15892
    @infinisil
    infinisil authored Nov 8, 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
    675884f View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/servers/varnish/default.nix
11 changes: 9 additions & 2 deletions pkgs/servers/varnish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
{ stdenv, fetchurl, fetchpatch, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
, python2, makeWrapper }:

let
common = { version, sha256, extraBuildInputs ? [] }:
common = { version, sha256, extraBuildInputs ? [], patches ? null }:
stdenv.mkDerivation rec {
inherit patches;
name = "varnish-${version}";

src = fetchurl {
@@ -50,5 +51,11 @@ in
version = "6.1.1";
sha256 = "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0";
extraBuildInputs = [ python2.pkgs.sphinx ];
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/v/varnish/6.1.1-1+deb10u1/debian/patches/CVE-2019-15892.patch";
sha256 = "03jlflgry4j9f34kxni64j6583jqr828zgy68ywdmglpxkgpyma7";
})
];
};
}