From b2484519ad8b9fa127cb3ed95ae6c4fa08070d30 Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Thu, 1 Feb 2018 21:14:45 +0000 Subject: [PATCH] SecureDrop 0.5.2 --- changelog.md | 2 +- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- install_files/ansible-base/group_vars/all/securedrop | 2 +- install_files/securedrop-app-code/DEBIAN/control | 2 +- .../usr/share/doc/securedrop-app-code/changelog.Debian | 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/tests/vars.yml | 2 +- securedrop/version.py | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/changelog.md b/changelog.md index 5817aca468..0941cc2382 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.5.2~rc1 +## 0.5.2 * Replace PyCrypto (#2903). * Use `max_fail_percentage` to force immediate Ansible exits in playbook runs (#2922). diff --git a/docs/conf.py b/docs/conf.py index de6b2dea5c..482cf62540 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,9 +59,9 @@ # built documents. # # The short X.Y version. -version = '0.5.2~rc1' +version = '0.5.2' # The full version, including alpha/beta/rc tags. -release = '0.5.2~rc1' +release = '0.5.2' # 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 5ccdc35079..c5cddbd154 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -107,8 +107,8 @@ key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 0.5.2~rc1 - git tag -v 0.5.2~rc1 + git checkout 0.5.2 + git tag -v 0.5.2 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command. diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 8693180397..f389f092d1 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 host_vars/development.yml -securedrop_app_code_version: "0.5.2~rc1" +securedrop_app_code_version: "0.5.2" grsecurity: true install_local_packages: false diff --git a/install_files/securedrop-app-code/DEBIAN/control b/install_files/securedrop-app-code/DEBIAN/control index 9aded335ec..574cb13b5b 100644 --- a/install_files/securedrop-app-code/DEBIAN/control +++ b/install_files/securedrop-app-code/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-app-code -Version: 0.5.2~rc1 +Version: 0.5.2 Architecture: amd64 Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor,securedrop-keyring,securedrop-config Description: Packages the SecureDrop application code pip dependencies and apparmor profiles. This package will put the apparmor profiles in enforce mode. This package does use pip to install the pip wheelhouse diff --git a/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian b/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian index 2048af8a46..35cb55f592 100644 --- a/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian +++ b/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian @@ -1,8 +1,8 @@ -securedrop-app-code (0.5.2~rc1) trusty; urgency=medium +securedrop-app-code (0.5.2) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Mon, 29 Jan 2018 18:56:38 +0000 + -- SecureDrop Team Thu, 01 Feb 2018 21:14:12 +0000 securedrop-app-code (0.5.1) trusty; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 9adbd86ad6..327ef26df4 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.0+0.5.2~rc1 +Version: 0.1.0+0.5.2 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 bf0d88ee49..250a5b3a31 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.1+0.5.2~rc1 +Version: 0.1.1+0.5.2 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 ccfa252002..3c9d99b358 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: 2.8.2+0.5.2~rc1 +Version: 2.8.2+0.5.2 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 a1fdbb3501..6791e3f16c 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: 2.8.2+0.5.2~rc1 +Version: 2.8.2+0.5.2 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder/tests/vars.yml b/molecule/builder/tests/vars.yml index 0476acc213..c385c06eef 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.5.2~rc1" +securedrop_version: "0.5.2" ossec_version: "2.8.2" keyring_version: "0.1.1" config_version: "0.1.0" diff --git a/securedrop/version.py b/securedrop/version.py index ead11ce08a..45869b6226 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.5.2~rc1' +__version__ = '0.5.2'