diff -u -r -N squid-3.2.5/ChangeLog squid-3.2.6/ChangeLog
--- squid-3.2.5/ChangeLog 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/ChangeLog 2013-01-09 14:41:51.000000000 +1300
@@ -1,3 +1,11 @@
+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
+
Changes to squid-3.2.5 (10 Dec 2012):
- Bug 3698: Add missing include of errno.h
@@ -451,6 +459,10 @@
- ... and a great many testing improvements
- ... and many documentation updates
+Changes to squid-3.1.23 (09 Jan 2013):
+
+ - Additional fixes for CVE-2012-5643 / SQUID:2012-1
+
Changes to squid-3.1.22 (03 Dec 2012):
- Bug 3685: Squid hangs in Delay Pools ClassCBucket::update
diff -u -r -N squid-3.2.5/configure squid-3.2.6/configure
--- squid-3.2.5/configure 2012-12-10 22:54:50.000000000 +1300
+++ squid-3.2.6/configure 2013-01-09 14:42:47.000000000 +1300
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.5.
+# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.6.
#
# Report bugs to .
#
@@ -575,8 +575,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.2.5'
-PACKAGE_STRING='Squid Web Proxy 3.2.5'
+PACKAGE_VERSION='3.2.6'
+PACKAGE_STRING='Squid Web Proxy 3.2.6'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
PACKAGE_URL=''
@@ -1571,7 +1571,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Squid Web Proxy 3.2.5 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1641,7 +1641,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.2.5:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.2.6:";;
esac
cat <<\_ACEOF
@@ -2019,7 +2019,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.2.5
+Squid Web Proxy configure 3.2.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3115,7 +3115,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 3.2.5, which was
+It was created by Squid Web Proxy $as_me 3.2.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3934,7 +3934,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.2.5'
+ VERSION='3.2.6'
cat >>confdefs.h <<_ACEOF
@@ -30894,7 +30894,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 3.2.5, which was
+This file was extended by Squid Web Proxy $as_me 3.2.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30960,7 +30960,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Squid Web Proxy config.status 3.2.5
+Squid Web Proxy config.status 3.2.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -u -r -N squid-3.2.5/configure.ac squid-3.2.6/configure.ac
--- squid-3.2.5/configure.ac 2012-12-10 22:54:50.000000000 +1300
+++ squid-3.2.6/configure.ac 2013-01-09 14:42:47.000000000 +1300
@@ -1,4 +1,4 @@
-AC_INIT([Squid Web Proxy],[3.2.5],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.2.6],[http://bugs.squid-cache.org/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.2.5/helpers/basic_auth/DB/basic_db_auth.8 squid-3.2.6/helpers/basic_auth/DB/basic_db_auth.8
--- squid-3.2.5/helpers/basic_auth/DB/basic_db_auth.8 2012-12-10 23:13:05.000000000 +1300
+++ squid-3.2.6/helpers/basic_auth/DB/basic_db_auth.8 2013-01-09 15:05:47.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 1"
-.TH BASIC_DB_AUTH 1 "2012-12-10" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 1 "2013-01-08" "perl v5.10.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 -u -r -N squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_ldap.cc squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
--- squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2013-01-09 14:41:51.000000000 +1300
@@ -109,9 +109,6 @@
void *params)
{
struct ldap_creds *cp = (struct ldap_creds *) params;
- url = url;
- request = request;
- msgid = msgid;
return tool_sasl_bind(ld, cp->dn, cp->pw);
}
#endif
@@ -127,9 +124,6 @@
void *params)
{
struct ldap_creds *cp = (struct ldap_creds *) params;
- url = url;
- request = request;
- msgid = msgid;
return ldap_bind_s(ld, cp->dn, cp->pw, LDAP_AUTH_SIMPLE);
}
@@ -192,9 +186,6 @@
void *params)
{
struct ldap_creds *cp = (struct ldap_creds *) params;
- url = url;
- request = request;
- msgid = msgid;
return tool_sasl_bind(ld, cp->dn, cp->pw);
}
#endif
@@ -211,9 +202,6 @@
{
struct ldap_creds *cp = (struct ldap_creds *) params;
- url = url;
- request = request;
- msgid = msgid;
return ldap_bind_s(ld, cp->dn, cp->pw, LDAP_AUTH_SIMPLE);
}
diff -u -r -N squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_sasl.cc squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_sasl.cc
--- squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2013-01-09 14:41:51.000000000 +1300
@@ -136,7 +136,6 @@
{
const char *dflt = interact->defresult;
- flags = flags;
switch (interact->id) {
case SASL_CB_GETREALM:
if (defaults)
diff -u -r -N squid-3.2.5/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.2.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-3.2.5/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2012-12-10 23:13:17.000000000 +1300
+++ squid-3.2.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-01-09 15:05:51.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1"
-.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2012-12-10" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-01-08" "perl v5.10.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 -u -r -N squid-3.2.5/helpers/log_daemon/file/log_file_daemon.cc squid-3.2.6/helpers/log_daemon/file/log_file_daemon.cc
--- squid-3.2.5/helpers/log_daemon/file/log_file_daemon.cc 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/helpers/log_daemon/file/log_file_daemon.cc 2013-01-09 14:41:51.000000000 +1300
@@ -61,8 +61,8 @@
fprintf(stderr, "WARNING: remove '%s' failure: %s\n", to, xstrerror());
}
#endif
- if (rename(path, to) < 0 && errno != ENOENT) {
- fprintf(stderr, "WARNING: rename '%s' to '%s' failure: %s\n", path, to, xstrerror());
+ if (rename(from, to) < 0 && errno != ENOENT) {
+ fprintf(stderr, "WARNING: rename '%s' to '%s' failure: %s\n", from, to, xstrerror());
}
}
if (rotate_count > 0) {
diff -u -r -N squid-3.2.5/include/version.h squid-3.2.6/include/version.h
--- squid-3.2.5/include/version.h 2012-12-10 22:54:51.000000000 +1300
+++ squid-3.2.6/include/version.h 2013-01-09 14:42:47.000000000 +1300
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1355133201
+#define SQUID_RELEASE_TIME 1357695708
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.2.5/RELEASENOTES.html squid-3.2.6/RELEASENOTES.html
--- squid-3.2.5/RELEASENOTES.html 2012-12-10 23:15:13.000000000 +1300
+++ squid-3.2.6/RELEASENOTES.html 2013-01-09 15:06:07.000000000 +1300
@@ -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 @@
-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 -u -r -N squid-3.2.5/src/auth/negotiate/auth_negotiate.cc squid-3.2.6/src/auth/negotiate/auth_negotiate.cc
--- squid-3.2.5/src/auth/negotiate/auth_negotiate.cc 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/src/auth/negotiate/auth_negotiate.cc 2013-01-09 14:41:51.000000000 +1300
@@ -67,9 +67,6 @@
static int authnegotiate_initialised = 0;
/// \ingroup AuthNegotiateInternal
-Auth::Negotiate::Config negotiateConfig;
-
-/// \ingroup AuthNegotiateInternal
static hash_table *proxy_auth_cache = NULL;
/*
@@ -293,7 +290,7 @@
Auth::UserRequest::Pointer
Auth::Negotiate::Config::decode(char const *proxy_auth)
{
- Auth::Negotiate::User *newUser = new Auth::Negotiate::User(&negotiateConfig);
+ Auth::Negotiate::User *newUser = new Auth::Negotiate::User(Auth::Config::Find("negotiate"));
Auth::UserRequest *auth_user_request = new Auth::Negotiate::UserRequest();
assert(auth_user_request->user() == NULL);
diff -u -r -N squid-3.2.5/src/ip/Qos.cci squid-3.2.6/src/ip/Qos.cci
--- squid-3.2.5/src/ip/Qos.cci 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/src/ip/Qos.cci 2013-01-09 14:41:51.000000000 +1300
@@ -4,8 +4,13 @@
int
Ip::Qos::setSockTos(const Comm::ConnectionPointer &conn, tos_t tos)
{
-#ifdef IP_TOS
- int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos_t));
+#if defined(IP_TOS)
+ // Bug 3731: FreeBSD produces 'invalid option'
+ // unless we pass it a 32-bit variable storing 8-bits of data.
+ // NP: it is documented as 'int' for all systems, even those like Linux which accept 8-bit char
+ // so we convert to a int before setting.
+ int bTos = tos;
+ int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &bTos, sizeof(bTos));
if (x < 0)
debugs(50, 2, "Ip::Qos::setSockTos: setsockopt(IP_TOS) on " << conn << ": " << xstrerror());
return x;
diff -u -r -N squid-3.2.5/tools/cachemgr.cc squid-3.2.6/tools/cachemgr.cc
--- squid-3.2.5/tools/cachemgr.cc 2012-12-10 22:53:26.000000000 +1300
+++ squid-3.2.6/tools/cachemgr.cc 2013-01-09 14:41:51.000000000 +1300
@@ -980,10 +980,10 @@
// limit the input to something reasonable.
// 4KB should be enough for the GET/POST data length, but may be extended.
- size_t bufLen = (len >= 4096 ? len : 4095);
+ size_t bufLen = (len < 4096 ? len : 4095);
char *buf = (char *)xmalloc(bufLen + 1);
- size_t readLen = fread(buf, bufLen, 1, stdin);
+ size_t readLen = fread(buf, 1, bufLen, stdin);
if (readLen == 0) {
xfree(buf);
return NULL;
@@ -992,9 +992,9 @@
len -= readLen;
// purge the remainder of the request entity
- while (len > 0) {
+ while (len > 0 && readLen) {
char temp[65535];
- readLen = fread(temp, 65535, 1, stdin);
+ readLen = fread(temp, 1, 65535, stdin);
len -= readLen;
}