From 22355cb0fda0f28923d7683022d9613deb8edb77 Mon Sep 17 00:00:00 2001 From: mickael e Date: Mon, 21 Oct 2019 14:10:21 -0400 Subject: [PATCH] SecureDrop 1.1.0 --- changelog.md | 25 +++-------------- docs/conf.py | 4 +-- docs/set_up_admin_tails.rst | 4 +-- .../ansible-base/group_vars/all/securedrop | 4 +-- .../files/changelog-xenial | 28 ++----------------- .../securedrop-config/DEBIAN/control | 2 +- .../securedrop-keyring/DEBIAN/control | 2 +- .../securedrop-ossec-agent/DEBIAN/control | 2 +- .../securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-xenial/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 13 files changed, 20 insertions(+), 61 deletions(-) diff --git a/changelog.md b/changelog.md index 6e81d1669a..76173b7206 100644 --- a/changelog.md +++ b/changelog.md @@ -1,34 +1,17 @@ # Changelog -## 1.1.0~rc5 - -## 1.1.0~rc4 - -## 1.1.0~rc3 - -## 1.1.0~rc2 +## 1.1.0 ### Web Applications * Added Czech to supported languages (#4885). - -### Operations - -* Update Tor to 0.4.1.6 (#4848). - -### Documentation - -* Miscellaneous documentation fixes (#4886). - -## 1.1.0~rc1 - -### Web Applications - +* Added Slovak to supported languages (#4940). * Reordered and updated wording of manage.py (#4850, #4858). * Remove python 2 support in SecureDrop server code (#4859). ### Operations +* Update Tor to 0.4.1.6 (#4848). * Updated dependencies for app server and admin workstation (#4865, #4884). * Fixes to packaging (#4870, #4871). * Improve specification of securedrop-app-code dependencies (#4876). @@ -44,7 +27,7 @@ ### Documentation * Transfer device and export recommendations (#4838). -* Miscellaneous documentation fixes (#4844, #4853, #4874). +* Miscellaneous documentation fixes (#4844, #4853, #4874, #4886). ## 1.0.0 diff --git a/docs/conf.py b/docs/conf.py index 82a4d2b79f..5285772dbd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '1.0.0' +version = '1.1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.0' +release = '1.1.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 a09bfdb023..5e7355e3a6 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -131,8 +131,8 @@ signed with the release signing key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 1.0.0 - git tag -v 1.0.0 + git checkout 1.1.0 + git tag -v 1.1.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 f3c34972db..3d009e1f33 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.1.0~rc5" -securedrop_app_code_sdist_version: "securedrop-app-code-1.1.0-rc5" +securedrop_app_code_version: "1.1.0" +securedrop_app_code_sdist_version: "securedrop-app-code-1.1.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 a8c0cc8a6c..f38026c0e8 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,32 +1,8 @@ -securedrop-app-code (1.1.0~rc5+xenial) xenial; urgency=medium +securedrop-app-code (1.1.0+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Fri, 18 Oct 2019 19:25:31 +0000 - -securedrop-app-code (1.1.0~rc4+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Thu, 17 Oct 2019 20:41:34 +0000 - -securedrop-app-code (1.1.0~rc3+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Thu, 17 Oct 2019 11:15:14 +0000 - -securedrop-app-code (1.1.0~rc2+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Thu, 10 Oct 2019 19:45:32 +0000 - -securedrop-app-code (1.1.0~rc1+xenial) xenial; urgency=medium - - * See changelog.md - - -- Kushal Das Wed, 18 Sep 2019 21:32:57 +0530 + -- SecureDrop Team Mon, 21 Oct 2019 18:09:35 +0000 securedrop-app-code (1.0.0+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 07c3b9a279..6e15e4b54f 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.1.0~rc5 +Version: 0.1.3+1.1.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 ccd11c7387..d6bd83e3b9 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.3+1.1.0~rc5 +Version: 0.1.3+1.1.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 b/install_files/securedrop-ossec-agent/DEBIAN/control index b15f0ea4b8..698aee6c0b 100644 --- a/install_files/securedrop-ossec-agent/DEBIAN/control +++ b/install_files/securedrop-ossec-agent/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-agent -Version: 3.0.0+1.1.0~rc5 +Version: 3.0.0+1.1.0 Architecture: amd64 Depends: ossec-agent,securedrop-keyring,securedrop-config Replaces: ossec-agent diff --git a/install_files/securedrop-ossec-server/DEBIAN/control b/install_files/securedrop-ossec-server/DEBIAN/control index 2d588830b7..8f3c0768e2 100644 --- a/install_files/securedrop-ossec-server/DEBIAN/control +++ b/install_files/securedrop-ossec-server/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-server -Version: 3.0.0+1.1.0~rc5 +Version: 3.0.0+1.1.0 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index c92f4b319d..32360aa11e 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.1.0~rc5" +securedrop_version: "1.1.0" ossec_version: "3.0.0" keyring_version: "0.1.3" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 3eefcb9dd5..9084fa2f71 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.0.0 +1.1.0 diff --git a/securedrop/version.py b/securedrop/version.py index 3a0da8aae4..1a72d32e57 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.1.0~rc5' +__version__ = '1.1.0' diff --git a/setup.py b/setup.py index aba8d77216..aad12fde28 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.1.0~rc5", + version="1.1.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",