diff --git a/harden_squid.service.patch b/harden_squid.service.patch index 8ef276e..a08ad80 100644 --- a/harden_squid.service.patch +++ b/harden_squid.service.patch @@ -1,7 +1,7 @@ -Index: squid-5.3/tools/systemd/squid.service +Index: squid-6.2/tools/systemd/squid.service =================================================================== ---- squid-5.3.orig/tools/systemd/squid.service -+++ squid-5.3/tools/systemd/squid.service +--- squid-6.2.orig/tools/systemd/squid.service ++++ squid-6.2/tools/systemd/squid.service @@ -11,6 +11,18 @@ Documentation=man:squid(8) After=network.target network-online.target nss-lookup.target diff --git a/missing_installs.patch b/missing_installs.patch index c300944..f453c6f 100644 --- a/missing_installs.patch +++ b/missing_installs.patch @@ -1,7 +1,7 @@ -Index: squid-4.0.22/src/acl/external/kerberos_ldap_group/Makefile.am +Index: squid-6.2/src/acl/external/kerberos_ldap_group/Makefile.am =================================================================== ---- squid-4.0.22.orig/src/acl/external/kerberos_ldap_group/Makefile.am -+++ squid-4.0.22/src/acl/external/kerberos_ldap_group/Makefile.am +--- squid-6.2.orig/src/acl/external/kerberos_ldap_group/Makefile.am ++++ squid-6.2/src/acl/external/kerberos_ldap_group/Makefile.am @@ -15,9 +15,11 @@ EXTRA_DIST= \ AM_CPPFLAGS += -I$(srcdir) diff --git a/squid-5.9.tar.xz b/squid-5.9.tar.xz deleted file mode 100644 index a4f98ff..0000000 --- a/squid-5.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fe5c2007da2757446af91b6ef974f154b208120a9a39396ea681e5c4abb04b5 -size 2569204 diff --git a/squid-5.9.tar.xz.asc b/squid-5.9.tar.xz.asc deleted file mode 100644 index c9f5881..0000000 --- a/squid-5.9.tar.xz.asc +++ /dev/null @@ -1,25 +0,0 @@ -File: squid-5.9.tar.xz -Date: Sun 30 Apr 2023 22:43:48 UTC -Size: 2569204 -MD5 : 35ee1d71091ce0603705b1a7475d96ae -SHA1: 38a723c3ef8776ef3c880772d85020af8b345a84 -Key : CD6DBF8EF3B17D3E - B068 84ED B779 C89B 044E 64E3 CD6D BF8E F3B1 7D3E - keyring = http://www.squid-cache.org/pgp.asc - keyserver = pool.sks-keyservers.net ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmRO7zIACgkQzW2/jvOx -fT7wZg/+KLiRSfRUQ4U5W2FhoscUaBGEZsAe7IcvPh9zPhXidxgxggJz1TyYL3VB -9aKKmzdDM/gmtxmXaZS0Saf2CpuJtbLLIjsj9v/uUL1LCguH8oBaE/kmW7CFYv9c -JzZc+xh+ILbT8PUPJRd2AtNpDVb9dJxytYdZlm8ZDz3rrV8lxjB+hRcwBTkD/A40 -DZm6KzYe+3LkaaLMFN+frKXN8DiOuwJOAe0Ap2zs1xsjPrM0ohqbHsGZJtaobVs6 -I2ikjRKNaZ73wjckf8FWDgH1KsMiVZ3+ajKYxX7vraESmNG8oyhREP/+PentSqfU -8zxq+zMi1Ere510ZrlfWAxenSRQXYi9QsC/9JQO18ZooKWUQuqLq9ssQiNONxfdm -NWzPBWFmx8jS9QwYk0/WZCZKV3uR1ziTatzPbG+BaRYxSmTlKGS9cVapGLxsj1Py -8ohx4R6Dt3b11U+xSmlkxjyQOW6LQ3u7e1JuYRtxK8FkdFF+rxpWxkGXlIbkw3aA -GmnZ58VjiaZvaR53H5leGfX+0+nPi/XijgoB02YamMbrOX+On2+jzwPGhi95hZLq -dGcu6zwzkidkUZFIF7CMMKXQzmdo74sW5Zj8eH+BDMUbMUsAt6dwUuuUO/cWpNNM -XsRc8CODrYupPpqYJJqH3yXg5ppZ7C7uahbws3La0p7KvbknoN8= -=kcbO ------END PGP SIGNATURE----- diff --git a/squid-6.2.tar.xz b/squid-6.2.tar.xz new file mode 100644 index 0000000..c4c6f8f --- /dev/null +++ b/squid-6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd759e151e997d31786d91743d327b1b4b532f1caea66bf81100ec8ba04ec4c1 +size 2546172 diff --git a/squid-6.2.tar.xz.asc b/squid-6.2.tar.xz.asc new file mode 100644 index 0000000..40009ba --- /dev/null +++ b/squid-6.2.tar.xz.asc @@ -0,0 +1,25 @@ +File: squid-6.2.tar.xz +Date: Mon 07 Aug 2023 03:36:31 UTC +Size: 2546172 +MD5 : ad01b7d82b6a00ffd8cd39b97113d05a +SHA1: 29ddb4c522a36f1270e7cfa66f0dec8805fd2b57 +Key : CD6DBF8EF3B17D3E + B068 84ED B779 C89B 044E 64E3 CD6D BF8E F3B1 7D3E + keyring = http://www.squid-cache.org/pgp.asc + keyserver = pool.sks-keyservers.net +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmTQZsYACgkQzW2/jvOx +fT6kEQ/+N94WNaei1gToVg0wsQb3CnCzAN1kA0ohjE9G3Dq1sRIujncuYvvS7RU9 +yCR1xrKlaBA7MUx4AxEQ++PZtvPHLmVtKOgNzGEhOnFLAZmxHNnEFFYZo+CXUY/v +FPCHp0UpLm4ajgLsZtmqcpadBe4PWm7U4JddCnrZvvqwwPbqkk6b8kMs21T6eaZ7 +DsEkfaj6LhMMYB/9OhjNSS4vmDm7slOM1Knh3LlaEpvqVZw/lAn/vOS2L/FNc0/x +7uwPsrqggp2IHaGBDkWcwRtVHp2I4dylIh47c1EQULSiZORzpOgTWIaT7gw4jpJF +79/7Qw2stkV1i1V7Aka5bg4ZsEuhPfjfel0KpJsr6EnZO84Fk8ew1vLksKLfTb86 +XKGQIeUeM533IATI9WBWnH+Dt3J+1hP8eyW20zksIJ1NPayiw/rPEiAh2qNrUOM1 +xlJB2VTWmUkessWXHRlXgXiCZs5nh9YY2qxDQEUOd0c5QiEj9eHQ9MwARFZaDRIc +1s/1Y7DDdTyxa2u0PJ+12Tcva8jQqT6HtHfYkyu9n77WH2ordKWffrR0lOOwHsZx +Hchf+QDsI2+GV4RmJSgeXapNPYRd6Clu7UsDz5AaoKB/3VAnqkEqXgC9zR6ss3l5 +1JhUHC7OYs3YjMCWBZd21pKC1AaAp1j5reNYpmoxvwyZBgwN1vs= +=96zX +-----END PGP SIGNATURE----- diff --git a/squid.changes b/squid.changes index e17a70a..0180f98 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Aug 9 07:48:25 UTC 2023 - Paolo Stivanin + +- update to 6.2: + * Major UI changes: + - Remove 8K limit for single access.log line + - Add tls_key_log to report TLS communication secrets + * Minor UI changes: + - Add %transport::>connection_id logformat code + - Add paranoid_hit_validation directive + - Report SMP store queues state (mgr:store_queues) + - Addcache_log_message directive + * Developer Interest changes: + - Replaced X-Cache and X-Cache-Lookup headers with Cache-Status + - Reject HTTP/1.0 requests with unusual framing + - codespell check added to source maintenance enforcement + - Streamlined ./configure handling of optional libraries + - Add –progress option to test-builds.sh + - Remove layer-00-bootstrap from test script + - Convert LRU map into a CLP map + - Remove legacy context-based debugging in favor of CodeContext + * Removed features: + - Remove unused cache_diff binary + - Remove obsolete membanger test + - Remove deprecated leakfinder (–enable-leakfinder) + ------------------------------------------------------------------- Tue May 9 14:32:34 UTC 2023 - Adam Majer diff --git a/squid.spec b/squid.spec index 882fb16..ddcf5ba 100644 --- a/squid.spec +++ b/squid.spec @@ -24,14 +24,14 @@ %define squidhelperdir %{_sbindir} %endif Name: squid -Version: 5.9 +Version: 6.2 Release: 0 Summary: Caching and forwarding HTTP web proxy License: GPL-2.0-or-later Group: Productivity/Networking/Web/Proxy URL: http://www.squid-cache.org -Source0: http://www.squid-cache.org/Versions/v5/squid-%{version}.tar.xz -Source1: http://www.squid-cache.org/Versions/v5/squid-%{version}.tar.xz.asc +Source0: http://www.squid-cache.org/Versions/v6/squid-%{version}.tar.xz +Source1: http://www.squid-cache.org/Versions/v6/squid-%{version}.tar.xz.asc Source5: pam.squid Source6: unsquid.pl Source7: %{name}.logrotate @@ -50,7 +50,11 @@ Patch3: harden_squid.service.patch BuildRequires: cppunit-devel BuildRequires: expat BuildRequires: fdupes +%if 0%{?suse_version} < 1590 +BuildRequires: gcc11-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: libcap-devel BuildRequires: libtool BuildRequires: openldap2-devel @@ -113,6 +117,10 @@ cd libltdl; autoreconf -fi; cd .. export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie" +%if 0%{?suse_version} < 1590 +export CC=gcc-11 +export CXX=g++-11 +%endif %configure \ --disable-strict-error-checking \ --sysconfdir=%{squidconfdir} \