From 60a4ea38ae8baa78ac7a05aced580da34167c141 Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Tue, 23 Oct 2018 17:53:40 +0000 Subject: [PATCH] SecureDrop 0.10.0 --- 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 | 24 +++---------------- .../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 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- 13 files changed, 17 insertions(+), 35 deletions(-) diff --git a/changelog.md b/changelog.md index 4de86e373e..e6a3fcbc81 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 0.10.0~rc4 +## 0.10.0 ### Web Applications diff --git a/docs/conf.py b/docs/conf.py index b3454fbe56..ddf4fc4ca5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.10.0~rc4' +version = '0.10.0' # The full version, including alpha/beta/rc tags. -release = '0.10.0~rc4' +release = '0.10.0' # 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 279c69cab0..f5d88f0eec 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~rc4 - git tag -v 0.10.0~rc4 + git checkout 0.10.0 + git tag -v 0.10.0 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 2944a6a0ad..9f551cfdf0 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~rc4" +securedrop_app_code_version: "0.10.0" 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 b171252e09..3b7b5f4608 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~rc4 +Version: 0.10.0 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 593971a5b0..e0f5485d5c 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,28 +1,10 @@ -securedrop-app-code (0.10.0~rc4) trusty; urgency=medium +securedrop-app-code (0.10.0) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Tue, 23 Oct 2018 02:37:35 +0000 + -- SecureDrop Team Tue, 23 Oct 2018 17:53:14 +0000 -securedrop-app-code (0.10.0~rc3) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Fri, 19 Oct 2018 01:23:52 +0000 - -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 - - -- SecureDrop Team Tue, 09 Oct 2018 23:41:12 +0000 - - securedrop-app-code (0.9.1) trusty; urgency=medium +securedrop-app-code (0.9.1) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index adf4a4f06a..87fb9b0f4b 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~rc4 +Version: 0.1.1+0.10.0 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 df88f0812a..d0546c277c 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~rc4 +Version: 0.1.2+0.10.0 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 d49bebb546..8dd7d869aa 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~rc4 +Version: 3.0.0+0.10.0 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 5f0b9f6644..9aab0d538e 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~rc4 +Version: 3.0.0+0.10.0 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 d2c630ff26..32dab16b30 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.10.0~rc4" +securedrop_version: "0.10.0" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.1" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index f374f6662e..78bc1abd14 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -0.9.1 +0.10.0 diff --git a/securedrop/version.py b/securedrop/version.py index d1de599e04..9d1bb721be 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.10.0~rc4' +__version__ = '0.10.0'