From 82647849a1d338d8e85c284c1c8a6a5f142ab58b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH] squid: update to 5.7

* --sbindir is already defined in
  common/environment/configure/gnu-configure-args.sh

* --enable-useragent-log and --enable-referer-log are obsolete since
  version 3.2.0.4.

* --enable-arp-acl is gone
  (squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).

* --enable-carp is gone, CARP is compiled in
  (squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).

* --enable-truncate was removed upstream
  (squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).

* squid_cv_gnu_atomics is replaced with c++11 std::atomic
  (squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).

* squid_opt_enable_large_files is the duplicate of --with-large-files.
  Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
  cross build for arm* and glibc. Now that squid builds completely fine
  without it, it is safe to assume this option is not needed anymore.

* define BUILDCXX properly (CXX_host cannot be set outside of
  functions).

* CVE-2018-1000027 was fixed since version 4.0.23.
---
 srcpkgs/squid/template | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
 # Template file for 'squid'
 pkgname=squid
-version=5.3
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="
- --sbindir=/usr/bin
  --sysconfdir=/etc/squid
  --libexecdir=/usr/libexec/squid
  --datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
  --enable-icmp
  --enable-linux-netfilter
  --enable-ident-lookups
- --enable-useragent-log
  --enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
  --enable-htcp
- --enable-carp
  --enable-epoll
  --with-large-files
- --enable-arp-acl
  --with-default-user=squid
  --enable-async-io
- --enable-truncate
  --enable-icap-client
  --enable-ssl-crtd
  --disable-arch-native
  --disable-strict-error-checking
  --enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
 conf_files="/etc/squid/squid.conf
  /etc/squid/errorpage.css
  /etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.squid-cache.org/"
 changelog="http://www.squid-cache.org/Versions/v5/changesets/"
 distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
 system_accounts="squid"
 # squid-conf-tests requires a squid user in the system
 make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+pre_configure() {
+	export BUILDCXX="${CXX_host}"
+	export BUILDCXXFLAGS="-O2"
+}
+
 post_install() {
 	chmod u+s \
 		${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
 		${DESTDIR}/usr/libexec/squid/pinger
 	vsv squid
 	vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
-	# CVE-2018-1000027
-	echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
 }