Prep for 4.0.12 and 3.5.20

diff --git a/ChangeLog b/ChangeLog
index 321c6aea1fe383924b06d0bca80fd74d42897340..721be9607aebb0c7a57b3452e1c8d9bbbc47636f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes to squid-4.0.12 (01 Jul 2016):
+
+       - Regression Fix: shell issues with require_smblib definition
+       - Regression Bug 4532: pid_filename not working as documented
+       - Regression Bug 4504: Too many WARNING: Ignoring error setting CA certificate locations
+       - Bug 4516: security_file_certgen man page update
+       - Bug 4446: undefined reference to 'libecap::Name::Name'
+       - Bug 4376: clang cannot build Squid eCAP code
+       - HTTP/1.1: Update all stored headers on 304 revalidation
+       - TLS: Authority Key Identifier certificate extension
+       - Add a script to find kid-specific cache.log lines
+       - Cleanup cppunit detection and use
+       - ... and several performance improvements
+       - ... and some unit test updates
+       - ... and all fixes from 3.5.20
+
 Changes to squid-4.0.11 (09 Jun 2016):
 
        - Bug 4517: error: comparison between signed and unsigned integer
@@ -172,6 +188,25 @@ Changes to squid-4.0.1 (14 Oct 2015):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.5.20 (01 Jul 2016):
+
+       - Bug 4523: smblib compile fails on NetBSD
+       - Bug 4485: off-by-one out-of-bounds Parser::Tokenizer::int64() read errors
+       - Bug 3579: assertion failed 'MemPools[type]' from dst_as ACL
+       - Fix icons loading speed
+       - Fix OpenSSL detection on FreeBSD
+       - Fix assertion failed: Write.cc:38: 'fd_table[conn->fd].flags.open'
+       - Fix SEGFAULT parsing malformed adaptation service configuration
+       - Fix ConnStateData::In::maybeMakeSpaceAvailable() logic
+       - Do not override user defined -std option
+       - Do not allow low-level debugging to hide important/critical messages
+       - Do not make bogus recvmsg(2) calls when closing UDS sockets
+       - Support unified EUI format code in external_acl_type
+
+Changes to squid-3.5.19 (09 May 2016):
+
+       - Regression Bug 4515: interception proxy hangs
+
 Changes to squid-3.5.18 (06 May 2016):
 
        - Bug 4510: stale comment about 32KB limit on shared memory cache entries

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 7c9d25cd024602f5b799c7884ba1cbfb369c7796..7f58f9e56fce5bab997e5055f82c82c3fb94c83a 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.5.18 release notes</title>
+<title>Squid 3.5.20 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.5.18.
+The Squid Team are pleased to announce the release of Squid-3.5.20.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.
@@ -364,6 +364,10 @@ This section gives a thorough account of those changes in three categories:
        <tag>sslproxy_cert_sign_hash</tag>
        <p>New directive to set the hashing algorithm to use when signing generated certificates.
 
+       <tag>sslproxy_foreign_intermediate_certs</tag>
+       <p>New directive to load intermediate certificates for validating server
+          certificate chains. This directive is only available in 3.5.13 and later.
+
        <tag>sslproxy_session_cache_size</tag>
        <p>New directive which sets the cache size to use for TLS/SSL sessions cache.
 
@@ -452,6 +456,7 @@ This section gives a thorough account of those changes in three categories:
        <p>New format code <em>%ssl::&lt;cert_subject</em> to send SSL server certificate DN.
        <p>New format code <em>%ssl::&lt;cert_issuer</em> to send SSL server certificate issuer DN.
        <p>New format code <em>%un</em> to send any available user name (requires 3.5.7 or later).
+       <p>New format code <em>%&gt;eui</em> to send either EUI-48 or EUI-64 (requires 3.5.20 or later).
        <p>New response kv-pair <em>clt_conn_tag=</em> to associates a given tag with the client TCP connection.
 
        <tag>forward_max_tries</tag>

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 2c85ff6dd718e81bd1f593630bf374afe5f67e13..25971bb7b297c8eaf60880c333f391556c5df871 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.0.11 release notes</title>
+<title>Squid 4.0.12 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.0.11 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.12 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.