From d24594d23e5df5586164ba0652c948439aa12f1e Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Thu, 10 Mar 2022 09:34:28 -0800 Subject: [PATCH] SecureDrop 2.2.1 --- changelog.md | 2 +- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../build-securedrop-app-code-deb-pkg/files/changelog-focal | 4 ++-- molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index a0ad7be0a6..c8c15b3392 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.1~rc1 +## 2.2.1 * Update default grsec kernel version to 5.15.26 (#6325) * Update pillow test dependency from 9.0.0 to 9.0.1 (#6305) diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 96931eb002..785213e7de 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.2.1~rc1" +securedrop_version: "2.2.1" 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 d38406a9b2..2e32982115 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.2.1~rc1+focal) focal; urgency=medium +securedrop-app-code (2.2.1+focal) focal; urgency=medium * See changelog.md - -- SecureDrop Team Tue, 08 Mar 2022 11:47:09 -0500 + -- SecureDrop Team Thu, 10 Mar 2022 09:34:17 -0800 securedrop-app-code (2.2.0+focal) focal; urgency=medium diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index f1912532b9..bd5b814ae1 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.2.1~rc1" +securedrop_version: "2.2.1" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index ccbccc3dc6..c043eea776 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.2.0 +2.2.1 diff --git a/securedrop/version.py b/securedrop/version.py index 320cbdab34..36a511eca1 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.2.1~rc1' +__version__ = '2.2.1' diff --git a/setup.py b/setup.py index 135f2a485b..259e69afef 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.2.1~rc1", + version="2.2.1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",