From 921e22a00d5ca4ccdad752153a1d4d2a865ce2befae14390aab00240d99e819a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 9 Dec 2015 10:49:54 +0000 Subject: [PATCH] Accepting request 348053 from server:proxy:Test - Update to 4.0.3 OBS-URL: https://build.opensuse.org/request/show/348053 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=95 --- squid-4.0.1.tar.xz | 3 --- squid-4.0.1.tar.xz.asc | 20 -------------------- squid-4.0.3.tar.xz | 3 +++ squid-4.0.3.tar.xz.asc | 20 ++++++++++++++++++++ squid-brokenad.patch | 8 ++++---- squid-config.patch | 6 +++--- squid.changes | 31 +++++++++++++++++++++++++++++++ squid.spec | 2 +- 8 files changed, 62 insertions(+), 31 deletions(-) delete mode 100644 squid-4.0.1.tar.xz delete mode 100644 squid-4.0.1.tar.xz.asc create mode 100644 squid-4.0.3.tar.xz create mode 100644 squid-4.0.3.tar.xz.asc diff --git a/squid-4.0.1.tar.xz b/squid-4.0.1.tar.xz deleted file mode 100644 index c601d36..0000000 --- a/squid-4.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:170ef2db8a8d9416c27389d03ec0bed565b500e9c579ef17ed3308e338984cef -size 2337656 diff --git a/squid-4.0.1.tar.xz.asc b/squid-4.0.1.tar.xz.asc deleted file mode 100644 index 0a8fa43..0000000 --- a/squid-4.0.1.tar.xz.asc +++ /dev/null @@ -1,20 +0,0 @@ -File: squid-4.0.1.tar.xz -Date: Wed Oct 14 07:12:20 UTC 2015 -Size: 2337656 -MD5 : 95c2e01bd5ff09185fe9c4afa0ce746a -SHA1: da5c117c4431b2a9fb743466078c4d7e1be8a1f4 -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 - -iQEcBAABAgAGBQJWHgUWAAoJELJo5wb/XPRjY8gH/RZNaVmDq64CpxtZDOCfyk3+ -ye0ae20GuwJ3Ms19el+KwkRWin4SHs0ESNcrpRXjV+B+ponPQW/yAeqC+3TFqVTq -cDw+IWX52cN4zg9v5BEHvkWYSu7Fa/BjNdxweaR9D7tLYv0r/I1kNFuqK0eqecRi -MKilw8gfbq6V+fdGJqAc+Le87ZUkqx0B9YWsYkn5W0HWLLnT+WzAyrXULTbTCAAI -AMpTlAOz091pXI6gJRTBuKLMzXS5OL05BJn+3jq0J7BABXEsy9Ja7OLUPzBe24gL -4MtvVi5b6oFfFcXz4Plxf5/F9mBKT7AKbJTUYijLQ/FkQzdxx4BbUIfCNa9II+g= -=uXim ------END PGP SIGNATURE----- diff --git a/squid-4.0.3.tar.xz b/squid-4.0.3.tar.xz new file mode 100644 index 0000000..be2c353 --- /dev/null +++ b/squid-4.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81986fe42f2ee1423452799a9e9b3e0d575543e945fa922175ecbb80c9827947 +size 2341200 diff --git a/squid-4.0.3.tar.xz.asc b/squid-4.0.3.tar.xz.asc new file mode 100644 index 0000000..d4f1d99 --- /dev/null +++ b/squid-4.0.3.tar.xz.asc @@ -0,0 +1,20 @@ +File: squid-4.0.3.tar.xz +Date: Sat Nov 28 16:16:30 UTC 2015 +Size: 2341200 +MD5 : 1b2c7e775d494993ea260ba959515162 +SHA1: 039396491f13c2da8f20252cce16509ce31ccaf3 +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 + +iQEcBAABAgAGBQJWWdSjAAoJELJo5wb/XPRjxtQIAMmFTrgiFwNo0gioSaUG7m8l +7VlewDor+dRzhJ+KYPt0VhLbO8V6KjgoDmp1ISDpnQ3PgQaFP1v0tLLh5pfGRuUf +rO8OQEowrmxIu/oe9/8Reh3ci1nsT/xXFC1DBWxhVwzy1I081xzmuEDS5s0OqhtE +PlcyOPmWhT5fYiNfzmdIuJC+3NWW8k82nOtbFlR4vWdjtHWaIaZjgb3MCW3Y2mgb +1dPSEUDLbB7V70qN8iE9pwh923eRMo7Y6u9ejImxbYzwZVA3kn/bnqyPFCAbYVmg +D6fPumqfh5wab2Et1csNNK2daxpEelaAFTFX7eEUBLfRWCepDYU1U5KKtUxNaeg= +=eU8K +-----END PGP SIGNATURE----- diff --git a/squid-brokenad.patch b/squid-brokenad.patch index 0db4b6a..5912fb7 100644 --- a/squid-brokenad.patch +++ b/squid-brokenad.patch @@ -35,7 +35,7 @@ Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc =================================================================== --- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc.orig +++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc -@@ -66,6 +66,7 @@ init_args(struct main_args *margs) +@@ -79,6 +79,7 @@ init_args(struct main_args *margs) margs->AD = 0; margs->mdepth = 5; margs->nokerberos = 0; @@ -43,7 +43,7 @@ Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc margs->ddomain = NULL; margs->groups = NULL; margs->ndoms = NULL; -@@ -189,7 +190,7 @@ main(int argc, char *const argv[]) +@@ -202,7 +203,7 @@ main(int argc, char *const argv[]) init_args(&margs); @@ -52,7 +52,7 @@ Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc switch (opt) { case 'd': debug_enabled = 1; -@@ -206,6 +207,9 @@ main(int argc, char *const argv[]) +@@ -219,6 +220,9 @@ main(int argc, char *const argv[]) case 'n': margs.nokerberos = 1; break; @@ -62,7 +62,7 @@ Index: helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc case 'g': margs.glist = xstrdup(optarg); break; -@@ -261,6 +265,7 @@ main(int argc, char *const argv[]) +@@ -274,6 +278,7 @@ main(int argc, char *const argv[]) fprintf(stderr, "-l ldap url\n"); fprintf(stderr, "-b ldap bind path\n"); fprintf(stderr, "-s use SSL encryption with Kerberos authentication\n"); diff --git a/squid-config.patch b/squid-config.patch index 098ccdc..e8d1580 100644 --- a/squid-config.patch +++ b/squid-config.patch @@ -11,7 +11,7 @@ Index: src/cf.data.pre http_access allow localhost # And finally deny all other access to this proxy -@@ -3645,6 +3647,10 @@ DOC_START +@@ -3672,6 +3674,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. -@@ -3763,7 +3769,7 @@ DOC_START +@@ -3790,7 +3796,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 -@@ -4477,7 +4483,7 @@ DOC_END +@@ -4504,7 +4510,7 @@ DOC_END NAME: logfile_rotate TYPE: int diff --git a/squid.changes b/squid.changes index 2a1c130..dddbd6b 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Dec 9 10:11:36 UTC 2015 - mpluskal@suse.com + +- Update to 4.0.3 + * Bug 4372: missing template files + * Bug 4371: compile errors: no such file or directory: + DiskIO/*/*DiskIOModule.o + * Bug 4368: A simpler and more robust HTTP request line parser + * Fix compile erorr on clang undefined reference to + '__atomic_load_8' + * ext_kerberos_ldap_group_acl: Add missing workarounds for + Heimdal Kerberos + * ext_ldap_group_acl: Allow unlimited LDAP search filter + * ext_unix_group_acl: Support -r parameter to strip @REALM from + usernames + * ... and much code cleanup and polishing + * ... and all fixes from squid 3.5.11 +- Changes for squid-4.0.2 + * Regression Bug 4351: compile errors when authentication modules + disabled + * Regression fix: HTTP/1.1 Transfer-Encoding:chunked parsing + * Bug 4359: assertion failure 'Comm::IsConnOpen(conn)' within + ConnStateData::requestTimeout + * Bug 4356: segmentation fault using proxy_auth ACL + * Bug 4352: compile errors in OS X 10.11 + * Bug 4021: ext_user_regex does exact match + * Bug 3574: avoid crashes, prohibit reconfiguration during + shutdown + * Support re-assigning delay pools based on HTTP reply details + * ... and all fixes from squid 3.5.11 + ------------------------------------------------------------------- Sat Dec 5 00:36:04 UTC 2015 - boris@steki.net diff --git a/squid.spec b/squid.spec index 7743269..cc9265f 100644 --- a/squid.spec +++ b/squid.spec @@ -20,7 +20,7 @@ %define squidconfdir %{_sysconfdir}/squid Name: squid -Version: 4.0.1 +Version: 4.0.3 Release: 0 Summary: A fully featured HTTP/1.0 proxy License: GPL-2.0+