From 4cbab07fda4fb18264a4901042e4ac6c9860be47 Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Tue, 13 Mar 2018 18:46:48 +0000 Subject: [PATCH] SecureDrop 0.6 --- changelog.md | 2 +- docs/conf.py | 4 +-- docs/set_up_admin_tails.rst | 4 +-- .../ansible-base/group_vars/all/securedrop | 2 +- .../securedrop-app-code/DEBIAN/control | 2 +- .../doc/securedrop-app-code/changelog.Debian | 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/tests/vars.yml | 2 +- securedrop/version.py | 2 +- 12 files changed, 15 insertions(+), 39 deletions(-) diff --git a/changelog.md b/changelog.md index 149f9fb1a9..3bbd78dfcb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.6~rc5 +## 0.6 ### Web Applications diff --git a/docs/conf.py b/docs/conf.py index d4aa339c1c..1df079b28c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.6~rc5' +version = '0.6' # The full version, including alpha/beta/rc tags. -release = '0.6~rc5' +release = '0.6' # 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 4eae49d905..022713cfc7 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.6~rc5 - git tag -v 0.6~rc5 + git checkout 0.6 + git tag -v 0.6 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 30a46e06b2..1c17ae28f2 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.6~rc5" +securedrop_app_code_version: "0.6" 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 50e1e7bbe3..a2268ac85f 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.6~rc5 +Version: 0.6 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 66d4fceb8f..0195f143df 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,32 +1,8 @@ -securedrop-app-code (0.6~rc5) trusty; urgency=medium +securedrop-app-code (0.6) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Tue, 13 Mar 2018 00:53:19 +0000 - -securedrop-app-code (0.6~rc4) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Fri, 09 Mar 2018 01:08:20 +0000 - -securedrop-app-code (0.6~rc3) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Fri, 02 Mar 2018 22:20:34 +0000 - -securedrop-app-code (0.6~rc2) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 28 Feb 2018 17:11:31 +0000 - -securedrop-app-code (0.6~rc1) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 28 Feb 2018 00:14:44 +0000 + -- SecureDrop Team Tue, 13 Mar 2018 18:46:05 +0000 securedrop-app-code (0.5.2) trusty; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 0865787ef7..06a5f14830 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.6~rc5 +Version: 0.1.0+0.6 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 fdda0d34c6..9fd7ff5ab2 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.6~rc5 +Version: 0.1.1+0.6 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 6cead321dc..850054eec0 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.6~rc5 +Version: 2.8.2+0.6 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 bf134b8f2c..257053d91c 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.6~rc5 +Version: 2.8.2+0.6 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 c2410f4ddf..d6dc9dfe38 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.6~rc5" +securedrop_version: "0.6" 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 d15f2319db..27fda16b1f 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.6~rc5' +__version__ = '0.6'