From c0c0b25067d5588347ae437060d62114c8ae026cd470415f9cd9a8272cf230f3 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sun, 13 Jan 2013 20:38:48 +0000 Subject: [PATCH] Accepting request 148340 from home:computersalat:devel:proxy update to 3.2.6, fix for CVE-2012-5643 OBS-URL: https://build.opensuse.org/request/show/148340 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=28 --- RELEASENOTES.html | 6 +++--- squid-3.2.5.tar.bz2 | 3 --- squid-3.2.5.tar.bz2.asc | 20 -------------------- squid-3.2.6.tar.bz2 | 3 +++ squid-3.2.6.tar.bz2.asc | 20 ++++++++++++++++++++ squid-config.patch | 8 ++++---- squid-nobuilddates.patch | 4 ++-- squid.changes | 13 +++++++++++++ squid.spec | 8 ++++---- 9 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 squid-3.2.5.tar.bz2 delete mode 100644 squid-3.2.5.tar.bz2.asc create mode 100644 squid-3.2.6.tar.bz2 create mode 100644 squid-3.2.6.tar.bz2.asc diff --git a/RELEASENOTES.html b/RELEASENOTES.html index 0d726a9..d7d87ca 100644 --- a/RELEASENOTES.html +++ b/RELEASENOTES.html @@ -2,10 +2,10 @@ - Squid 3.2.5 release notes + Squid 3.2.6 release notes -

Squid 3.2.5 release notes

+

Squid 3.2.6 release notes

Squid Developers

@@ -72,7 +72,7 @@ for Applied Network Research and members of the Web Caching community.

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.2.5 for +

The Squid Team are pleased to announce the release of Squid-3.2.6 for testing.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.2/ or the diff --git a/squid-3.2.5.tar.bz2 b/squid-3.2.5.tar.bz2 deleted file mode 100644 index 58bc247..0000000 --- a/squid-3.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a823de016ca80680f979f3c74ba481775062b4de5924b21d58d1863254283912 -size 2893104 diff --git a/squid-3.2.5.tar.bz2.asc b/squid-3.2.5.tar.bz2.asc deleted file mode 100644 index 848369a..0000000 --- a/squid-3.2.5.tar.bz2.asc +++ /dev/null @@ -1,20 +0,0 @@ -File: squid-3.2.5.tar.bz2 -Date: Mon Dec 10 10:16:15 UTC 2012 -Size: 2893104 -MD5 : ddb329f92056aa58a56db6a2eeea0c02 -SHA1: 6b945d41a9c0e993b978186b846035a241e79a7e -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.4.12 (GNU/Linux) - -iQEcBAABAgAGBQJQxcSsAAoJELJo5wb/XPRjikEIANGXmlZFreiKJm7GjCf3FIOT -Relj7MfKAY6smt0RqZVFoOSnNRf59NQbkkHkDlXKOkUWwtbWRb0U0YQo5Zi0BHlf -yw4xtkw1kbTLR5TCayLvuViBjMajC0Rjca22YnK0CttijG7qQOmTtX0JVYMZZHBl -WTKv9rckXz9fmeLTCH57TGz1H1ekAzC2gmY/AzYqmlgDvuioZPnhgiQUgfqsnmII -pxwUXNldZ0eK/WOwKGi+ReyWSgR4P/nlko3K28/yomADWYSH/al1xFmVWxeJPdoq -ejzYCA1KYg4jYszscLOuUW/2ajnzXpxl3a2R7oilg6hRir22j+QZiGnbU/DItTo= -=0bG7 ------END PGP SIGNATURE----- diff --git a/squid-3.2.6.tar.bz2 b/squid-3.2.6.tar.bz2 new file mode 100644 index 0000000..d177719 --- /dev/null +++ b/squid-3.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d48567bdd703e86900b9456f8bbdb554729fa15f579c6f2212bcd2ab6dca3324 +size 2893158 diff --git a/squid-3.2.6.tar.bz2.asc b/squid-3.2.6.tar.bz2.asc new file mode 100644 index 0000000..ff7af0f --- /dev/null +++ b/squid-3.2.6.tar.bz2.asc @@ -0,0 +1,20 @@ +File: squid-3.2.6.tar.bz2 +Date: Wed Jan 9 02:06:27 UTC 2013 +Size: 2893158 +MD5 : 87915ad83aebafc7af6871c770b23339 +SHA1: 00d6020959bc2ebb5ce1e1037211bb143c6ec1e4 +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.4.12 (GNU/Linux) + +iQEcBAABAgAGBQJQ7NRJAAoJELJo5wb/XPRjRe4H/RHn9uno3yFoGdGvUKISB9rK +q458KYXJpSNi5PgUjykS9p/lfqFYPaDVRjhlcwReLdVepE0TqNSB2c9sAHmjNWDv +kWT3FORiWcDe69LuYZx1q88MMJ95vBZI/c91zTFDfCMi0tq8lopfDOfU9sFhkeaB ++8vGVFOx+IF79SZCq8mqdrjGpQPapuRA9Tx0Yj49iYsyVVTkwqJafjTfTyCk0udA +GivODIFZcjvz4zDRMwsI4z7LkOsQuyfYM7jiUCOc2O9JI6WqVkor5b01CxdPtZdt +UnGfBaGMOPed6kWy45fiiTx2qLaCcwoIvXv20yFQErSfIukSwx5h5CkuGll5EpU= +=hlS1 +-----END PGP SIGNATURE----- diff --git a/squid-config.patch b/squid-config.patch index ae84764..da04662 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 -@@ -1073,6 +1073,8 @@ http_access deny CONNECT !SSL_ports +@@ -1081,6 +1081,8 @@ http_access deny CONNECT !SSL_ports # 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 -@@ -2774,6 +2776,10 @@ DOC_START +@@ -2782,6 +2784,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. -@@ -2888,7 +2894,7 @@ DOC_START +@@ -2896,7 +2902,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 -@@ -3395,7 +3401,7 @@ DOC_END +@@ -3407,7 +3413,7 @@ DOC_END NAME: logfile_rotate TYPE: int diff --git a/squid-nobuilddates.patch b/squid-nobuilddates.patch index 4763a1f..2b83669 100644 --- a/squid-nobuilddates.patch +++ b/squid-nobuilddates.patch @@ -37,7 +37,7 @@ Index: helpers/external_acl/LM_group/ext_lm_group_acl.cc =================================================================== --- helpers/external_acl/LM_group/ext_lm_group_acl.cc.orig +++ helpers/external_acl/LM_group/ext_lm_group_acl.cc -@@ -545,8 +545,7 @@ main(int argc, char *argv[]) +@@ -546,8 +546,7 @@ main(int argc, char *argv[]) if (!DefaultDomain) DefaultDomain = xstrdup(machinedomain); } @@ -90,7 +90,7 @@ Index: helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc =================================================================== --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc.orig +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc -@@ -680,7 +680,7 @@ manage_request() +@@ -683,7 +683,7 @@ manage_request() int main(int argc, char *argv[]) { diff --git a/squid.changes b/squid.changes index 3eb9dbe..19cc5f6 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jan 13 20:09:22 UTC 2013 - chris@computersalat.de + +- Changes to squid-3.2.6 (09 Jan 2013): + - Regression Bug 3731: TOS setsockopt() requires int value + - Regression Bug 3712: Rotating logs overwrites the previous log + - Bug 3727: LLVM compile errors in kerberos_ldap_group + - Bug 3650: Negotiate auth missing challenge token + - Additional fixes for CVE-2012-5643 / SQUID:2012-1 + * http://www.squid-cache.org/Advisories/SQUID-2012_1.txt + * http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5643 +- rebase nobuilddates, config patches + ------------------------------------------------------------------- Sun Dec 30 14:56:38 UTC 2012 - chris@computersalat.de diff --git a/squid.spec b/squid.spec index a268359..c17dab8 100644 --- a/squid.spec +++ b/squid.spec @@ -1,7 +1,7 @@ # # spec file for package squid # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Name: squid Summary: Squid Version 3.2 WWW Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 3.2.5 +Version: 3.2.6 Release: 0 Url: http://www.squid-cache.org/Versions/v3/3.2 Source0: http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2 @@ -135,8 +135,8 @@ The most important of these new features are: * Cache Manager access changes First STABLE release Date: 02 Aug 2010 - Latest Release: 3.2.5 - Latest Release Date: 10 Dec 2012 + Latest Release: 3.2.6 + Latest Release Date: 08 Jan 2013 %prep %gpg_verify %{S:1}