From 65e1f477775b552594f946f55533ad16bf88a2c1 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Fri, 3 Feb 2023 21:02:59 +0300
Subject: [PATCH] fixup! squid: update to 5.7, patch for cross-compile

* --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 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

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

* CVE-2018-1000027 was fixed since version 4.0.23.
---
 srcpkgs/squid/patches/001-cross_compile.patch |  9 --------
 srcpkgs/squid/template                        | 21 ++++++-------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/squid/patches/001-cross_compile.patch

diff --git a/srcpkgs/squid/patches/001-cross_compile.patch b/srcpkgs/squid/patches/001-cross_compile.patch
deleted file mode 100644
index 27538b7365..0000000000
--- a/srcpkgs/squid/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-From: https://raw.githubusercontent.com/hongkongkiwi/openwrt-squid/master/patches/001-cross_compile.patch
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
--	$(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
-+	g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
- 
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 3306180dbe..49b9eb9d7b 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -4,7 +4,6 @@ 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
@@ -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
 }
-- 
2.39.1