jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32061 from volth/patch-72

Browse Source 
varnish: 5.1.3 -> 5.2.1 [fixes CVE-2017-8807]
This commit is contained in:
Joachim F 2018-02-20 19:23:36 +00:00 committed by GitHub
commit eb39de0a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/varnish/default.nix
View File

@ -2,12 +2,12 @@
, python, pythonPackages, makeWrapper }:
stdenv.mkDerivation rec {
version = "5.1.3";
version = "5.2.1";
name = "varnish-${version}";
src = fetchurl {
url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
sha256 = "0km50hzjzi1kq85lr3hq519nrp261wb91ixq48vhyd41llycjfbl";
url = "http://varnish-cache.org/_downloads/${name}.tgz";
sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
};
nativeBuildInputs = [ pkgconfig ];
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://www.varnish-cache.org;
license = licenses.bsd2;
maintainers = with maintainers; [ garbas fpletz ];
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.unix;
};
}

6
pkgs/servers/varnish/modules.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils, removeReferencesTo }:
stdenv.mkDerivation rec {
version = "0.10.2";
@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im";
};
nativeBuildInputs = [ pkgconfig docutils ];
nativeBuildInputs = [ pkgconfig docutils removeReferencesTo ];
buildInputs = [ varnish python ];
postInstall = "find $out -type f -exec remove-references-to -t ${varnish.dev} '{}' +"; # varnish.dev captured only as __FILE__ in assert messages
meta = with stdenv.lib; {
description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
homepage = https://github.com/varnish/varnish-modules;

1
pkgs/servers/varnish/rtstatus.nix
View File

@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
description = "Varnish realtime status page";
homepage = https://github.com/varnish/libvmod-rtstatus;
inherit (varnish.meta) license platforms maintainers;
broken = true; # it has not ported to varnish 5.2 yet (5.1 is ok)
};
}