squid: remove v3, default to v4

This commit is contained in:
Robin Gloster
2019-08-22 00:39:52 +02:00
parent a3251aa644
commit 948b3e34a5
5 changed files with 15 additions and 53 deletions
+9 -13
View File
@@ -1,26 +1,22 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl, fetchpatch }:
, expat, libxml2, openssl }:
stdenv.mkDerivation rec {
name = "squid-3.5.28";
name = "squid-4.8";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx";
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
};
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 ];
prePatch = ''
substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2"
'';
configureFlags = [
"--enable-ipv6"
"--disable-strict-error-checking"
@@ -38,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://www.squid-cache.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz raskin ];
};
}