From ea83806ce597dc52d7dd6477306138c6f8445368 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Thu, 23 Feb 2023 16:36:49 -0500 Subject: [PATCH] SecureDrop 2.5.2 --- changelog.md | 4 +-- .../ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 32 +++---------------- molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 11 insertions(+), 35 deletions(-) diff --git a/changelog.md b/changelog.md index 607722d67f..5b0946f707 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 2.5.2~rc1 +## 2.5.2 ### Web applications - Updated dependencies: @@ -8,7 +8,7 @@ to 2.5.1 (#6752) - cryptography from 3.4.7 to 39.0.1 (#6746, #6751) - certifi from 2017.7.27.1 to 2022-12.07 (#6708) - - flask from 2.0.2 to 2.0.3 (#6624) + - flask from 2.0.2 to 2.0.3 (#6624,#6634) ### Development - Fixed staging app creation in source.wsgi, added application smoke test in testinfra (#6742) diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index f9e06b33f4..ca8432ed7b 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.2~rc1" +securedrop_version: "2.5.2" 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 ad6e08b7e3..a79e41c44f 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,8 +1,8 @@ -securedrop-app-code (2.5.2~rc1+focal) focal; urgency=medium +securedrop-app-code (2.5.2+focal) focal; urgency=medium * see changelog.md - -- SecureDrop Team Tue, 21 Feb 2023 16:10:41 -0500 + -- SecureDrop Team Thu, 23 Feb 2023 16:33:50 -0500 securedrop-app-code (2.5.1+focal) focal; urgency=medium @@ -16,35 +16,11 @@ securedrop-app-code (2.5.0+focal) focal; urgency=medium -- SecureDrop Team Tue, 18 Oct 2022 18:03:53 -0400 -securedrop-app-code (2.5.0~rc4+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Fri, 14 Oct 2022 15:37:05 -0400 - -securedrop-app-code (2.5.0~rc3+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Thu, 06 Oct 2022 18:45:02 +0000 - -securedrop-app-code (2.5.0~rc2+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Wed, 05 Oct 2022 19:32:59 +0000 - -securedrop-app-code (2.5.0~rc1+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Wed, 28 Sep 2022 12:01:12 -0400 - -securedrop-app-code (2.5.0~rc1+focal) focal; urgency=medium +securedrop-app-code (2.4.2+focal) focal; urgency=medium * see changelog.md - -- SecureDrop Team Mon, 25 Jul 2022 14:25:30 -0400 + -- SecureDrop Team Mon, 08 Aug 2022 21:54:36 -0400 securedrop-app-code (2.4.1+focal) focal; urgency=medium diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index c36e947679..365d21689c 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.5.2~rc1" +securedrop_version: "2.5.2" 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 73462a5a13..f225a78adf 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.5.1 +2.5.2 diff --git a/securedrop/version.py b/securedrop/version.py index afd75d6ae5..667b52f951 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = "2.5.2~rc1" +__version__ = "2.5.2" diff --git a/setup.py b/setup.py index 2431699524..b52bf64e34 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.5.2~rc1", + version="2.5.2", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",