diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-22 14:32:52 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-22 14:41:07 +0100 |
| commit | ec3598087d68376aa2aee7c8f1ac27c5e72898a8 (patch) | |
| tree | 2c7613d22bd4e60c1f97cc3687b42ff2371b4dc8 /pkgs/servers/squid | |
| parent | 20af37e30080abbafb6c07f697bbb983c70cb32a (diff) | |
| download | nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar.gz nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar.bz2 nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar.lz nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar.xz nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.tar.zst nixpkgs-ec3598087d68376aa2aee7c8f1ac27c5e72898a8.zip | |
squid: 3.5.27 -> 3.5.28
Diffstat (limited to 'pkgs/servers/squid')
| -rw-r--r-- | pkgs/servers/squid/default.nix | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 8d39fbbcef4..2fdbc29caed 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,31 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap +{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-3.5.27"; + name = "squid-3.5.28"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz"; - sha256 = "1v7hzvwwghrs751iag90z8909nvyp3c5jynaz4hmjqywy9kl7nsx"; + sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx"; }; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; - patches = [ - (fetchpatch { - name = "CVE-2018-1000024.patch"; - url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch; - sha256 = "0vzxr4rmybz0w4c1hi3szvqawbzl4r4b8wyvq9vgq1mzkk5invpg"; - }) - (fetchpatch { - name = "CVE-2018-1000027.patch"; - url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch; - sha256 = "1a8hwk9z7h1j0c57anfzp3bwjd4pjbyh8aks4ca79nwz4d0y6wf3"; - }) - ]; - configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" |