From 5e7cb434e1163ec1a3386409fbd34ca34bb57904 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 18 Oct 2022 18:04:02 -0400 Subject: [PATCH] SecureDrop 2.5.0 --- changelog.md | 33 ++++--------------- .../ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 6 ++++ molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 17 insertions(+), 32 deletions(-) diff --git a/changelog.md b/changelog.md index 6197c19d41..e33f67e2c4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,35 +1,11 @@ # Changelog -## 2.5.0~rc4 - -## Web Applications - -* Fixed new password functionality to require admins to authenticate if changing their own password (#6627) -* Fixed i18n.json, restoring Arabic as a supported language (#6614) - -## CI - -* Removed an external CI dependency by bundling the Codecov GPG key (#6612, #6626) - -## 2.5.0~rc3 +## 2.5.0 ### Web Applications -* Allowed Apache to generate Python bytecode to address an installation-time edge case (#6602) - -## 2.5.0~rc2 - -### Web Applications - -* Fixed missing AppArmor entry for new `sessions` module (#6584) -* Changed installation logic to generate Python bytecode during installation (#6591) - -## 2.5.0~rc1 - -### Web Applications - -* Added unified Redis-based session handling for the Journalist Interface and API (#6403) -* Added supported languages list and updated i18n tooling to process all langiuages available in Weblate (#6557, #6566) +* Added unified Redis-based session handling for the Journalist Interface and API (#6403, #6584) +* Added supported languages list and updated i18n tooling to process all languages available in Weblate (#6557, #6566, #6614) * Fixed double character escaping of organisation names in the Source and Journalist Interface (#6550) * Removed SASS from build process, added pure CSS for both web applications (#6529) * Updated string referencing submissions to use consistent terminology (#6543) @@ -39,6 +15,8 @@ * Removed support for runtime asset minification (#6425) * Updated wordlists to replace potentially offensive terms (#6442) * Fixed string localization error (#6465) +* Updated installation logic to generate Python bytecode during installation (#6591, #6602) +* Fixed new password functionality to require admins to authenticate if changing their own password (#6627) ### Operations @@ -63,6 +41,7 @@ * Added static code analysis via semgrep (#6479) * Updated pagelayout test to address intermittent CI failure (#6470) +* Removed an external CI dependency by bundling the Codecov GPG key (#6612, #6626) ## 2.4.2 diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 1a85d9aaf1..030721b0fc 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.5.0~rc4" +securedrop_version: "2.5.0" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index d0721f95cf..089bd8f8b5 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,3 +1,9 @@ +securedrop-app-code (2.5.0+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Tue, 18 Oct 2022 18:03:53 -0400 + securedrop-app-code (2.5.0~rc4+focal) focal; urgency=medium * see changelog.md diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 9a125593de..c93ea93693 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.5.0~rc4" +securedrop_version: "2.5.0" ossec_version: "3.6.0" keyring_version: "0.1.6" config_version: "0.1.4" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 005119baaa..437459cd94 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.4.1 +2.5.0 diff --git a/securedrop/version.py b/securedrop/version.py index cf6fb6f484..50062f87c0 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = "2.5.0~rc4" +__version__ = "2.5.0" diff --git a/setup.py b/setup.py index 3fa31ae6ce..de9371d996 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.5.0~rc4", + version="2.5.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",