Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2021-12-21 18:40:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Tue Dec 21 18:40:50 2021 rev:96 rq:941860 version:5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2021-12-08 00:00:27.875593175 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new.2520/squid.changes 2021-12-21 18:41:29.497920157 +0100 @@ -1,0 +2,9 @@ +Sat Dec 11 09:36:41 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 5.3: + * Bug 5169: StoreMap.cc:517 "!s.reading()" assertion + * Bug 5158: AnyP::Uri::host() mishandles [escaped] IPv6 addresses + * Bug 5060: Parallel builds are not reliable + * Documentation updates for logformat directive + +------------------------------------------------------------------- Old: ---- squid-5.2.tar.xz squid-5.2.tar.xz.asc New: ---- squid-5.3.tar.xz squid-5.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.YkWIPP/_old 2021-12-21 18:41:30.049920653 +0100 +++ /var/tmp/diff_new_pack.YkWIPP/_new 2021-12-21 18:41:30.053920657 +0100 @@ -24,7 +24,7 @@ %define squidhelperdir %{_sbindir} %endif Name: squid -Version: 5.2 +Version: 5.3 Release: 0 Summary: Caching and forwarding HTTP web proxy License: GPL-2.0-or-later ++++++ squid-5.2.tar.xz -> squid-5.3.tar.xz ++++++ ++++ 1841 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/ChangeLog new/squid-5.3/ChangeLog --- old/squid-5.2/ChangeLog 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/ChangeLog 2021-12-07 15:15:52.000000000 +0100 @@ -1,3 +1,10 @@ +Changes in squid-5.3 (06 Dec 2021): + + - Bug 5169: StoreMap.cc:517 "!s.reading()" assertion + - Bug 5158: AnyP::Uri::host() mishandles [escaped] IPv6 addresses + - Bug 5060: Parallel builds are not reliable + - Documentation updates for logformat directive + Changes in squid-5.2 (03 Oct 2021): - Bug 5164: a copy-paste typo in HttpHdrCc::hasMinFresh() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/RELEASENOTES.html new/squid-5.3/RELEASENOTES.html --- old/squid-5.2/RELEASENOTES.html 2021-10-03 17:09:39.000000000 +0200 +++ new/squid-5.3/RELEASENOTES.html 2021-12-07 15:15:57.000000000 +0100 @@ -3,10 +3,10 @@ <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.82"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <TITLE>Squid 5.2 release notes</TITLE> + <TITLE>Squid 5.3 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 5.2 release notes</H1> +<H1>Squid 5.3 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -61,7 +61,7 @@ <HR> <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-5.2.</P> +<P>The Squid Team are pleased to announce the release of Squid-5.3.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v5/">http://www.squid-cache.org/Versions/v5/</A> or the <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/configure.ac new/squid-5.3/configure.ac --- old/squid-5.2/configure.ac 2021-10-03 17:04:42.000000000 +0200 +++ new/squid-5.3/configure.ac 2021-12-07 15:11:12.000000000 +0100 @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[5.2],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[5.3],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/doc/release-notes/release-5.html new/squid-5.3/doc/release-notes/release-5.html --- old/squid-5.2/doc/release-notes/release-5.html 2021-10-03 17:09:39.000000000 +0200 +++ new/squid-5.3/doc/release-notes/release-5.html 2021-12-07 15:15:57.000000000 +0100 @@ -3,10 +3,10 @@ <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.82"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <TITLE>Squid 5.2 release notes</TITLE> + <TITLE>Squid 5.3 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 5.2 release notes</H1> +<H1>Squid 5.3 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -61,7 +61,7 @@ <HR> <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-5.2.</P> +<P>The Squid Team are pleased to announce the release of Squid-5.3.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v5/">http://www.squid-cache.org/Versions/v5/</A> or the <A HREF="http://www.squid-cache.org/Download/http-mirrors.html">mirrors</A>.</P> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/include/version.h new/squid-5.3/include/version.h --- old/squid-5.2/include/version.h 2021-10-03 17:04:42.000000000 +0200 +++ new/squid-5.3/include/version.h 2021-12-07 15:11:12.000000000 +0100 @@ -7,7 +7,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1633273471 +#define SQUID_RELEASE_TIME 1638886262 #endif /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/acl/external/SQL_session/ext_sql_session_acl.8 new/squid-5.3/src/acl/external/SQL_session/ext_sql_session_acl.8 --- old/squid-5.2/src/acl/external/SQL_session/ext_sql_session_acl.8 2021-10-03 17:09:42.000000000 +0200 +++ new/squid-5.3/src/acl/external/SQL_session/ext_sql_session_acl.8 2021-12-07 15:15:59.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_SQL_SESSION_ACL 8" -.TH EXT_SQL_SESSION_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH EXT_SQL_SESSION_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/acl/external/delayer/ext_delayer_acl.8 new/squid-5.3/src/acl/external/delayer/ext_delayer_acl.8 --- old/squid-5.2/src/acl/external/delayer/ext_delayer_acl.8 2021-10-03 17:09:42.000000000 +0200 +++ new/squid-5.3/src/acl/external/delayer/ext_delayer_acl.8 2021-12-07 15:15:59.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_DELAYER_ACL 8" -.TH EXT_DELAYER_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH EXT_DELAYER_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 new/squid-5.3/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 --- old/squid-5.2/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2021-10-03 17:09:42.000000000 +0200 +++ new/squid-5.3/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2021-12-07 15:15:59.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_KERBEROS_SID_GROUP_ACL 8" -.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 new/squid-5.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 --- old/squid-5.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2021-10-03 17:09:42.000000000 +0200 +++ new/squid-5.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2021-12-07 15:15:59.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL 8" -.TH EXT_WBINFO_GROUP_ACL 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/anyp/Uri.cc new/squid-5.3/src/anyp/Uri.cc --- old/squid-5.2/src/anyp/Uri.cc 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/anyp/Uri.cc 2021-12-07 15:15:52.000000000 +0100 @@ -97,8 +97,7 @@ void AnyP::Uri::host(const char *src) { - hostAddr_.setEmpty(); - hostAddr_ = src; + hostAddr_.fromHost(src); if (hostAddr_.isAnyAddr()) { xstrncpy(host_, src, sizeof(host_)); hostIsNumeric_ = false; @@ -113,10 +112,11 @@ SBuf AnyP::Uri::hostOrIp() const { - static char ip[MAX_IPSTRLEN]; - if (hostIsNumeric()) - return SBuf(hostIP().toStr(ip, sizeof(ip))); - else + if (hostIsNumeric()) { + static char ip[MAX_IPSTRLEN]; + const auto hostStrLen = hostIP().toHostStr(ip, sizeof(ip)); + return SBuf(ip, hostStrLen); + } else return SBuf(host()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/anyp/Uri.h new/squid-5.3/src/anyp/Uri.h --- old/squid-5.2/src/anyp/Uri.h 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/anyp/Uri.h 2021-12-07 15:15:52.000000000 +0100 @@ -87,8 +87,8 @@ Ip::Address const & hostIP(void) const {return hostAddr_;} /// \returns the host subcomponent of the authority component - /// If the host is an IPv6 address, returns that IP address without - /// [brackets]! See RFC 3986 Section 3.2.2. + /// If the host is an IPv6 address, returns that IP address with + /// [brackets]. See RFC 3986 Section 3.2.2. SBuf hostOrIp() const; void port(unsigned short p) {port_=p; touch();} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/auth/basic/DB/basic_db_auth.8 new/squid-5.3/src/auth/basic/DB/basic_db_auth.8 --- old/squid-5.2/src/auth/basic/DB/basic_db_auth.8 2021-10-03 17:09:43.000000000 +0200 +++ new/squid-5.3/src/auth/basic/DB/basic_db_auth.8 2021-12-07 15:16:00.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 8" -.TH BASIC_DB_AUTH 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/auth/basic/POP3/basic_pop3_auth.8 new/squid-5.3/src/auth/basic/POP3/basic_pop3_auth.8 --- old/squid-5.2/src/auth/basic/POP3/basic_pop3_auth.8 2021-10-03 17:09:44.000000000 +0200 +++ new/squid-5.3/src/auth/basic/POP3/basic_pop3_auth.8 2021-12-07 15:16:00.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_POP3_AUTH 8" -.TH BASIC_POP3_AUTH 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH BASIC_POP3_AUTH 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/cf.data.pre new/squid-5.3/src/cf.data.pre --- old/squid-5.2/src/cf.data.pre 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/cf.data.pre 2021-12-07 15:15:52.000000000 +0100 @@ -4907,10 +4907,29 @@ If ICAP is enabled, the following code becomes available (as well as ICAP log codes documented with the icap_log option): - icap::tt Total ICAP processing time for the HTTP - transaction. The timer ticks when ICAP - ACLs are checked and when ICAP - transaction is in progress. + icap::tt Total ICAP "blocking" time for the HTTP transaction. The + timer ticks while Squid checks adaptation_access and while + ICAP transaction(s) expect ICAP response headers, including + the embedded adapted HTTP message headers (where applicable). + This measurement is meant to estimate ICAP impact on HTTP + transaction response times, but it does not currently account + for slow ICAP response body delivery blocking HTTP progress. + + Once Squid receives the final ICAP response headers (e.g., + ICAP 200 or 204) and the associated adapted HTTP message + headers (if any) from the ICAP service, the corresponding ICAP + transaction stops affecting this measurement, even though the + transaction itself may continue for a long time (e.g., to + finish sending the ICAP request and/or to finish receiving the + ICAP response body). + + When "blocking" sections of multiple concurrent ICAP + transactions overlap in time, the overlapping segment is + counted only once. + + To see complete ICAP transaction response times (rather than + the cumulative effect of their blocking sections) use the + %adapt::all_trs logformat code or the icap_log directive. If adaptation is enabled the following codes become available: @@ -4929,11 +4948,12 @@ milliseconds. When a failed transaction is being retried or repeated, its time is not logged individually but added to the - replacement (next) transaction. See also: - adapt::all_trs. + replacement (next) transaction. Lifetimes of individually + listed adaptation transactions may overlap. + See also: %icap::tt and %adapt::all_trs. adapt::all_trs All adaptation transaction response times. - Same as adaptation_strs but response times of + Same as %adapt::sum_trs but response times of individual transactions are never added together. Instead, all transaction response times are recorded individually. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8 new/squid-5.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8 --- old/squid-5.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2021-10-03 17:09:44.000000000 +0200 +++ new/squid-5.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2021-12-07 15:16:01.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "URL_LFS_REWRITE 8" -.TH URL_LFS_REWRITE 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH URL_LFS_REWRITE 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/icmp/Makefile.am new/squid-5.3/src/icmp/Makefile.am --- old/squid-5.2/src/icmp/Makefile.am 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/icmp/Makefile.am 2021-12-07 15:15:52.000000000 +0100 @@ -95,17 +95,20 @@ SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc cp $(top_srcdir)/src/SquidConfig.cc $@ -tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc +tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc | tests cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@ -tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc +tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc | tests cp $(top_srcdir)/src/tests/stub_fd.cc $@ -tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc +tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests cp $(top_srcdir)/src/tests/stub_libmem.cc $@ -tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc +tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc | tests cp $(top_srcdir)/src/tests/stub_SBuf.cc $@ -tests/STUB.h: $(top_srcdir)/src/tests/STUB.h +tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests cp $(top_srcdir)/src/tests/STUB.h $@ + +tests: + mkdir -p $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/ip/Address.cc new/squid-5.3/src/ip/Address.cc --- old/squid-5.2/src/ip/Address.cc 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/ip/Address.cc 2021-12-07 15:15:52.000000000 +0100 @@ -788,16 +788,6 @@ return prt; } -/** - * toStr Given a buffer writes a readable ascii version of the IPA and/or port stored - * - * Buffer must be of a size large enough to hold the converted address. - * This size is provided in the form of a global defined variable MAX_IPSTRLEN - * Should a buffer shorter be provided the string result will be truncated - * at the length of the available buffer. - * - * A copy of the buffer is also returned for simple immediate display. - */ char * Ip::Address::toStr(char* buf, const unsigned int blen, int force) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/ipc/ReadWriteLock.cc new/squid-5.3/src/ipc/ReadWriteLock.cc --- old/squid-5.2/src/ipc/ReadWriteLock.cc 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/ipc/ReadWriteLock.cc 2021-12-07 15:15:52.000000000 +0100 @@ -20,6 +20,23 @@ assert(flag.test_and_set(std::memory_order_relaxed)); } +/// common lockExclusive() and unlockSharedAndSwitchToExclusive() logic: +/// either finish exclusive locking or bail properly +/// \pre The caller must (be the first to) increment writeLevel. +/// \returns whether we got the exclusive lock +bool +Ipc::ReadWriteLock::finalizeExclusive() +{ + assert(writeLevel); // "new" readers are locked out by the caller + assert(!appending); // nobody can be appending without an exclusive lock + if (!readLevel) { // no old readers and nobody is becoming a reader + writing = true; + return true; + } + --writeLevel; + return false; +} + bool Ipc::ReadWriteLock::lockShared() { @@ -35,12 +52,9 @@ bool Ipc::ReadWriteLock::lockExclusive() { - if (!writeLevel++) { // we are the first writer + lock "new" readers out - if (!readLevel) { // no old readers and nobody is becoming one - writing = true; - return true; - } - } + if (!writeLevel++) // we are the first writer + lock "new" readers out + return finalizeExclusive(); // decrements writeLevel on failures + --writeLevel; return false; } @@ -96,17 +110,12 @@ { assert(readers > 0); if (!writeLevel++) { // we are the first writer + lock "new" readers out - assert(!appending); - unlockShared(); - if (!readers) { - writing = true; - return true; - } - // somebody is still reading: fall through - } else { - // somebody is still writing: just stop reading unlockShared(); + return finalizeExclusive(); // decrements writeLevel on failures } + + // somebody is still writing, so we just stop reading + unlockShared(); --writeLevel; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/ipc/ReadWriteLock.h new/squid-5.3/src/ipc/ReadWriteLock.h --- old/squid-5.2/src/ipc/ReadWriteLock.h 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/src/ipc/ReadWriteLock.h 2021-12-07 15:15:52.000000000 +0100 @@ -51,6 +51,8 @@ std::atomic_flag updating; ///< a reader is updating metadata/headers private: + bool finalizeExclusive(); + mutable std::atomic<uint32_t> readLevel; ///< number of users reading (or trying to) std::atomic<uint32_t> writeLevel; ///< number of users writing (or trying to write) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/log/DB/log_db_daemon.8 new/squid-5.3/src/log/DB/log_db_daemon.8 --- old/squid-5.2/src/log/DB/log_db_daemon.8 2021-10-03 17:09:45.000000000 +0200 +++ new/squid-5.3/src/log/DB/log_db_daemon.8 2021-12-07 15:16:01.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LOG_DB_DAEMON 8" -.TH LOG_DB_DAEMON 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH LOG_DB_DAEMON 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/security/cert_validators/fake/security_fake_certverify.8 new/squid-5.3/src/security/cert_validators/fake/security_fake_certverify.8 --- old/squid-5.2/src/security/cert_validators/fake/security_fake_certverify.8 2021-10-03 17:09:45.000000000 +0200 +++ new/squid-5.3/src/security/cert_validators/fake/security_fake_certverify.8 2021-12-07 15:16:02.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "SECURITY_FAKE_CERTVERIFY 8" -.TH SECURITY_FAKE_CERTVERIFY 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH SECURITY_FAKE_CERTVERIFY 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/src/store/id_rewriters/file/storeid_file_rewrite.8 new/squid-5.3/src/store/id_rewriters/file/storeid_file_rewrite.8 --- old/squid-5.2/src/store/id_rewriters/file/storeid_file_rewrite.8 2021-10-03 17:09:43.000000000 +0200 +++ new/squid-5.3/src/store/id_rewriters/file/storeid_file_rewrite.8 2021-12-07 15:16:00.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "STOREID_FILE_REWRITE 8" -.TH STOREID_FILE_REWRITE 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH STOREID_FILE_REWRITE 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/tools/Makefile.am new/squid-5.3/tools/Makefile.am --- old/squid-5.2/tools/Makefile.am 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/tools/Makefile.am 2021-12-07 15:15:52.000000000 +0100 @@ -31,7 +31,7 @@ test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc cp $(top_srcdir)/test-suite/test_tools.cc $@ -tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc +tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests cp $(top_srcdir)/src/tests/stub_debug.cc $@ Here.cc: $(top_srcdir)/src/base/Here.cc @@ -46,15 +46,18 @@ time.cc: $(top_srcdir)/src/time.cc cp $(top_srcdir)/src/time.cc $@ -tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc +tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests cp $(top_srcdir)/src/tests/stub_cbdata.cc $@ -tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc +tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests cp $(top_srcdir)/src/tests/stub_libmem.cc $@ -tests/STUB.h: $(top_srcdir)/src/tests/STUB.h +tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests cp $(top_srcdir)/src/tests/STUB.h $@ +tests: + mkdir -p $@ + # stock tools for unit tests - library independent versions of dlink_list # etc. # globals.cc is needed by test_tools.cc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/tools/helper-mux/helper-mux.8 new/squid-5.3/tools/helper-mux/helper-mux.8 --- old/squid-5.2/tools/helper-mux/helper-mux.8 2021-10-03 17:09:45.000000000 +0200 +++ new/squid-5.3/tools/helper-mux/helper-mux.8 2021-12-07 15:16:02.000000000 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "HELPER-MUX 8" -.TH HELPER-MUX 8 "2021-10-03" "perl v5.32.1" "User Contributed Perl Documentation" +.TH HELPER-MUX 8 "2021-12-07" "perl v5.32.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-5.2/tools/squidclient/Makefile.am new/squid-5.3/tools/squidclient/Makefile.am --- old/squid-5.2/tools/squidclient/Makefile.am 2021-10-03 17:07:36.000000000 +0200 +++ new/squid-5.3/tools/squidclient/Makefile.am 2021-12-07 15:15:52.000000000 +0100 @@ -30,18 +30,21 @@ test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc cp $(top_srcdir)/test-suite/test_tools.cc $@ -tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc +tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests cp $(top_srcdir)/src/tests/stub_debug.cc $@ time.cc: $(top_srcdir)/src/time.cc cp $(top_srcdir)/src/time.cc $@ -tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc +tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc | tests cp $(top_srcdir)/src/tests/stub_libmem.cc $@ -tests/STUB.h: $(top_srcdir)/src/tests/STUB.h +tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests cp $(top_srcdir)/src/tests/STUB.h $@ +tests: + mkdir -p $@ + # stock tools for unit tests - library independent versions of dlink_list # etc. # globals.cc is needed by test_tools.cc. ++++++ squid-5.2.tar.xz.asc -> squid-5.3.tar.xz.asc ++++++ --- /work/SRC/openSUSE:Factory/squid/squid-5.2.tar.xz.asc 2021-10-08 00:06:44.593823780 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new.2520/squid-5.3.tar.xz.asc 2021-12-21 18:41:29.485920146 +0100 @@ -1,25 +1,25 @@ -File: squid-5.2.tar.xz -Date: Sun 03 Oct 2021 15:15:35 UTC -Size: 2553872 -MD5 : 102984f3ea382a1fa5bd917c2ee155ec -SHA1: 0568a55c8bf20fbcbfadf126347f3e790945e5d2 +File: squid-5.3.tar.xz +Date: Tue 07 Dec 2021 14:18:26 UTC +Size: 2553980 +MD5 : 9249f30169ab6600e53b4f9b8129b3b0 +SHA1: d3a8310c725616fa7565d60f3bf8fdf5fa20b15a Key : CD6DBF8EF3B17D3E <squ...@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 +iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmGvbTsACgkQzW2/jvOx +fT6ilg//c2JzTHjlwmFKVXLBQ2fyIAL7n76PPcMhPsnSZ6iQMEnWs5+lGUqIfojV +6cgrwZ8vmKlU0LVVwGuoff3u1uKA3dp+AGj5TXERyj/EGJQC1REuFd+BYEm/9x1z +FVOWvYjLA8dWSwLBK+VNEvRE/j2CiCcQAZ5e5RwR8xYj/49g9OXXu84wopse+zNF +RtyJwUQM2+Y3sM1v3+jDoz3X5pfs+rO1/CC97QXiMmOpVbVp7j1UFWdi+cKsq3BJ +/Vwh6Q4i+4LbUux/uhVL5ViFLk6qNA6QapS7iTZcwF+0l6GukbKQqAmM3cfGSAsw +M6dg3JY2JxTggsnVBUOnICfKb3aizZlPhCMI6cU/dYaZQHgjXI0d5HXrznVhYgFg +ffdoCb7RlM+G9aAGn/pN0AnAkT4FLRMMMOkA5BF23fvDAgXAX2tH6MVaVotVl7I6 +qgaOAyNhRXokFFDJ1iBx/5R9HJWcC2YbSuDaywyS5Kitj8rsLz8N/Oyla+IMcxst +H8Lcj3nZp4G7kEict3b2e0/A4gwuhHo/f5mnRh0JOGKx6YmgHMC/WkXPjTfGxp2k +r1pPKdGLUVOPtIiwq1yX5MTjn2r101yq6uMA2cSTSIVyuGrO55WoIP4CdYx51NoB +ME5V/dat/PwGWr5t5O1AxLlpyRwF7I41tLNSmPJKZzd4BfpmqcI= +=GW6M -----END PGP SIGNATURE-----