diff --git a/changelog.md b/changelog.md index 0f351171019..b5589de9627 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,21 @@ # Changelog +## 0.12.1~rc1 + +### Web Application + +* Add "Back to submission page" link to NoScript docs (#4208) + +### Operations + +* Ensured WiFi related packages are not installed on Xenial on upgrade (#4163) +* Try harder to attach to a `tmux` session on upgrade (#4221) +* Control locale during Ansible runs (#4252) + +### Tails Environment + +* Resolved error in GUI updater due to flaky keyservers (#4100) + ## 0.12.0 ### Web Application diff --git a/docs/conf.py b/docs/conf.py index 894b01bd4a3..2ed9b15d05e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.12.0' +version = '0.12.1~rc1' # The full version, including alpha/beta/rc tags. -release = '0.12.0' +release = '0.12.1~rc1' # 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 d5f8caea0bd..2308f620c7d 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.0 - git tag -v 0.12.0 + git checkout 0.12.1~rc1 + git tag -v 0.12.1~rc1 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 6135890f86d..e936c0bfd69 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.0" +securedrop_app_code_version: "0.12.1~rc1" 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 679e1572657..f7acbb1be2b 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,3 +1,9 @@ +securedrop-app-code (0.12.1~rc1+trusty) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 14 Mar 2019 13:45:10 +0000 + securedrop-app-code (0.12.0+trusty) trusty; urgency=medium * See changelog.md 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 ac670d3ed63..3896b34dbdd 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,3 +1,9 @@ +securedrop-app-code (0.12.1~rc1+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 14 Mar 2019 13:45:16 +0000 + securedrop-app-code (0.12.0+xenial) xenial; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 82b1947d972..740783b26f8 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.2+0.12.0 +Version: 0.1.2+0.12.1~rc1 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 84770dfcda6..a51fc1f701c 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.0 +Version: 0.1.2+0.12.1~rc1 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 acc6e3bb995..5c71f766224 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.0 +Version: 3.0.0+0.12.1~rc1 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 f914b28b6af..66b03781016 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.0 +Version: 3.0.0+0.12.1~rc1 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 ee278f95bb3..8a3dd8fbd07 100644 --- a/molecule/builder-trusty/tests/vars.yml +++ b/molecule/builder-trusty/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.12.0" +securedrop_version: "0.12.1~rc1" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.3" diff --git a/securedrop/version.py b/securedrop/version.py index 2c7bffbf86a..30f86f850be 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.12.0' +__version__ = '0.12.1~rc1'