From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Wed, 7 Mar 2018 04:21:08 +0000 (+1300)
Subject: Prep for 4.0.24 (#168)
X-Git-Tag: M-staged-PR177~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2db9989c5c4397458ef9ef43f8698844cd9ffcea;p=thirdparty%2Fsquid.git

Prep for 4.0.24 (#168)

Also update mkrelease.sh script for git
---

diff --git a/ChangeLog b/ChangeLog
index a5c5c0b8b9..5098d36736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Changes to squid-4.0.24 (07 Mar 2018):
+
+	- Bug 4822: Build failure (-Wformat) where time_t is not long int
+	- Bug 4505: SMP caches sometimes do not purge entries
+	- TLS: GnuTLS implementation for listening ports and client connections
+	- TPROXY: Fix clientside_mark and client port logging
+	- Native FTP: Fix "Cannot assign requested address" with TPROXY
+	- SSL-Bump: Fix authentication with types other than Basic
+	- ... and many small compile and stability fixes
+	- ... and some documentation fixes
+
 Changes to squid-4.0.23 (19 Jan 2018):
 
 	- Bug 4715: security_file_certgen: Remove -g and -n options docs
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index e6709859f4..9bc34cb773 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.23 release notes</title>
+<title>Squid 4.0.24 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.23 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.24 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">.
@@ -176,10 +176,13 @@ Most user-facing changes are reflected in squid.conf (see below).
 
 
 <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>Squid can now be built to use GnuTLS in place of OpenSSL for the core
+   features of receiving TLS connections from clients and making TLS
+   connections to servers. The GnuTLS support is still very much experimental
+   and should be tested before use.
+
+<p>SSL-Bump and certificate generation features are not yet supported by
+   GnuTLS builds. Nor are many other less commonly used Squid TLS/SSL features.
 
 <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
diff --git a/mkrelease.sh b/mkrelease.sh
index 58f49ac506..10d5398cca 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -11,9 +11,6 @@ if [ $# -ne 1 -a $# -ne 2 ]; then
 	echo "Usage: $0 revision [destination]"
 	exit 1
 fi
-# VCS details
-module=squid3
-BZRROOT=${BZRROOT:-/bzr}
 
 # infer tags from command line details
 package=squid
@@ -39,21 +36,16 @@ tmpdir=${TMPDIR:-${PWD}}/${name}-mkrelease
 rm -rf $name.tar.gz $tmpdir
 trap "rm -rf $tmpdir" 0
 
-# AYJ 2008-03-31: add the named tag for use below.
-bzr tag $tag
-bzr export -r tag:$tag $tmpdir || exit 1
-#
-# AYJ: 2008-03-31: initial export attempt dies on 'not a branch' error.
-# bzr export $tmpdir $BZRROOT/$module/tags/$tag || exit 1
-#
-#bzr export $tmpdir $BZRROOT/$module/tags/$tag || exit 1
+mkdir ${tmpdir}
+(git archive --format=tar HEAD | tar -xC ${tmpdir}) || exit 1
+
 if [ ! -f $tmpdir/bootstrap.sh ]; then
-	echo "ERROR! Tag $tag not found in $module"
+	echo "ERROR! Tag $tag not found"
 fi
 
 cd $tmpdir
 ./bootstrap.sh
-eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
+eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-VCS//' | sed -e 's/PACKAGE_//'`
 eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
 if [ ${name} != ${PACKAGE}-${VERSION} ]; then
 	echo "ERROR! The tag and configure version numbers do not match!"
@@ -67,11 +59,11 @@ if test "x$NOTES_VERSION" = "x"; then
 	exit 1
 fi
 ed -s configure.ac <<EOS
-g/${VERSION}-BZR/ s//${VERSION}/
+g/${VERSION}-VCS/ s//${VERSION}/
 w
 EOS
 ed -s configure <<EOS
-g/${VERSION}-BZR/ s//${VERSION}/
+g/${VERSION}-VCS/ s//${VERSION}/
 w
 EOS
 ed -s include/version.h <<EOS