From: Amos Jeffries <>
Date: Sun, 2 Apr 2017 07:38:18 +0000 (+1200)
Subject: Prep for 4.0.19 and 3.5.25
X-Git-Tag: M-staged-PR71~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b84ebcce03a7a008256435b246633c223ab4a6e;p=thirdparty%2Fsquid.git

Prep for 4.0.19 and 3.5.25
---

diff --git a/ChangeLog b/ChangeLog
index 8e5e5abe3f..e96b133c64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes to squid-4.0.19 (02 Apr 2017):
+
+	- Bug 4674: delay_parameters for class 3 and 4 assertion failed
+	- Bug 4671: GCC 7 compile errors
+	- Bug 4663: GCC 5+ compile errors with optimization level -O3
+	- Bug 4657: delay IDENT until after PROXY protocol handling
+	- Bug 4610: cleanup of BerkleyDB related checks
+	- squidclient: Fix missing error handling on PUT
+	- digest_ldap_auth: Add -r option to clamp the realm to a fixed value
+	- TLS: initial GnuTLS support for encrypted server connections
+	- Fix appending Http::HdrType::VIA code
+	- Fix URI scheme case-sensitivity treatment
+	- Fix two read-ahead problems related to delay pools (or lack thereof)
+	- Detail swapfile header inconsistencies
+	- ... and several build fixes
+	- ... and many code polishing updates
+	- ... and all fixes from 3.5.25
+
 Changes to squid-4.0.18 (06 Feb 2017):
 
 	- Bug 4661: compile error 'warning: _XPG4_2 redefined' with GCC on Solaris 10
@@ -267,6 +285,18 @@ Changes to squid-4.0.1 (14 Oct 2015):
 	- ... and many documentation changes
 	- ... and much code cleanup and polishing
 
+Changes to squid-3.5.25 (02 Apr 2017):
+
+	- Bug 4688: various typo error(s) in man page(s)
+	- Bug 4508: Host forgery stalls intercepted being-spliced connections
+	- Native FTP relay: NAT and TPROXY interception fixes
+	- Fix missing CRLF on FTP timeout ABORT commands
+	- TLS: Bump client on errors encountered before ssl_bump evaluation
+	- ext_kerberos_ldap_group_acl: fix unused value warnings
+	- Fix crash when configuring with invalid delay_parameters restore value.
+	- Check that -k argument is provided before trying to use it.
+	- ... and some build fixes
+
 Changes to squid-3.5.24 (28 Jan 2017):
 
 	- Regression Bug 3940: Make 'cache deny' do what is documented
diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 7b8fa846ef..087d162660 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.24 release notes</title>
+<title>Squid 3.5.25 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.24.
+The Squid Team are pleased to announce the release of Squid-3.5.25.
 
 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">.
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 8b6c9126e9..c54e324d18 100644
--- 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.18 release notes</title>
+<title>Squid 4.0.19 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.18 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.19 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">.
@@ -31,6 +31,11 @@ This new release is available for download from <url url="http://www.squid-cache
   GCC 4.9+ and Clang 3.5+ are known to have working C++11 support and are usable.
   GCC-4.8 will also build for now despite lack of full C++11 support, but some future features may not be available.
 
+<p>This release does not support LibreSSL.
+   Due to a bug in the way LibreSSL uses the OpenSSL version macro some changes
+   necessary to support OpenSSL 1.1 prevent building with LibreSSL.
+
+
 <sect1>Changes since earlier releases of Squid-4
 <p>
 The Squid-4 change history can be <url url="http://www.squid-cache.org/Versions/v4/changesets/" name="viewed here">.
@@ -48,6 +53,7 @@ The Squid-4 change history can be <url url="http://www.squid-cache.org/Versions/
 	<item>Secure ICAP
 	<item>Improved SMP support
 	<item>Improved process management
+	<item>Initial GnuTLS support
 </itemize>
 
 Most user-facing changes are reflected in squid.conf (see below).
@@ -169,6 +175,21 @@ Most user-facing changes are reflected in squid.conf (see below).
    finished.
 
 
+<sect1>Initial GnuTLS support
+<p>If all you need is a proxy that connects over TLS/SSL to a <em>cache_peer</em>
+   or accepts <em>https://</em> URLs over clear-text and performs the necessary
+   upstream TLS connections. Then you now have the choice to build Squid with
+   GnuTLS instead of OpenSSL.
+
+<p><em>squid.conf</em> directives and configuration options which have undergone
+   name changes from 'ssl' to 'tls' prefix in Squid-4 have GnuTLS support, unless
+   explicitly stated otherwise.
+
+<p>Advanced configuration with specific selection of ciphers and similar settings
+   should still work, but needs the GnuTLS <em>Priority Strings</em> instead of
+   the OpenSSL options when using GnuTLS.
+
+
 <sect>Changes to squid.conf since Squid-3.5
 <p>
 There have been changes to Squid's configuration file since Squid-3.5.