From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 31 Oct 2014 08:19:44 +0000 (-0700)
Subject: Prep for 3.5.0.2 and 3.4.9
X-Git-Tag: merge-candidate-3-v1~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf611e3a5a952ce4666a23a649d21e2c5bd6f944;p=thirdparty%2Fsquid.git

Prep for 3.5.0.2 and 3.4.9
---

diff --git a/ChangeLog b/ChangeLog
index c01a41b790..dbd22be4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes to squid-3.5.0.2 (31 Oct 2014):
+
+	- Fix FTP socket opening during reconfigure
+	- ... and all changes from 3.4.9
+	- ... and some build errors in rarely used code
+	- ... and several documentation updates
+
 Changes to squid-3.5.0.1 (17 Oct 2014):
 
 	- Port from 2.7: redirector and logging urlgroup feature
@@ -64,6 +71,18 @@ Changes to squid-3.5.0.1 (17 Oct 2014):
 	- ... and many error page translation updates
 	- ... and much code cleanup and polishing
 
+Changes to squid-3.4.9 (31 Oct 2014):
+
+	- Regression fix: ext_kerberos_ldap_group_acl typo in 3.4.7 update
+	- Bug 4102: sslbump cert contains only a dot character in key usage extension
+	- Bug 4093: source-maintenance.sh errors and warnings due to wrong tools/options
+	- Bug 4088: memory leak in external_acl_type helper with cache=0 or ttl=0
+	- Bug 4024: Bad host/IP ::1 when using IPv4-only environment
+	- Bug 3803: ident leaks memory on failure
+	- kerberos_ldap_group/cert_tool: Remove ksh dependency
+	- ... and some automated code style updates
+	- ... and some documentation updates
+
 Changes to squid-3.4.8 (15 Sep 2014):
 
 	- Fix off by one in SNMP subsystem
diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml
index 6a5b4061e6..8cb299f60f 100644
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.4.8 release notes</title>
+<title>Squid 3.4.9 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.4.8 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.9 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.4/"> or the
  <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index a3de670607..f30803afde 100644
--- 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.0.1 release notes</title>
+<title>Squid 3.5.0.2 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.0.1 for testing.
+The Squid Team are pleased to announce the release of Squid-3.5.0.2 for testing.
 
 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/Mirrors/http-mirrors.html" name="mirrors">.