From 5ce5df29fdc77241afbcd3036d072ce17e71ace1 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Wed, 22 May 2024 17:02:32 +0200
Subject: [PATCH 1/2] Update Changelog

---
 CHANGELOG.md | 10 ++++++++++
 LICENSE      |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6d8c6a..33f7f43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.21.0 - [Unreleased]
 
+#### Added
+
+- Ubuntu 24.04 LTS support
+- New Nginx package with HTTP/3 QUIC support
+
+
+#### Security
+
+- Fix [CVE-2024-34528](https://github.com/advisories/GHSA-23qq-p4gq-gc2g)
+
 ### v3.20.0 - 2024-04-21
 
 #### Added
diff --git a/LICENSE b/LICENSE
index 5506b6f..758b195 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 WordOps (https://github.com/WordOps/WordOps/graphs/contributors)
+Copyright (c) 2018-2024 WordOps (https://github.com/WordOps/WordOps/graphs/contributors)
 Copyright (C) 2011-2017 EE Development Group (https://github.com/ee/ee/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

From f84c152e938287dfb29c22d76690bcee2cb4e99c Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Wed, 22 May 2024 17:09:23 +0200
Subject: [PATCH 2/2] Fix install script python dependencies

---
 install | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/install b/install
index ea63036..ec5eb49 100755
--- a/install
+++ b/install
@@ -440,14 +440,14 @@ wo_install() {
         cd /usr/local/lib/python3."$python_ver"/dist-packages || exit 1
     fi
     if [ "$wo_distro_codename" != "bookworm" ]; then
-        /opt/wo/bin/pip uninstall -yq wo wordops ee
+        pip uninstall -yq wo wordops ee
     fi
 
     cd || exit 1
     if [ -d /opt/wo/lib/python3."$python_ver"/site-packages/apt ]; then
         source /opt/wo/bin/activate
         /opt/wo/bin/pip install -U setuptools
-        /opt/wo/bin/pip install -U pip wheel
+        /opt/wo/bin/pip install -U pip wheel distro
         /opt/wo/bin/pip uninstall psutil -y
         /opt/wo/bin/pip uninstall SQLAlchemy -y
     else
@@ -481,9 +481,9 @@ wo_install() {
     fi
 
     if [ "$wo_branch" = "master" ]; then
-        /opt/wo/bin/pip install -U wordops
+        /opt/wo/bin/pip install -U wordops --upgrade-strategy=eager
     else
-        /opt/wo/bin/pip install -I "git+https://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops"
+        /opt/wo/bin/pip install -I "git+https://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops" --upgrade-strategy=eager
     fi
     local python_venv
     python_venv=$(python3 -c "import sys; print(sys.version_info[1])")
@@ -544,9 +544,9 @@ wo_travis_install() {
                 fi
             fi
         fi
-        /opt/wo/bin/pip install -U .
+        /opt/wo/bin/pip install -U . --upgrade-strategy=eager
     else
-        /opt/wo/bin/pip install -U "git+https://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops"
+        /opt/wo/bin/pip install -U "git+https://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops" --upgrade-strategy=eager
     fi
     cp -rf /opt/wo/lib/python3."$python_ver"/site-packages/usr/* /usr/
     cp -rn /opt/wo/lib/python3."$python_ver"/site-packages/etc/* /etc/