From 453360568ffbdbce6873eb40ed5370870ca3ddd7 Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Mon, 4 Dec 2023 17:13:02 +0000
Subject: [PATCH 1/3] Update CHANGELOG.md with 2.8 and 2.10 changes

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1d05121..12cd5442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,35 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [2.10.0]
+
+### Added
+- Add Enterprise Linux 9 Build Target
+- Option to use OpenSSL instead of Libsodium for encryption
+
+### Removed
+- Remove Legacy GeoIP from Packages and Dockerfiles/Images
+- Remove the report_api from weakforced entirely
+
+### Changed
+- Move to pytest instead of nose for regression tests
+
+## [2.8.0]
+
+### Added 
+- Support ELK 7.x Stack 
+- Support Date Expansion in WebHook URLs
+- Enable IP and Login substitution in blocklist return messages
+- Add config option to disable password for /metrics endpoint
+- Support redis usernames and passwords for redis authentication
+- Support hostnames for redis configuration in addition to IP addresses
+
+## Changed
+
+- Fix an issue where IPv6 ComboAddress returned zero port number (which caused v6 HTTP listen addresses to not work)
+- Set V6ONLY socket option to stop v6 sockets from managing v4 addresses for replication
+- Return the IP address of the client in JSON of ACL denied response
+
 ## [2.6.1]
 - Fix issue where wforce was complaining about not being able to create tmp file on startup
 - Fix timing issue whereby the webserver was not started before syncDB leading to syncDone failures

From 2ea513d5403cb906234d454fc145b908e7d62ff2 Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Mon, 4 Dec 2023 17:13:28 +0000
Subject: [PATCH 2/3] Add 2.10.0 release notes

---
 docs/release_notes/ReleaseNotes-2.10.0.md | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 docs/release_notes/ReleaseNotes-2.10.0.md

diff --git a/docs/release_notes/ReleaseNotes-2.10.0.md b/docs/release_notes/ReleaseNotes-2.10.0.md
new file mode 100644
index 00000000..cbe1746e
--- /dev/null
+++ b/docs/release_notes/ReleaseNotes-2.10.0.md
@@ -0,0 +1,35 @@
+# Release Notes for OX Abuse Shield 2.10.0
+
+<!-- {% raw %} -->
+
+## New Features
+
+* Add Enterprise Linux 9 Build Target
+* Option to use OpenSSL instead of Libsodium for encryption
+
+## Removed Features
+- Remove Legacy GeoIP from Packages and Dockerfiles/Images
+- Remove the Report API from weakforced entirely
+
+## Add Enterprise Linux 9 Build Target
+
+Enterprise Linux 9-based systems are now supported as a build target. Oracle Linux 9 is used as the 
+build environment, but the package should work on any EL-9 environment. Additionally, el-7, el-8 and el-9 aliases
+are available as build targets.
+
+## Option to use OpenSSL instead of Libsodium for encryption
+
+When libsodium is not available, weakforced will now use openssl crypto functions instead for encryption, including
+encryption between the client and the server, and replication encryption. OpenSSL encryption is used for the
+docker image, but the default for built packages is still libsodium.
+
+## Remove Legacy GeoIP from Packages and Dockerfiles/Images
+
+The legacy GeoIP Library is no longer included in the packages or Dockerfiles/images for weakforced.
+
+## Remove the report_api from weakforced entirely
+
+The Report API has been removed from weakforced. This feature was never used (to my knowledge), and was creating
+a significant burden in terms of the maintenance of the python dependencies.
+
+<!-- {% endraw %} -->
\ No newline at end of file

From a38de7727797216e06ba6fbc725cccf6204d1638 Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Tue, 5 Dec 2023 10:00:38 +0000
Subject: [PATCH 3/3] Update builder submodule

---
 builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder b/builder
index af825562..169502b4 160000
--- a/builder
+++ b/builder
@@ -1 +1 @@
-Subproject commit af82556250f331310402bad3335142ebd70ed3a3
+Subproject commit 169502b4077c19ecacbde914d08ebaa9f24a4269