Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 17306)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 17307)
@@ -5,8 +5,11 @@
 =======================
 
-* No changes yet
+* Upgrade packages for helper tools to Python3-compatible versions. Requires
+  new buildout run. Might require removal of existing eggs.
+
 
 1.8.1 (2023-01-16)
 ==================
+
 
 * Upgrade `dolmen.beaker` dependency. Removes other outdated crypto
Index: /main/waeup.kofa/trunk/Dockerfile
===================================================================
--- /main/waeup.kofa/trunk/Dockerfile	(revision 17306)
+++ /main/waeup.kofa/trunk/Dockerfile	(revision 17307)
@@ -31,8 +31,8 @@
 
 # we can work with official PyPI sources...
-RUN /home/kofa/py27/bin/pip download --no-binary --no-deps waeup.kofa==${KOFA_VERSION}
+# RUN /home/kofa/py27/bin/pip download --no-binary --no-deps waeup.kofa==${KOFA_VERSION}
 ## ...OR with local kofa sources (create a source pkg with `python setup.py sdist`)
 ## Please keep one of the two lines above and below commented out.
-# COPY --chown=kofa:kofa dist/waeup.kofa-${KOFA_VERSION}.tar.gz /home/kofa
+COPY --chown=kofa:kofa dist/waeup.kofa-${KOFA_VERSION}.tar.gz /home/kofa
 RUN tar -xzf waeup.kofa-${KOFA_VERSION}.tar.gz
 RUN rm waeup.kofa-${KOFA_VERSION}.tar.gz
@@ -49,10 +49,7 @@
 RUN xmlstarlet edit -L -P -S -N x="http://namespaces.zope.org/browser" --update "//x:beakerSession/@validate_key" --value "val_"`pwgen -s -1 16` etc/site.zcml.in
 
-# pin down `pip` and `setuptools` - just to ensure we have a fixed set of versions
-RUN /home/kofa/py27/bin/pip install --upgrade pip==20.3.4
+# upgrade/pin down build helpers and run the build process
+RUN /home/kofa/py27/bin/pip install --upgrade pip zc.buildout
 RUN /home/kofa/py27/bin/pip install --upgrade --force-reinstall setuptools==44.1.1
-# pin down `zc.buildout` - versions >= 3 make entry-points of installed eggs
-# invisible for `pgk_resources`
-RUN /home/kofa/py27/bin/pip install "zc.buildout<3"
 RUN /home/kofa/py27/bin/buildout
 
Index: /main/waeup.kofa/trunk/versions.cfg
===================================================================
--- /main/waeup.kofa/trunk/versions.cfg	(revision 17306)
+++ /main/waeup.kofa/trunk/versions.cfg	(revision 17307)
@@ -54,5 +54,4 @@
 RestrictedPython = 3.5.2
 rwproperty = 1.0
-setuptools = 19.2
 six = 1.10.0
 snowballstemmer = 1.2.1
@@ -72,5 +71,4 @@
 z3c.testsetup = 0.6.1
 zc.async = 1.5.4
-zc.buildout = 2.5.0
 zc.catalog = 1.4.5
 zc.dict = 1.2.1
@@ -155,8 +153,12 @@
 zope.xmlpickle = 3.4.0
 
+
 # packages that skipped py2 support in newer versions
 PasteDeploy = 2.1.1
+setuptools = 44.1.1
+
 
 # Packages already at newest version (supporting py2 and py3)
 Paste = 3.5.2
 PasteScript = 3.3.0
+zc.buildout = 3.0.1
