BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

squid: remove v3, default to v4

Browse source
This commit is contained in:
Robin Gloster 2019-08-22 00:39:52 +02:00
parent a3251aa644
commit 948b3e34a5
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
5 changed files with 15 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-1909.xml
View file

@ -279,6 +279,11 @@
The <option>services.mantisbt</option> module has been removed from nixpkgs due to lack of maintainer.
</para>
</listitem>
<listitem>
<para>
Squid 3 has been removed and the <option>squid</option> derivation now refers to Squid 4.
</para>
</listitem>
</itemizedlist>
</section>

39
pkgs/servers/squid/4.nix
View file

@ -1,39 +0,0 @@
{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
, expat, libxml2, openssl }:
stdenv.mkDerivation rec {
name = "squid-4.8";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
};
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"
"--disable-arch-native"
"--with-openssl"
"--enable-ssl-crtd"
"--enable-storeio=ufs,aufs,diskd,rock"
"--enable-removal-policies=lru,heap"
"--enable-delay-pools"
"--enable-x-accelerator-vary"
] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter";
meta = with stdenv.lib; {
description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
homepage = http://www.squid-cache.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz raskin ];
};
}

22
pkgs/servers/squid/default.nix
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 ];
};
}

1
pkgs/top-level/aliases.nix
View file

@ -331,6 +331,7 @@ mapAliases ({
spice_protocol = spice-protocol; # added 2018-02-25
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
sqliteInteractive = sqlite-interactive; # added 2014-12-06
squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02

1
pkgs/top-level/all-packages.nix
View file

@ -15154,7 +15154,6 @@ in
spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
squid = callPackage ../servers/squid { };
squid4 = callPackage ../servers/squid/4.nix { };
sslh = callPackage ../servers/sslh { };