From 7a229440423136526f48e49955590b70cbf36575 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 19 Oct 2021 18:20:38 -0400 Subject: [PATCH] SecureDrop 2.1.0 --- changelog.md | 15 +++++---------- .../ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 12 +++--------- molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 13 insertions(+), 24 deletions(-) diff --git a/changelog.md b/changelog.md index 7879c8e7ab..465b396bac 100644 --- a/changelog.md +++ b/changelog.md @@ -1,15 +1,6 @@ # Changelog -## 2.1.0~rc2 - -### Development - -* Added upgrade of all packages early in install, for newest ca-certificates (#6120) -* Updated package build to use latest pip (21.3) rather than system pip for virtualenvs (#6141) -* Removed version check for "verify" command for securedrop-admin (#6134) -* Updated QA playbook for Focal apt sources (#6123) - -## 2.1.0~rc1 +## 2.1.0 ### Web applications @@ -31,6 +22,8 @@ * Removed superfluous Tails configuration chance to enforce preservation of filenames on decompression in Nautilus (#6079) * Removed expired signing key from Securedrop keyring (#5979, #6138) * Added option to restore from backup file manually transferred to server (#5909) +* Added upgrade of all packages early in install, for newest ca-certificates (#6120) +* Removed version check for "verify" command for securedrop-admin (#6134) * Dependency updates: requests 2.22.0 to 2.26.0; urllib3 1.25.10 to 1.26.6; Ansible 2.9.21 to 2.9.26 (#6046, #6109) ### Development @@ -45,6 +38,8 @@ * (CI) Updated CircleCI configuration to skip translation tests when not required (#6029) * (CI) Updated CircleCI configuration to improve shellcheck filtering (#6028) * Development dependency updates: pynacl 1.1.2 to 1.4.0; pillow 8.3.1 to 8.3.2; coverage 4.4.2 to 5.5; cryptography 3.2.1 to 3.4.7 (#6027, #6094, #6092, #5975) +* Updated package build to use latest pip (21.3) rather than system pip for virtualenvs (#6141) +* Updated QA playbook for Focal apt sources (#6123) ## 2.0.2 diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index e854ca5e40..662396667d 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.1.0~rc2" +securedrop_version: "2.1.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 06149a4373..8b261cd0b3 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,14 +1,8 @@ -securedrop-app-code (2.1.0~rc2+focal) focal; urgency=medium +securedrop-app-code (2.1.0+focal) focal; urgency=medium - * see changelog.md - - -- SecureDrop Team Thu, 14 Oct 2021 08:43:18 -0700 - -securedrop-app-code (2.1.0~rc1+focal) focal; urgency=medium - - * see changelog.md + * see changelog.md - -- SecureDrop Team Thu, 30 Sep 2021 11:59:18 -0400 + -- SecureDrop Team Tue, 19 Oct 2021 18:20:13 -0400 securedrop-app-code (2.0.2+focal) focal; urgency=medium diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 401582fceb..666a9d944f 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.1.0~rc2" +securedrop_version: "2.1.0" 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 e9307ca575..7ec1d6db40 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.0.2 +2.1.0 diff --git a/securedrop/version.py b/securedrop/version.py index 3d613f84a3..a33997dd10 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.1.0~rc2' +__version__ = '2.1.0' diff --git a/setup.py b/setup.py index 8caaade5be..79428fd8ef 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.1.0~rc2", + version="2.1.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",