diff --git a/changelog.md b/changelog.md index a71a6ecd95..81e1d020e5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,15 +1,10 @@ # Changelog -## 1.6.0~rc2 +## 1.6.0 ### Web Applications * Adds error handling for file deletion operations (#5549) - -## 1.6.0~rc1 - -### Web Applications - * Update source Interface to render /lookup if replies are missing (#5497) * Remove traces of obsolete dependencies from virtualenv (#5487) * Internationalize "Show Password" on Journalist Interface (#5483) diff --git a/docs/conf.py b/docs/conf.py index 284ff788be..6094f7e7eb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,9 +59,9 @@ # built documents. # # The short X.Y version. -version = "1.5.0" +version = "1.6.0" # The full version, including alpha/beta/rc tags. -release = "1.5.0" +release = "1.6.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/set_up_admin_tails.rst b/docs/set_up_admin_tails.rst index 56a00deb16..b3458e0ba0 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -136,8 +136,8 @@ signed with the release signing key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 1.5.0 - git tag -v 1.5.0 + git checkout 1.6.0 + git tag -v 1.6.0 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command along with the fingerprint above. diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 90237602e3..7ae3158367 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,8 +2,8 @@ # 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_app_code_version: "1.6.0~rc2" -securedrop_app_code_sdist_version: "securedrop-app-code-1.6.0-rc2" +securedrop_app_code_version: "1.6.0" +securedrop_app_code_sdist_version: "securedrop-app-code-1.6.0" securedrop_app_code_sdist_name: "{{ securedrop_app_code_sdist_version }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index 446917655d..39d874b95b 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial @@ -1,14 +1,8 @@ -securedrop-app-code (1.6.0~rc2+xenial) xenial; urgency=medium +securedrop-app-code (1.6.0+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Mon, 05 Oct 2020 11:43:40 -0400 - -securedrop-app-code (1.6.0~rc1+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 23 Sep 2020 23:48:14 +0000 + -- SecureDrop Team Wed, 07 Oct 2020 10:11:26 -0400 securedrop-app-code (1.5.0+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 547e7148e6..8c1e91b554 100644 --- a/install_files/securedrop-config/DEBIAN/control +++ b/install_files/securedrop-config/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-config -Version: 0.1.3+1.6.0~rc2 +Version: 0.1.3+1.6.0 Architecture: all Description: Establishes baseline system state for running SecureDrop. Configures apt repositories. diff --git a/install_files/securedrop-keyring/DEBIAN/control b/install_files/securedrop-keyring/DEBIAN/control index f9bca53982..07ec31936b 100644 --- a/install_files/securedrop-keyring/DEBIAN/control +++ b/install_files/securedrop-keyring/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-keyring -Version: 0.1.4+1.6.0~rc2 +Version: 0.1.4+1.6.0 Architecture: amd64 Depends: gnupg Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt. diff --git a/install_files/securedrop-ossec-agent/DEBIAN/control.j2 b/install_files/securedrop-ossec-agent/DEBIAN/control.j2 index 1e66710503..cd04fdc30d 100644 --- a/install_files/securedrop-ossec-agent/DEBIAN/control.j2 +++ b/install_files/securedrop-ossec-agent/DEBIAN/control.j2 @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-agent -Version: 3.6.0+1.6.0~rc2 +Version: 3.6.0+1.6.0 Architecture: amd64 {% if securedrop_build_focal_support %} Depends: libevent-2.1-7,libpcre2-8-0,ossec-agent,securedrop-keyring,securedrop-config diff --git a/install_files/securedrop-ossec-server/DEBIAN/control.j2 b/install_files/securedrop-ossec-server/DEBIAN/control.j2 index 77b83856fc..20474302bd 100644 --- a/install_files/securedrop-ossec-server/DEBIAN/control.j2 +++ b/install_files/securedrop-ossec-server/DEBIAN/control.j2 @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-server -Version: 3.6.0+1.6.0~rc2 +Version: 3.6.0+1.6.0 Architecture: amd64 {% if securedrop_build_focal_support %} Depends: libevent-2.1-7,libpcre2-8-0,ossec-server,securedrop-keyring,securedrop-config diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index e709ae98d7..2cded009fa 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.6.0~rc2" +securedrop_version: "1.6.0" ossec_version: "3.6.0" keyring_version: "0.1.4" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index bc80560fad..dc1e644a10 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.5.0 +1.6.0 diff --git a/securedrop/version.py b/securedrop/version.py index 7bf8e55184..bcd8d54efb 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.6.0~rc2' +__version__ = '1.6.0' diff --git a/setup.py b/setup.py index 0fc9347b6b..74d1b55780 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.6.0~rc2", + version="1.6.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",