From cd68aa012c968d54e77af7ced8e8c881fc082e97 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 6 Feb 2017 10:14:37 +1300
Subject: [PATCH] 4.0.18

---
 ChangeLog                        | 12 ++++++++++++
 configure.ac                     |  2 +-
 doc/release-notes/release-4.sgml |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47fed9657d..8e5e5abe3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-4.0.18 (06 Feb 2017):
+
+	- Bug 4661: compile error 'warning: _XPG4_2 redefined' with GCC on Solaris 10
+	- Bug 4636: assertion 'byteCount > 0 && byteCount <= inBuf.length()'
+	- Bug 4610 partial: compile errors on Solaris 11.3 with Oracle Studio 12.5
+	- Bug 4599: support OpenSSL 1.1
+	- squidclient: link GnuTLS library debugs to -v level display
+	- Fix GCC6: unused local variable 'weInitiatedThisClosure'
+	- ... and some code polishing
+	- ... and some copyright updates
+	- ... and all fixes from 3.5.24
+
 Changes to squid-4.0.17 (16 Dec 2016):
 
 	- Bug 4630: user credentials cache cleanup not re-scheduled
diff --git a/configure.ac b/configure.ac
index 49306fc7f3..e27b06b512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[4.0.17-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.0.18-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index f9d578b94c..8b6c9126e9 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.17 release notes</title>
+<title>Squid 4.0.18 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.17 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.18 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">.
-- 
2.47.3