diff --git a/changelog.md b/changelog.md index 594a2a0d5c..23e42161fe 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Changelog +## 2.0.1~rc1 + +### Operations + +* Updated admin dependencies: cryptography from 3.2.1 to 3.4.7, cffi from 1.14.2 to 1.14.5 (#6030) + +### Development + +* Updated testinfra tests to use site-specific configuration against production instances (#6032) + ## 2.0.0 ### Web applications diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index ea618c1ea4..298cdf8c56 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.0.0" +securedrop_version: "2.0.1~rc1" 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 fc8effa2a9..cd36a1c0ce 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.0.1~rc1+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Tue, 06 Jul 2021 19:56:50 -0400 + securedrop-app-code (2.0.0+focal) focal; urgency=medium * see changelog.md diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 1fccdc58b5..00c1d1d924 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.0.0" +securedrop_version: "2.0.1~rc1" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/securedrop/version.py b/securedrop/version.py index afced14728..76fde6a0bc 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.0.0' +__version__ = '2.0.1~rc1' diff --git a/setup.py b/setup.py index 5fd3b39aa5..02b7f43289 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.0.0", + version="2.0.1~rc1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",