import squid-5.2-1.el9

This commit is contained in:
CentOS Sources 2021-12-07 13:06:40 -05:00 committed by Stepan Oksanichenko
parent d4bc9a5d57
commit eddadbcff3
6 changed files with 65 additions and 32 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/pgp.asc SOURCES/pgp.asc
SOURCES/squid-5.1.tar.xz SOURCES/squid-5.2.tar.xz

View File

@ -1,2 +1,2 @@
8e3de63f3bef0c9c4edbcfe000c567119f687143 SOURCES/pgp.asc 8e3de63f3bef0c9c4edbcfe000c567119f687143 SOURCES/pgp.asc
97f65e7f92cfb373bd270c9f30c0a6474cd5454b SOURCES/squid-5.1.tar.xz 0568a55c8bf20fbcbfadf126347f3e790945e5d2 SOURCES/squid-5.2.tar.xz

View File

@ -0,0 +1,24 @@
diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index 0564380..fcd60b9 100644
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -102,6 +102,8 @@ void commonInit()
if (inited)
return;
+ inited = true;
+
Mem::Init();
Config.Store.avgObjectSize = 1024;
@@ -109,6 +111,10 @@ void commonInit()
Config.Store.objectsPerBucket = 20;
Config.Store.maxObjectSize = 2048;
+
+ Config.memShared.defaultTo(false);
+
+ Config.store_dir_select_algorithm = xstrdup("round-robin");
}
/* TODO make this a cbdata class */

View File

@ -1,25 +0,0 @@
File: squid-5.1.tar.xz
Date: Sat 31 Jul 2021 09:27:16 UTC
Size: 2544776
MD5 : 17be9709b54fe0146452113404be7b54
SHA1: 97f65e7f92cfb373bd270c9f30c0a6474cd5454b
Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
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/jvOxfT4FAmEFF3wACgkQzW2/jvOx
fT5O+g//XC+Um5NXJluvCpM2uPqoNN8oyFSgnE4GweeR/LdheKP1pmoLigKZMzfa
6x4tAtgOtXp0DQmxboWqD14Qb17x16dtsZioe+uUUMnKw+Kx1GOwJp02oxS5zKNL
1/eWqFt5rZUHuDdbP6BGosmob0fECUCny+sKuJ7P8v3o1qFK/7OJU3yYFQQSqpMg
jqVZE9PzPEXqvcuTge5Aojf5tgvTdA00WCGXMADnNy7G5hmgXkHNmsYe1QwCMOdg
pH7dGAcIBeNCKLYavArADkZiTQzMa9icKoN0gcZuSxEjmFGiaHtxO4amAOcFxXK4
ZBiBzy/Ax7ZNVTs4sEjuKYW83qTvTr84LmqU0B7DGOBelioy63JQ+3gv7DDb6aH6
cKarhFThwVio4jN9KmkWEcEjvv7e47yZD3rNWygQ+LaHOW8wGBu5wY4gc86YdYdJ
EVcnANQxVth7oPt1iNgByFt6+3l7TWI+Xjo1Mzro+Pd9ETBQ1Up7D3p4TC/dA6F3
XFmFjXYK66CNdh27Wj3ECLuO6qM/dRfR8DgJtm2UYz5PlejR3bgdwSMtuR/R9lIg
dBeuR8xiAkirux6E1hqRQvy38bAj82BhLLCJydGRybm8XW0pMqRihRZ6gjXugWCG
l/a4jaI4k2/3WcOURbPBrv4gfjYGXLVSXlEke/OLBFUoeWu8F3M=
=CnMj
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,25 @@
File: squid-5.2.tar.xz
Date: Sun 03 Oct 2021 15:15:35 UTC
Size: 2553872
MD5 : 102984f3ea382a1fa5bd917c2ee155ec
SHA1: 0568a55c8bf20fbcbfadf126347f3e790945e5d2
Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
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/jvOxfT4FAmFZySIACgkQzW2/jvOx
fT6sUBAArqj2/hn+a1okSuUWef2x0AtEKXy18aaYTJxF20yq3nNO1jLZYUY9dgpo
I0R32a8liygQPtfb+FFzQjkoIfpgEsmskndS0/jlOicY7ljw4MfHCLCtmc1xzPIs
UErI4SFR1H3aIa4yAmbQEhjuCWqBOzLt/UBzOupF89hofT57CZhVNoYgO2IWFu3+
j2eZmq6nZbBBHBJG3II+FiFuPhTpuiMxdQ1WN84a+XklhIatOWVW8ALX/hBT12KC
Z9SxixgZQFpCQ9uNfpoCsMVrhWS9tJnUmnOiziWIEKgVHnPOh/uQLxxZvvSUc8Ag
aUAM2DcDx3QWw1RLx/kJPfpCt2tHEHGfGpd7U5LcTEfDYIyjfwnVF9L1kGuHaT+k
RW96vq9NFikSKmyEKRZ3EUZNqXJE3dd6pYpOO3GjHRr2fBn1D+UpV90vswTWBrzX
7gO8aPnnD8/uD6h6pFSBNpAAKpEBS9watDRBlTIEsivaTeZxzob7dk9ZiK8cjsRQ
jhVTvwQw9r5ong50y1pg5APD3wwipNUjHVMD45XQNbxZAGsZMPnvA0vDFECKJ6iG
CVwpOc48Fkl6frY0ByddCES4lWzgkkfYtPQGkPYxhOGhaqiRXO8kjk0/Dbw4AJW1
BoHM9DydPohXuNQZIA19v7lcYvQShCmp3xbUoQ45AwZno4DpAAA=
=PQ84
-----END PGP SIGNATURE-----

View File

@ -1,8 +1,8 @@
%define __perl_requires %{SOURCE98} %define __perl_requires %{SOURCE98}
Name: squid Name: squid
Version: 5.1 Version: 5.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
@ -39,6 +39,8 @@ Patch205: squid-5.0.5-symlink-lang-err.patch
Patch206: squid-5.0.6-openssl3.patch Patch206: squid-5.0.6-openssl3.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1969322 # https://bugzilla.redhat.com/show_bug.cgi?id=1969322
Patch207: squid-5.0.6-active-ftp.patch Patch207: squid-5.0.6-active-ftp.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1988122
Patch208: squid-5.1-test-store-cppsuite.patch
# cache_swap.sh # cache_swap.sh
Requires: bash gawk Requires: bash gawk
@ -111,15 +113,14 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch205 -p1 -R -b .symlink-lang-err %patch205 -p1 -R -b .symlink-lang-err
%patch206 -p1 -b .openssl3 %patch206 -p1 -b .openssl3
%patch207 -p1 -b .active-ftp %patch207 -p1 -b .active-ftp
%patch208 -p1 -b .test-store-cpp
# https://bugzilla.redhat.com/show_bug.cgi?id=1679526 # https://bugzilla.redhat.com/show_bug.cgi?id=1679526
# Patch in the vendor documentation and used different location for documentation # Patch in the vendor documentation and used different location for documentation
sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in
%build %build
# This package fails its testsuite when LTO is enabled. This needs further
# investigation
%define _lto_cflags %{nil}
# NIS helper has been removed because of the following bug # NIS helper has been removed because of the following bug
# https://bugzilla.redhat.com/show_bug.cgi?id=1531540 # https://bugzilla.redhat.com/show_bug.cgi?id=1531540
@ -345,6 +346,14 @@ fi
%changelog %changelog
* Thu Oct 07 2021 Luboš Uhliarik <luhliari@redhat.com> - 7:5.2-1
- new version 5.2
- Resolves: #1934560 - squid: out-of-bounds read in WCCP protocol
- Resolves: #2011637 - Rebase squid to 5.2
* Wed Sep 15 2021 Luboš Uhliarik <luhliari@redhat.com> - 7:5.1-3
- Resolves: #1988122 - Enable LTO build of squid for RHEL 9
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7:5.1-2 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7:5.1-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688