From 911c6773f53872df6ac0fe120b91b6a64f81d95d Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@debian.org>
Date: Tue, 17 Sep 2024 16:06:19 -0400
Subject: [PATCH] SecureDrop 2.10.0

---
 changelog.md                                         | 4 ++--
 install_files/ansible-base/group_vars/all/securedrop | 2 +-
 molecule/shared/stable.ver                           | 2 +-
 securedrop/debian/changelog                          | 6 ++++++
 securedrop/setup.py                                  | 2 +-
 securedrop/version.py                                | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/changelog.md b/changelog.md
index e956cd5765..153554b385 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,9 @@
 # Changelog
 
-## 2.10.0~rc1
+## 2.10.0
 
 This release contains fixes for issues described in the most recent security audit by 7A Security, see
-our [blog post](TK) for more details. It also contains other maintenance fixes.
+our [blog post](https://securedrop.org/news/securedrop-2_10_0-released/) for more details. It also contains other maintenance fixes.
 
 ### Security
 
diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
index 446ef8d1fa..8a934480c5 100644
--- a/install_files/ansible-base/group_vars/all/securedrop
+++ b/install_files/ansible-base/group_vars/all/securedrop
@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_version: "2.10.0~rc1"
+securedrop_version: "2.10.0"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true
diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
index c8e38b6140..10c2c0c3d6 100644
--- a/molecule/shared/stable.ver
+++ b/molecule/shared/stable.ver
@@ -1 +1 @@
-2.9.0
+2.10.0
diff --git a/securedrop/debian/changelog b/securedrop/debian/changelog
index 5ff30b2232..e3914a7b07 100644
--- a/securedrop/debian/changelog
+++ b/securedrop/debian/changelog
@@ -1,3 +1,9 @@
+securedrop (2.10.0+focal) focal; urgency=medium
+
+  * see changelog.md
+
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 17 Sep 2024 16:05:58 -0400
+
 securedrop (2.10.0~rc1+focal) focal; urgency=medium
 
   * see changelog.md
diff --git a/securedrop/setup.py b/securedrop/setup.py
index 21f855ff59..e48eaffa57 100644
--- a/securedrop/setup.py
+++ b/securedrop/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.10.0~rc1",
+    version="2.10.0",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",
diff --git a/securedrop/version.py b/securedrop/version.py
index 8a567eeeef..1c622223ba 100644
--- a/securedrop/version.py
+++ b/securedrop/version.py
@@ -1 +1 @@
-__version__ = "2.10.0~rc1"
+__version__ = "2.10.0"