From 94b84dc08f4188acba48ebbe84e52d88fd494ef8 Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Thu, 11 Oct 2018 17:47:09 +0000 Subject: [PATCH] SecureDrop 0.10.0~rc2 --- changelog.md | 5 +++-- 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 | 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/tests/vars.yml | 2 +- securedrop/version.py | 2 +- 12 files changed, 21 insertions(+), 14 deletions(-) diff --git a/changelog.md b/changelog.md index 00d8f1d3c9..5aa2d52894 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.10.0~rc1 +## 0.10.0~rc2 ### Web Applications @@ -9,7 +9,8 @@ ### Operations * Updated OSSEC to 3.0.0 and use GPG signatures for verifying sources (#3701) -* Upgrade tor to 0.3.4.8 (#3813) +* Update paramiko to 2.4.2 (#3861) +* Enforce use of the latest grsecurity-patched kernel on servers (#3842) ### Development diff --git a/docs/conf.py b/docs/conf.py index 2fdee2d462..fc75dd5cc1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.10.0~rc1' +version = '0.10.0~rc2' # The full version, including alpha/beta/rc tags. -release = '0.10.0~rc1' +release = '0.10.0~rc2' # 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 7d612746f3..6d5cbf52b8 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.10.0~rc1 - git tag -v 0.10.0~rc1 + git checkout 0.10.0~rc2 + git tag -v 0.10.0~rc2 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 a24f613004..605f1a7fc9 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.10.0~rc1" +securedrop_app_code_version: "0.10.0~rc2" 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 1aa870a362..b5d6824970 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.10.0~rc1 +Version: 0.10.0~rc2 Architecture: amd64 Depends: python-pip,apparmor-utils,gnupg2,haveged,python,secure-delete,sqlite3,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor,securedrop-keyring,securedrop-config,libpython2.7-dev 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 5ef12d178e..ea4b00f453 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,3 +1,9 @@ +securedrop-app-code (0.10.0~rc2) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 11 Oct 2018 17:46:59 +0000 + securedrop-app-code (0.10.0~rc1) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index e52e88fb6a..a1c4e8af8c 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.1+0.10.0~rc1 +Version: 0.1.1+0.10.0~rc2 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 e3a3e9b9d3..c58c9ba0e5 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.10.0~rc1 +Version: 0.1.2+0.10.0~rc2 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 4620500443..37705617a2 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.10.0~rc1 +Version: 3.0.0+0.10.0~rc2 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 b3249770d7..e8a845f027 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.10.0~rc1 +Version: 3.0.0+0.10.0~rc2 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 10f041f205..ed9cbe73f7 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.10.0~rc1" +securedrop_version: "0.10.0~rc2" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.1" diff --git a/securedrop/version.py b/securedrop/version.py index da2ea1ca45..2d2ab167f2 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.10.0~rc1' +__version__ = '0.10.0~rc2'