From be91f50ca9aca949eeb3e139b2c1ec31922d73b6 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 12:56:28 +0000
Subject: [PATCH 1/3] squid: 3.5.15 -> 3.5.17 (resolving CVE-2016-3947,
 CVE-2016-3948, CVE-2016-4051, CVE-2016-4052, CVE-2016-4053, CVE-2016-4054)

squid supplies patches for advisories, but patches for the above advisories applied together don't compile, hence the version bump for stable
---
 pkgs/servers/squid/squids.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 9bcacd351f48..5c5a74be0038 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -51,10 +51,10 @@ rec {
   };
 
   squid35 = squid30.merge rec {
-    name = "squid-3.5.15";
+    name = "squid-3.5.17";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
-      sha256 = "1cgy6ffyarqd35plqmqi3mrsp0941c6n55pr3zavp07ksj46wgzm";
+      sha256 = "1kdq778cm18ak4624gchmbi8avnzyvwgyzjplkd0fkcrgfs44bsf";
     };
     buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
       libtool openssl];

From 453dcfdb24cb5ceac0859b22e85679d8745524ed Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 16:09:40 +0000
Subject: [PATCH 2/3] squid: 3.4.11 -> 3.4.14 (though many CVEs still have no
 fix on this branch!)

---
 pkgs/servers/squid/squids.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 5c5a74be0038..8ec0bf667d3a 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -40,10 +40,10 @@ rec {
   };
 
   squid34 = squid30.merge rec {
-    name = "squid-3.4.11";
+    name = "squid-3.4.14";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.4/${name}.tar.bz2";
-      sha256 = "0p9dbsz541cpcc88albwpgq15jgpczv12j9b9g5xw6d3i977qm1h";
+      sha256 = "13y446s3nzaxzimqsqranhw9k891kr4v2hhddkxla61ag7pkjr9n";
     };
     buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
       libtool openssl];

From 844f4e31e11fceda461b9b6254d71802f64e6e91 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 16:40:43 +0000
Subject: [PATCH 3/3] squid: 3.2.13 -> 3.2.14 (though many CVEs still have no
 fix on this branch!)

---
 pkgs/servers/squid/squids.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 8ec0bf667d3a..237e5373759f 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -30,10 +30,10 @@ rec {
   };
 
   squid32 = squid30.merge rec {
-    name = "squid-3.2.13";
+    name = "squid-3.2.14";
     src = args.fetchurl {
       url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
-      sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
+      sha256 = "12azbnsq4gkhdaqm0swd2046hbi44max3l7kl2p1dv3mvy5csn60";
     };
     buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
       libtool openssl];