nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64745 from risicle/ris-squid-CVE-2019-13345-r19.03

Browse Source 
[r19.03] squid, squid4: add patches fixing CVE-2019-13345
This commit is contained in:
Michael Raskin
2019-07-15 10:35:14 +00:00
committed by GitHub
parent f4fcdac99f db682731bc
commit 0d0cb247ff
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/squid/4.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl }:
, expat, libxml2, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "squid-4.4";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "10pfx44mps5ng1806rqdwx8jv8b2n25kjvx37dcd4x2mgzdfc1a9";
};
patches = [
(fetchpatch {
name = "4.x-CVE-2019-13345.patch";
url = "https://github.com/squid-cache/squid/commit/be1dc8614e7514103ba84d4067ed6fd15ab8f82e.patch";
sha256 = "0vqbnkib695xk5cvldrh993k8387rpghxw3x94la8mq3w7lga9m3";
})
];
buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];

10
pkgs/servers/squid/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl }:
, expat, libxml2, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "squid-3.5.28";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx";
};
patches = [
(fetchpatch {
name = "3.5-CVE-2019-13345.patch";
url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch";
sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3";
})
];
buildInputs = [
perl openldap db cyrus_sasl expat libxml2 openssl
] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ];