From 54e082d610a9f5148385f024069a7c167e2d029c Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Fri, 11 Aug 2023 11:09:52 +0200
Subject: [PATCH 1/2] Use Varnish 6.0.11 LTS.

---
 CHANGES.rst                    | 6 ++++--
 plone/recipe/varnish/recipe.py | 4 ++--
 setup.py                       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cc2bde2..f6b922e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,10 @@
 Changelog
 =========
 
-6.0.10.1 (unreleased)
----------------------
+6.0.11 (unreleased)
+-------------------
+
+- Use Varnish 6.0.11 LTS.  [maurits]
 
 - Allow to configure storages other than file and malloc (https://varnish-cache.org/docs/trunk/users-guide/storage-backends.html)
   [mamico]
diff --git a/plone/recipe/varnish/recipe.py b/plone/recipe/varnish/recipe.py
index 8f818d0..42ee06c 100644
--- a/plone/recipe/varnish/recipe.py
+++ b/plone/recipe/varnish/recipe.py
@@ -9,9 +9,9 @@
 import zc.buildout
 
 
-DOWNLOAD_URL = "https://varnish-cache.org/_downloads/varnish-6.0.10.tgz"
+DOWNLOAD_URL = "https://varnish-cache.org/_downloads/varnish-6.0.11.tgz"
 VMODS_DOWNLOAD_URL = "https://github.com/varnish/varnish-modules/archive/0.15.1.tar.gz"
-SUPPORTED_VERSION = "6.0.10"
+SUPPORTED_VERSION = "6.0.11"
 
 COOKIE_WHITELIST_DEFAULT = """\
 statusmessages
diff --git a/setup.py b/setup.py
index 4c2ca74..cccf540 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ def run_tests(self):
 
 # versioning scheme: major/minor (positions 1-2) matches: supported varnish 6.0 LTS.
 # position 3: plone.recipe.varnish patch release X.
-version = '6.0.10.1.dev0'
+version = '6.0.11.dev0'
 
 setup(
     name='plone.recipe.varnish',

From 12152a658f60767aa0e90b8cedd41af7223e568c Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Fri, 11 Aug 2023 11:15:26 +0200
Subject: [PATCH 2/2] Removed --clear from virtualenv call.

Bootstrapping and testing needs a bigger overhaul, but meanwhile let's not delete the current directory when using virtualenv 20+...
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index d154325..9ba801b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 rm -r ./lib ./include ./local ./bin
-virtualenv -p python2.7 --clear .
+virtualenv -p python2.7 .
 ./bin/pip install --upgrade -r requirements.txt
 ./bin/buildout