Accepting request 816219 from home:AndreasStieger:branches:server:proxy

squid 4.12 OBS-URL: https://build.opensuse.org/request/show/816219 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=212
2020-06-22 08:43:44 +00:00 · 2020-06-22 08:43:44 +00:00 · 90caa15be3
commit 90caa15be3
parent 8b38ddcc65
6 changed files with 45 additions and 34 deletions
--- a/squid-4.11.tar.xz
+++ b/squid-4.11.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ed947612410263f57ad0e39bfd087e60fb714f028d7d3b0e469943efd34287d
-size 2447700
--- a/squid-4.11.tar.xz.asc
+++ b/squid-4.11.tar.xz.asc
@ -1,25 +0,0 @@
-File: squid-4.11.tar.xz
-Date: Sun Apr 19 12:56:37 UTC 2020
-Size: 2447700
-MD5 : 10f34e852153a9996aa4614670e2bda1
-SHA1: 053277bf5497163ffc9261b9807abda5959bb6fc
-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/jvOxfT4FAl6cSpEACgkQzW2/jvOx
-fT6YbA/6A+IbIbNBJUW45oj23Io9Tw/CzAcTeLHR+McKwV77qMbR+L+kQ+fUdM5F
-rHAmd8bVVlyHc4WanVfWItEmzBzHA/ifTNvVpefSGGEbDb80RF66k7ACiZUokg1b
-kkPwc/SjDhe2wvketIaBiVVd7pylrlCdVvazcF8gE9MWDOIlJND5mnHXidXvwkbJ
-T2//8JZVEmcmN9pdFGNAUVckFm+AnwWXcRM1SQPYDGSVUtjVlqido8snLTA1mZwl
-rIpjppujMV54OOWlj+Gqa3MZkpNzIaMCAfphzUFlsQY+/sRUYAOv1wmxw2WclxlK
-WlWM+fw8OsYNDMwkOScKZZWceoAkq6UsUHzCAdJIdLqV/R6mZ9nfuZ6BHIr0+2dP
-bDf9MU4KXbwEuXiRD/KPziUxxOZwSPivbm3wy9DqTTZfO9V+Iq6FVHX+ahxJ0XbM
-JWRYA3GW+DRLjorfsWxU5r4UJsrnBfhItPUAfGPjPjEGZ/pn8r9G6MGenNGPLMKy
-wP1rMlOhrZPwerzokzAvKx8G0WWkfN+IPv2JK3rDot6RiJIOuvnZZd4RIuVNTGbh
-liO7M24JlWX3WD2wHBzxQag46+plb3VvrrVChwIQnZ2Qzpf50w0Bife/wtNBGpK0
-k/Xi/nocO796YS8GZBnmhS1lEGEwp/YpJBFWmIjTWMUMEOcswVA=
-=PKl0
-----END PGP SIGNATURE-----
--- a/squid-4.12.tar.xz
+++ b/squid-4.12.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f42a03c8b3dc020722c88bf1a87da8cb0c087b2f66b41d8256c77ee1b527e317
+size 2450564
--- a/squid-4.12.tar.xz.asc
+++ b/squid-4.12.tar.xz.asc
@ -0,0 +1,25 @@
+File: squid-4.12.tar.xz
+Date: Tue Jun  9 07:34:59 UTC 2020
+Size: 2450564
+MD5 : ad7a4a8a0031cae3435717a759173829
+SHA1: 316b8a343aa542b5e7469d33b9d726bee00679c6
+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/jvOxfT4FAl7fO6wACgkQzW2/jvOx
+fT5dchAAvAB2fh/QBkumskN/K5c061NFA+/ZbHD8gqmvaUUIjXNoEqBhBAzTpCpm
+03XcFZdIBFKqkHxiJrlWzdRylSqv5nkw1qZBN6S6NzygYVs3UYHkpNSM8AZLBW4c
+XDZEnmYbr2HlWHJ9fISsWhwApQ2HXwzUdMAFeN3ADDtT2nbCSjpO89sFj6zHrUVo
+sWsf+pKuPd6C/30MymsF5ZQVkmAeb1TRDRpnWvg0Ec//m2Sw0p6nKlr0uPBLMALW
+nIQivuf6MRTaa0iFibWtIyA4m88mUZLifWM9F3DOJcJYjXlKjWpQ0GQY/ylpDpeL
+DzMbIV/Ycv4R/w6Hk6f4MDva7FRkamlsUhCUrrL09B0CaAjnW3b0wIbFnoiCP2cL
+48TST3NjKy2CG8yrHKL2G5mER2T/KyGv3m2TvVNl+sihH35Urtq9ecBCn2UwiRFL
+mNsEXllhMVzYmRwlN3+1Y+P612jdpdSLzIQH++ih3FYhpiZRrUPKYWNSYnesUQo+
+AJiOoDzdqzHlg2P5ZVQlhaTf7qEMLf55w6TzPJ4lo6DuDdIyGVBJBJFiuBMp6JHr
+jElIYnwgCJ2j+Lmr2pmN0njlhSkio6084Wava37P3c61wqFF47NErO8bwaUZNPT/
+66A23tcqM1ADeBB9Ll4vmxjvn/CHrWmX0RzoOp2VCG8s7i1CT1E=
+=c3VT
+-----END PGP SIGNATURE-----
--- a/squid.changes
+++ b/squid.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Jun 21 05:28:33 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- squid 4.12:
+  * Regression Fix: Revert to slow search for new SMP shm pages
+  * Fix Negative responses are never cached
+  * HTTP: validate Content-Length value prefix
+  * HTTP: add flexible RFC 3986 URI encoder
+  * Fix stall if transaction overwrites a recently active cache
+    entry
+
 -------------------------------------------------------------------
 Thu Apr 23 13:02:37 UTC 2020 - Adam Majer <adam.majer@suse.de>

--- a/squid.spec
+++ b/squid.spec
@ -19,7 +19,7 @@
 %define         squidlibdir %{_libdir}/squid
 %define         squidconfdir %{_sysconfdir}/squid
 Name:           squid
-Version:        4.11
+Version:        4.12
 Release:        0
 Summary:        Caching and forwarding HTTP web proxy
 License:        GPL-2.0-or-later
@ -65,18 +65,18 @@ BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libsasl2)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(nettle)
-Recommends:     logrotate
 Requires(pre):  permissions
+Recommends:     logrotate
 Provides:       http_proxy
 # due to package rename
 # Wed Aug 15 17:40:30 UTC 2012
 Provides:       %{name}3 = %{version}
 Obsoletes:      %{name}3 < %{version}
 %{?systemd_ordering}
+%sysusers_requires
 %if 0%{?suse_version} >= 1330
 BuildRequires:  libnsl-devel
 %endif
-%sysusers_requires

 %description
 Squid is a caching proxy for the Web supporting HTTP(S), FTP, and
@ -92,7 +92,7 @@ cp %{SOURCE10} .
 # upstream patches after RELEASE
 perl -p -i -e 's|%{_prefix}/local/bin/perl|%{_bindir}/perl|' `find -name "*.pl"`
 %patch1 -p1
-%if %{suse_version} < 1500
+%if 0%{?suse_version} < 1500
 %patch2 -p1
 %endif

@ -144,7 +144,7 @@ export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie"
 	--disable-arch-native \
 	--enable-security-cert-generators \
 	--enable-security-cert-validators
-make SAMBAPREFIX=%{_prefix} %{?_smp_mflags}
+%make_build SAMBAPREFIX=%{_prefix}
 %sysusers_generate_pre %{SOURCE12} squid

 %install
@ -207,7 +207,7 @@ install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/

 %check
 # Fails in chroot environment
-make %{?_smp_mflags} check
+%make_build check

 %pre -f squid.pre
 %service_add_pre %{name}.service