From cdac7fda490cf6f6cd0c023ecaa42c80a7c846bd Mon Sep 17 00:00:00 2001 From: heartsucker Date: Wed, 27 Feb 2019 12:03:07 +0100 Subject: [PATCH] SecureDrop 0.13.0~rc1 --- changelog.md | 2 ++ docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-trusty | 6 ++++++ .../files/changelog-xenial | 6 ++++++ 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 +- securedrop/version.py | 2 +- 12 files changed, 25 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index 0f351171019..e11d44d5118 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ # Changelog +## 0.13.0~rc1 + ## 0.12.0 ### Web Application diff --git a/docs/conf.py b/docs/conf.py index 894b01bd4a3..b34c0ce7dee 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.13.0~rc1' # The full version, including alpha/beta/rc tags. -release = '0.12.0' +release = '0.13.0~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..c925756d2bf 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.13.0~rc1 + git tag -v 0.13.0~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..83c07c77417 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.13.0~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..134bf5096f2 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.13.0~rc1+trusty) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 27 Feb 2019 11:01:15 +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..4b2acdf1c1c 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.13.0~rc1+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 27 Feb 2019 11:02:06 +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..abee3880f1b 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.13.0~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..e2d564da506 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.13.0~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..c9b0e3cad23 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.13.0~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..92823f7f051 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.13.0~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 8b6bcb1fa8a..66c403a8d5e 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.13.0~rc1" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.2" diff --git a/securedrop/version.py b/securedrop/version.py index 2c7bffbf86a..f7c0bd53e37 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.12.0' +__version__ = '0.13.0~rc1'