From 9181c55aba8f8a9c3a9cafaefd34ea63d41e2893 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Wed, 9 Jan 2019 13:49:19 +0100
Subject: [PATCH] squid: update to 4.5.

---
 srcpkgs/squid/patches/libressl-2.8.patch | 11 -----------
 srcpkgs/squid/template                   | 17 +++++++++--------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/squid/patches/libressl-2.8.patch

diff --git a/srcpkgs/squid/patches/libressl-2.8.patch b/srcpkgs/squid/patches/libressl-2.8.patch
deleted file mode 100644
index d363165ff7b..00000000000
--- a/srcpkgs/squid/patches/libressl-2.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ssl/support.cc.orig     2018-10-28 19:06:18.053009068 +0100
-+++ src/ssl/support.cc  2018-10-28 19:06:57.711630200 +0100
-@@ -2159,7 +2159,7 @@
- }
-
- static SSL_SESSION *
--get_session_cb(SSL *, unsigned char *sessionID, int len, int *copy)
-+get_session_cb(SSL *, const unsigned char *sessionID, int len, int *copy)
- {
-     if (!SslSessionCache)
-         return NULL;
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 639eb394d24..ee32c3da5dc 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
-version=3.5.27
-revision=5
+version=4.5
+revision=1
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin
@@ -16,8 +16,9 @@ configure_args="
  --enable-auth-ntlm
  --enable-auth-digest
  --enable-auth-negotiate
+ --enable-esi
  --enable-removal-policies=lru,heap
- --enable-storeio=aufs,ufs,diskd
+ --enable-storeio=aufs,ufs,diskd,rock
  --enable-delay-pools
  --enable-arp-acl
  --with-openssl=${XBPS_CROSS_BASE}/usr
@@ -43,29 +44,29 @@ configure_args="
  --disable-strict-error-checking
  --enable-wccpv2
  --with-build-environment=default
- --disable-esi # CVE-2018-1172 CVE-2018-1000024
  squid_cv_gnu_atomics=yes
  squid_opt_enable_large_files=yes
- BUILDCXX=g++
+ BUILDCXX=${CXX_host}
  BUILDCXXFLAGS=-O2"
 conf_files="/etc/squid/squid.conf
  /etc/squid/errorpage.css
  /etc/squid/cachemgr.conf
  /etc/squid/mime.conf"
-system_accounts="squid"
 make_dirs="/var/log/squid 750 squid squid
  /var/cache/squid 750 squid squid"
 hostmakedepends="perl pkg-config"
 makedepends="libldap-devel libnetfilter_conntrack-devel pam-devel
- libcap-devel libltdl-devel"
+ libcap-devel libltdl-devel libxml2-devel"
 depends="perl"
+checkdepends="cppunit-devel"
 short_desc="Caching proxy for the Web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 #changelog="http://www.squid-cache.org/Versions/v3/3.5/changesets/"
 distfiles="ftp://ftp.fu-berlin.de/unix/www/${pkgname}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5ddb4367f2dc635921f9ca7a59d8b87edb0412fa203d1543393ac3c7f9fef0ec
+checksum=553edf76d6ee9a1627af9c2be7be850c14cd6836170b3d6c1393fd700d44ccc5
+system_accounts="squid"
 
 post_install() {
 	chmod u+s \