From 4e4f26a74d24a62fd3b9385c81898c8100b16d0e Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Wed, 20 Mar 2019 20:20:56 +0000 Subject: [PATCH] SecureDrop 0.12.1 --- changelog.md | 6 +++++- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-trusty | 4 ++-- .../files/changelog-xenial | 4 ++-- install_files/securedrop-config/DEBIAN/control | 2 +- install_files/securedrop-keyring/DEBIAN/control | 2 +- install_files/securedrop-ossec-agent/DEBIAN/control | 2 +- install_files/securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-trusty/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- 13 files changed, 21 insertions(+), 17 deletions(-) diff --git a/changelog.md b/changelog.md index b5589de962..1a9c9438bb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.12.1~rc1 +## 0.12.1 ### Web Application @@ -16,6 +16,10 @@ * Resolved error in GUI updater due to flaky keyservers (#4100) +### Documentation + +* Add documentation indicating fresh installs should be done on the Ubuntu 16.04.6 iso (#4234) + ## 0.12.0 ### Web Application diff --git a/docs/conf.py b/docs/conf.py index 2ed9b15d05..1db4c54ebb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.12.1~rc1' +version = '0.12.1' # The full version, including alpha/beta/rc tags. -release = '0.12.1~rc1' +release = '0.12.1' # 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 2308f620c7..8e651c35da 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -114,8 +114,8 @@ key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 0.12.1~rc1 - git tag -v 0.12.1~rc1 + git checkout 0.12.1 + git tag -v 0.12.1 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 e936c0bfd6..3fd9da07c8 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_app_code_version: "0.12.1~rc1" +securedrop_app_code_version: "0.12.1" grsecurity: true install_local_packages: false diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty index f7acbb1be2..2b4f0a81c9 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty @@ -1,8 +1,8 @@ -securedrop-app-code (0.12.1~rc1+trusty) trusty; urgency=medium +securedrop-app-code (0.12.1+trusty) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Thu, 14 Mar 2019 13:45:10 +0000 + -- SecureDrop Team Wed, 20 Mar 2019 20:20:21 +0000 securedrop-app-code (0.12.0+trusty) trusty; urgency=medium 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 3896b34dbd..a6819f1e09 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,8 +1,8 @@ -securedrop-app-code (0.12.1~rc1+xenial) xenial; urgency=medium +securedrop-app-code (0.12.1+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Thu, 14 Mar 2019 13:45:16 +0000 + -- SecureDrop Team Wed, 20 Mar 2019 20:20:40 +0000 securedrop-app-code (0.12.0+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 1abb4e1280..6165261b7d 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+0.12.1~rc1 +Version: 0.1.3+0.12.1 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 a51fc1f701..5f82da5448 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.2+0.12.1~rc1 +Version: 0.1.2+0.12.1 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 5c71f76622..05250cfbb0 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+0.12.1~rc1 +Version: 3.0.0+0.12.1 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 66b0378101..0793f85784 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+0.12.1~rc1 +Version: 3.0.0+0.12.1 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-trusty/tests/vars.yml b/molecule/builder-trusty/tests/vars.yml index 8a3dd8fbd0..cd1a4b223b 100644 --- a/molecule/builder-trusty/tests/vars.yml +++ b/molecule/builder-trusty/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.12.1~rc1" +securedrop_version: "0.12.1" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index ac454c6a1f..34a83616bb 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -0.12.0 +0.12.1 diff --git a/securedrop/version.py b/securedrop/version.py index 30f86f850b..f8d90954cb 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.12.1~rc1' +__version__ = '0.12.1'