From 631c738b0a717c4b4301bd55f8dfb29368ee38e8e97e4e1155d537b2d7d2579b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Jun 2015 22:51:06 +0000 Subject: [PATCH] Accepting request 310389 from server:proxy:Test 1 OBS-URL: https://build.opensuse.org/request/show/310389 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=78 --- squid-3.5.4.tar.xz | 3 --- squid-3.5.4.tar.xz.asc | 20 -------------------- squid-3.5.5.tar.xz | 3 +++ squid-3.5.5.tar.xz.asc | 20 ++++++++++++++++++++ squid-config.patch | 8 ++++---- squid.changes | 22 ++++++++++++++++++++++ squid.logrotate | 2 +- squid.spec | 2 +- 8 files changed, 51 insertions(+), 29 deletions(-) delete mode 100644 squid-3.5.4.tar.xz delete mode 100644 squid-3.5.4.tar.xz.asc create mode 100644 squid-3.5.5.tar.xz create mode 100644 squid-3.5.5.tar.xz.asc diff --git a/squid-3.5.4.tar.xz b/squid-3.5.4.tar.xz deleted file mode 100644 index d042134..0000000 --- a/squid-3.5.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dce615d08e349caf3975fc5d51ce4c3c69b9995fb83f51dc5d55ae873d8bf6a4 -size 2289772 diff --git a/squid-3.5.4.tar.xz.asc b/squid-3.5.4.tar.xz.asc deleted file mode 100644 index 66b0a74..0000000 --- a/squid-3.5.4.tar.xz.asc +++ /dev/null @@ -1,20 +0,0 @@ -File: squid-3.5.4.tar.xz -Date: Fri May 1 12:25:42 UTC 2015 -Size: 2289772 -MD5 : 5b53d5bb47fa033b76857f7956d0c36b -SHA1: 71a04a5f7c4c38464a8a08ae1089c47abcea0e49 -Key : 0xFF5CF463 - fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 - keyring = http://www.squid-cache.org/pgp.asc - keyserver = subkeys.pgp.net ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJVQ3PPAAoJELJo5wb/XPRjdI8H/3vB73EXjW0nzu9iJr6gN7vs -PZjle4b6cT/76nbAf0O4R5m/HAeIfuoWLsHoVCysroRMcVqni0su1swqavMj/d27 -ikhSyR/JlXArFFumV0Nj1srZuY11Qz9dohLqVBwX8dzuqzFrqF5jQMvM2bKK1Pm9 -hUF+tFZP4sF/y7NBdHMKkb7pRLLc8Yn75wZtg4FAhLY6HfM58e3Sn5Y3JUJ4Lyt0 -6YqnzDQzNAs6YCrsLnY/AY7TKL8hAXMmvJXP9q1wn31lCmzx5KNz3b9YTq+Ul1aB -XqyXyP2FptkUrPJ448f0hgAsrDNfs2rpAblq35ueo6fAV4gwgtmlIb81Y5w0eTQ= -=PwZH ------END PGP SIGNATURE----- diff --git a/squid-3.5.5.tar.xz b/squid-3.5.5.tar.xz new file mode 100644 index 0000000..bdd6a7e --- /dev/null +++ b/squid-3.5.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23793da6b23871765188becae59a6f4b6c3672c256ba9be90743b46a3c7921cf +size 2290016 diff --git a/squid-3.5.5.tar.xz.asc b/squid-3.5.5.tar.xz.asc new file mode 100644 index 0000000..a2f5332 --- /dev/null +++ b/squid-3.5.5.tar.xz.asc @@ -0,0 +1,20 @@ +File: squid-3.5.5.tar.xz +Date: Thu May 28 11:58:32 UTC 2015 +Size: 2290016 +MD5 : 9a323a97753143ddd935aed58a0193ae +SHA1: 2c168e8b13251ed8050d9e780127c4de016dcb61 +Key : 0xFF5CF463 + fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 + keyring = http://www.squid-cache.org/pgp.asc + keyserver = subkeys.pgp.net +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJVZwTYAAoJELJo5wb/XPRjGGMH/j81al1zE8X0nJdISJFvRt3K +/he7046bmlRKavlShiIcVulnAxgIwApV1cBz1sZffWwRB+o8nZ/RWThowwi0urv+ +ofz6/jwV93VVWFFlXXsNP9Qj8PnZI4Zj4xHWs7ObPCdCLbY4mRx31lUcGyXRTFhI +1vXOMb2hE8hFWHwazlSvRLmXfCgt/Y6bRH8VD65G4n4G7u3jHl10nvISiUgB9rkr +cddv8zVztM+Ng948hO+eQnnjvtQBrjfKH1QXrJbgPNbKLpG0p97Txq767E3YEPm2 +ax/mxIPPeV5ZT6g2YSSsTZ1NJvlyni7h9l/p/uxhpDo7kMxunAUrzxzoXnZmE9s= +=MtNr +-----END PGP SIGNATURE----- diff --git a/squid-config.patch b/squid-config.patch index bdad90d..3c8899e 100644 --- a/squid-config.patch +++ b/squid-config.patch @@ -2,7 +2,7 @@ Index: src/cf.data.pre =================================================================== --- src/cf.data.pre.orig +++ src/cf.data.pre -@@ -1409,6 +1409,8 @@ http_access deny manager +@@ -1452,6 +1452,8 @@ http_access deny manager # Adapt localnet in the ACL section to list your (internal) IP networks # from where browsing should be allowed http_access allow localnet @@ -11,7 +11,7 @@ Index: src/cf.data.pre http_access allow localhost # And finally deny all other access to this proxy -@@ -3637,6 +3639,10 @@ DOC_START +@@ -3680,6 +3682,10 @@ DOC_START Instead, if you want Squid to use the entire disk drive, subtract 20% and use that value. @@ -22,7 +22,7 @@ Index: src/cf.data.pre 'L1' is the number of first-level subdirectories which will be created under the 'Directory'. The default is 16. -@@ -3755,7 +3761,7 @@ DOC_START +@@ -3798,7 +3804,7 @@ DOC_START NOCOMMENT_START # Uncomment and adjust the following to add a disk cache directory. @@ -31,7 +31,7 @@ Index: src/cf.data.pre NOCOMMENT_END DOC_END -@@ -4431,7 +4437,7 @@ DOC_END +@@ -4474,7 +4480,7 @@ DOC_END NAME: logfile_rotate TYPE: int diff --git a/squid.changes b/squid.changes index e4b756b..4ab1313 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Jun 4 22:31:30 UTC 2015 - mpluskal@suse.com + +- Update to 3.5.5 + * Regression Bug 4132: short_icon_urls with + global_internal_static on + * Bug 4238: assertion Read.cc:205: "params.data == data" + * Bug 4236: SSL negotiation error of 'success' + * Bug 3930: assertion 'connIsUsable(http->getConn())' + * Fix assertion MemBuf.cc:380: "new_cap > (size_t) capacity" in + SSL I/O buffer + * Fix assertion errorpage.cc:600: "entry->isEmpty()" + * Fix comm_connect_addr on failures returns Comm:OK + * Fix missing external ACL helper notes + * Fix "Not enough space to hold server hello message" error + message + * Fix segmentation fault inside + Adaptation::Icap::Xaction::swanSong + * Prevent unused ssl_crtd helpers being run +- Update permission in logrotate config +- Refresh squid-config.patch + ------------------------------------------------------------------- Fri May 22 17:43:50 UTC 2015 - mpluskal@suse.com diff --git a/squid.logrotate b/squid.logrotate index d432dc1..30491b6 100644 --- a/squid.logrotate +++ b/squid.logrotate @@ -7,7 +7,7 @@ size=+4096k notifempty missingok - create 640 squid root + create 640 squid squid sharedscripts postrotate /usr/bin/systemctl -q is-active squid.service && /usr/sbin/squid -k rotate diff --git a/squid.spec b/squid.spec index a6253a2..460417b 100644 --- a/squid.spec +++ b/squid.spec @@ -20,7 +20,7 @@ %define squidconfdir %{_sysconfdir}/squid Name: squid -Version: 3.5.4 +Version: 3.5.5 Release: 0 Summary: A fully featured HTTP/1.0 proxy License: GPL-2.0+