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

Merge pull request #64744 from risicle/ris-squid-CVE-2019-13345 

squid, squid4: bump/add patch fixing CVE-2019-13345
This commit is contained in:
Michael Raskin 2019-07-15 10:34:54 +00:00 committed by GitHub
parent 07befa1751 5b0db58bc1
commit 5bafda2913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,11 @@
, expat, libxml2, openssl }: , expat, libxml2, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "squid-4.7"; name = "squid-4.8";
src = fetchurl { src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
sha256 = "0kimbvp2mzask9k58va4s829vv3m54fzxrj7ryqshw5bfxgzd752"; sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
}; };
buildInputs = [ buildInputs = [

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

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