From c46fbca987c92125bfbf18c90a240a6c6ec76cbd Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Wed, 28 Nov 2018 04:55:46 +0000 Subject: [PATCH 1/7] SecureDrop 0.11.0~rc1 (cherry picked from commit 79823179b1acacaf84d2be16f603aadeb280ddf2) --- changelog.md | 21 +++++++++++++++++++ .../doc/securedrop-app-code/changelog.Debian | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/changelog.md b/changelog.md index 71616c632e..4ecac125f0 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,27 @@ ## 0.11.0~rc1 +### Web application + +* UX improvement: Add username constraints to admin user addition page text (#3746) +* UX improvement: Removed screensaver from the source interface (#3722) +* Update icons on source interface (#2508, #3809) +* API: Posting replies returns uuid (#3915) +* Bugfix: Save only the base filename in DB for replies using API (#3918) + +### Operations + +* Bugfix: resolve OSSEC GPG key import issue in Ansible (#3928) +* Update grsecurity kernels to 4.4.162 (#3913) +* Added intel-microcode package to include microcode updates (#3913) +* Removes 3.14.x grsecurity kernels (#3913) + +### Developer Workflow + +* Updated instruction to merge translations to & from the new Weblate (#3929) +* Updated requests module to 2.20.0 (#3908) +* Updated copyright statement to acknowledge all contributors (#3930) +* Added initial client documentation (#3922) ## 0.10.0 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 24089bbd45..e353870035 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.11.0~rc1) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 28 Nov 2018 04:55:29 +0000 + securedrop-app-code (0.11.0~rc1) trusty; urgency=medium * See changelog.md From 82fddde0a74cfcabc5e250e88ae68ec7cf3f7f6c Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 28 Nov 2018 15:21:24 -0500 Subject: [PATCH 2/7] SecureDrop 0.11.0-rc2 (cherry picked from commit 8d365c5e5489c6fc7b43298f6f5cfa86acdca4f0) --- changelog.md | 4 ++++ 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, 22 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index 4ecac125f0..4593e8bdf8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.11.0~rc2 + +* Updated Ansible to 2.6.8 (#3945) + ## 0.11.0~rc1 ### Web application diff --git a/docs/conf.py b/docs/conf.py index c1e8f020fd..eb868c76e7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0~rc1' +version = '0.11.0~rc2' # The full version, including alpha/beta/rc tags. -release = '0.11.0~rc1' +release = '0.11.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 d0b2533809..c3efca85af 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.11.0~rc1 - git tag -v 0.11.0~rc1 + git checkout 0.11.0~rc2 + git tag -v 0.11.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 9001bf0b4f..3f11e2e505 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.11.0~rc1" +securedrop_app_code_version: "0.11.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 520e4b484b..9388662a80 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.11.0~rc1 +Version: 0.11.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 e353870035..a0a35cbbf1 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.11.0~rc2) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 28 Nov 2018 20:20:15 +0000 + securedrop-app-code (0.11.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 42d7b01d53..b93c2f32bf 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.11.0~rc1 +Version: 0.1.1+0.11.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 20c604f7d4..0b6c2cb46f 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.11.0~rc1 +Version: 0.1.2+0.11.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 9b4a88c914..bb509a464e 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.11.0~rc1 +Version: 3.0.0+0.11.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 dde816e7f8..dc3cb8f981 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.11.0~rc1 +Version: 3.0.0+0.11.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 c8e6e5b701..adac88218e 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0~rc1" +securedrop_version: "0.11.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 cc51f33c79..01533e76f6 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0~rc1' +__version__ = '0.11.0~rc2' From 25eb6a976e8489eafa90a840faa539bd72f3483d Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Mon, 3 Dec 2018 18:32:12 +0000 Subject: [PATCH 3/7] SecureDrop 0.11.0-rc3 (cherry picked from commit 7da70806f5e355b5cd29cdbab257785e02ce04f0) --- changelog.md | 4 ++++ 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, 22 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index 4593e8bdf8..493040bc4d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.11.0~rc3 + +* Removes intel microcode (#3955) + ## 0.11.0~rc2 * Updated Ansible to 2.6.8 (#3945) diff --git a/docs/conf.py b/docs/conf.py index eb868c76e7..7ad5b08081 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0~rc2' +version = '0.11.0~rc3' # The full version, including alpha/beta/rc tags. -release = '0.11.0~rc2' +release = '0.11.0~rc3' # 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 c3efca85af..8ba1f0fb89 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.11.0~rc2 - git tag -v 0.11.0~rc2 + git checkout 0.11.0~rc3 + git tag -v 0.11.0~rc3 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 3f11e2e505..cbc0983d80 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.11.0~rc2" +securedrop_app_code_version: "0.11.0~rc3" 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 9388662a80..73bc8bb0cf 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.11.0~rc2 +Version: 0.11.0~rc3 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 a0a35cbbf1..447d7ac281 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.11.0~rc3) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Mon, 03 Dec 2018 18:32:01 +0000 + securedrop-app-code (0.11.0~rc2) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index b93c2f32bf..84df66d87d 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.11.0~rc2 +Version: 0.1.1+0.11.0~rc3 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 0b6c2cb46f..f522963d6c 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.11.0~rc2 +Version: 0.1.2+0.11.0~rc3 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 bb509a464e..3fc3143948 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.11.0~rc2 +Version: 3.0.0+0.11.0~rc3 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 dc3cb8f981..67b7ccd5d9 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.11.0~rc2 +Version: 3.0.0+0.11.0~rc3 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 adac88218e..deb2adeec7 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0~rc2" +securedrop_version: "0.11.0~rc3" 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 01533e76f6..0c9d090808 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0~rc2' +__version__ = '0.11.0~rc3' From ef23c2d75c42b521e48a70c724808ef264e9e4a2 Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 5 Dec 2018 16:04:06 -0500 Subject: [PATCH 4/7] SecureDrop 0.11.0-rc4 (cherry picked from commit 4df9e03f231e97cb2383f85fe29538bf69a628fd) --- changelog.md | 4 ++++ 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, 22 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index 493040bc4d..156cf47fee 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.11.0~rc4 + +* Replace 'administrator' with 'admin' in the journalist interface (#3940) + ## 0.11.0~rc3 * Removes intel microcode (#3955) diff --git a/docs/conf.py b/docs/conf.py index 7ad5b08081..b64a502256 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0~rc3' +version = '0.11.0~rc4' # The full version, including alpha/beta/rc tags. -release = '0.11.0~rc3' +release = '0.11.0~rc4' # 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 8ba1f0fb89..6374e96bd3 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.11.0~rc3 - git tag -v 0.11.0~rc3 + git checkout 0.11.0~rc4 + git tag -v 0.11.0~rc4 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 cbc0983d80..d83373dd18 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.11.0~rc3" +securedrop_app_code_version: "0.11.0~rc4" 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 73bc8bb0cf..5f1a294b0f 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.11.0~rc3 +Version: 0.11.0~rc4 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 447d7ac281..283bfa0fcf 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.11.0~rc4) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 05 Dec 2018 21:03:20 +0000 + securedrop-app-code (0.11.0~rc3) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 84df66d87d..f43bca623f 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.11.0~rc3 +Version: 0.1.1+0.11.0~rc4 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 f522963d6c..7a30068ded 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.11.0~rc3 +Version: 0.1.2+0.11.0~rc4 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 3fc3143948..4ee7ff73e1 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.11.0~rc3 +Version: 3.0.0+0.11.0~rc4 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 67b7ccd5d9..47345deb94 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.11.0~rc3 +Version: 3.0.0+0.11.0~rc4 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 deb2adeec7..b1508c67bd 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0~rc3" +securedrop_version: "0.11.0~rc4" 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 0c9d090808..7c35b46dd6 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0~rc3' +__version__ = '0.11.0~rc4' From c0053bc044a7f9638818f90065fe7b0e0957a10d Mon Sep 17 00:00:00 2001 From: mickael e Date: Mon, 10 Dec 2018 16:20:01 -0500 Subject: [PATCH 5/7] SecureDrop 0.11.0-rc5 (cherry picked from commit 0cf0df9d9753adb8dc6b3dff5d00353a8c90165c) --- changelog.md | 4 ++++ 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, 22 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index 156cf47fee..27077ab061 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.11.0~rc5 + +* Security bugfix: Disable unecessary sshd config options (#3979) + ## 0.11.0~rc4 * Replace 'administrator' with 'admin' in the journalist interface (#3940) diff --git a/docs/conf.py b/docs/conf.py index b64a502256..fce1855727 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0~rc4' +version = '0.11.0~rc5' # The full version, including alpha/beta/rc tags. -release = '0.11.0~rc4' +release = '0.11.0~rc5' # 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 6374e96bd3..b0f863df69 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.11.0~rc4 - git tag -v 0.11.0~rc4 + git checkout 0.11.0~rc5 + git tag -v 0.11.0~rc5 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 d83373dd18..e7f2f2d939 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.11.0~rc4" +securedrop_app_code_version: "0.11.0~rc5" 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 5f1a294b0f..da9b435fb4 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.11.0~rc4 +Version: 0.11.0~rc5 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 283bfa0fcf..39d5e6a59e 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.11.0~rc5) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Mon, 10 Dec 2018 15:55:50 +0000 + securedrop-app-code (0.11.0~rc4) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index f43bca623f..461d824aad 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.11.0~rc4 +Version: 0.1.1+0.11.0~rc5 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 7a30068ded..d2b6462919 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.11.0~rc4 +Version: 0.1.2+0.11.0~rc5 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 4ee7ff73e1..5ea4cf80a1 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.11.0~rc4 +Version: 3.0.0+0.11.0~rc5 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 47345deb94..ba1c051d6f 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.11.0~rc4 +Version: 3.0.0+0.11.0~rc5 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 b1508c67bd..873fb99e04 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0~rc4" +securedrop_version: "0.11.0~rc5" 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 7c35b46dd6..4b9cfa887f 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0~rc4' +__version__ = '0.11.0~rc5' From 4c52ea73a7a55d7da1d16e024c06a391de3eaceb Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Tue, 11 Dec 2018 21:45:19 +0000 Subject: [PATCH 6/7] SecureDrop 0.11.0 (cherry picked from commit 4412aa4e257ce8273acb1fd7e78cdb571e18fdec) --- changelog.md | 23 +++---------- 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 | 34 ++----------------- .../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, 19 insertions(+), 64 deletions(-) diff --git a/changelog.md b/changelog.md index 27077ab061..955241bfae 100644 --- a/changelog.md +++ b/changelog.md @@ -1,36 +1,22 @@ # Changelog -## 0.11.0~rc5 - -* Security bugfix: Disable unecessary sshd config options (#3979) - -## 0.11.0~rc4 - -* Replace 'administrator' with 'admin' in the journalist interface (#3940) - -## 0.11.0~rc3 - -* Removes intel microcode (#3955) - -## 0.11.0~rc2 - -* Updated Ansible to 2.6.8 (#3945) - -## 0.11.0~rc1 +## 0.11.0 ### Web application * UX improvement: Add username constraints to admin user addition page text (#3746) * UX improvement: Removed screensaver from the source interface (#3722) * Update icons on source interface (#2508, #3809) +* Replace 'administrator' with 'admin' in the journalist interface (#3940) * API: Posting replies returns uuid (#3915) * Bugfix: Save only the base filename in DB for replies using API (#3918) ### Operations * Bugfix: resolve OSSEC GPG key import issue in Ansible (#3928) +* Updated Ansible to 2.6.8 (#3945) * Update grsecurity kernels to 4.4.162 (#3913) -* Added intel-microcode package to include microcode updates (#3913) +* Security bugfix: Disable unecessary sshd config options (#3979) * Removes 3.14.x grsecurity kernels (#3913) ### Developer Workflow @@ -40,7 +26,6 @@ * Updated copyright statement to acknowledge all contributors (#3930) * Added initial client documentation (#3922) - ## 0.10.0 ### Web Applications diff --git a/docs/conf.py b/docs/conf.py index fce1855727..9e78c9ffa9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0~rc5' +version = '0.11.0' # The full version, including alpha/beta/rc tags. -release = '0.11.0~rc5' +release = '0.11.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 b0f863df69..d4f6eefae0 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.11.0~rc5 - git tag -v 0.11.0~rc5 + git checkout 0.11.0 + git tag -v 0.11.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 e7f2f2d939..f3fa44ea2d 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.11.0~rc5" +securedrop_app_code_version: "0.11.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 da9b435fb4..f96765f32a 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.11.0~rc5 +Version: 0.11.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 39d5e6a59e..ba5017a338 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,38 +1,8 @@ -securedrop-app-code (0.11.0~rc5) trusty; urgency=medium +securedrop-app-code (0.11.0) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Mon, 10 Dec 2018 15:55:50 +0000 - -securedrop-app-code (0.11.0~rc4) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 05 Dec 2018 21:03:20 +0000 - -securedrop-app-code (0.11.0~rc3) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Mon, 03 Dec 2018 18:32:01 +0000 - -securedrop-app-code (0.11.0~rc2) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 28 Nov 2018 20:20:15 +0000 - -securedrop-app-code (0.11.0~rc1) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 28 Nov 2018 04:55:29 +0000 - -securedrop-app-code (0.11.0~rc1) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Tue, 23 Oct 2018 21:10:21 +0000 + -- SecureDrop Team Tue, 11 Dec 2018 21:44:44 +0000 securedrop-app-code (0.10.0) trusty; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 461d824aad..362f7e421f 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.11.0~rc5 +Version: 0.1.1+0.11.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 d2b6462919..cac76bbbbf 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.11.0~rc5 +Version: 0.1.2+0.11.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 5ea4cf80a1..10df27ce26 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.11.0~rc5 +Version: 3.0.0+0.11.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 ba1c051d6f..b9ed7ed4e8 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.11.0~rc5 +Version: 3.0.0+0.11.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 873fb99e04..2c64a62ff4 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0~rc5" +securedrop_version: "0.11.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 78bc1abd14..d9df1bbc0c 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -0.10.0 +0.11.0 diff --git a/securedrop/version.py b/securedrop/version.py index 4b9cfa887f..f323a57bec 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0~rc5' +__version__ = '0.11.0' From fa4fdc3f0b5ddba6a91d25d3a94a0401fef337d9 Mon Sep 17 00:00:00 2001 From: redshiftzero Date: Wed, 12 Dec 2018 18:03:32 -0800 Subject: [PATCH 7/7] SecureDrop 0.12.0~rc1 --- changelog.md | 4 ++++ 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, 22 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index 955241bfae..a65b5c5a4a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.12.0~rc1 + + + ## 0.11.0 ### Web application diff --git a/docs/conf.py b/docs/conf.py index 9e78c9ffa9..63e933bc15 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.11.0' +version = '0.12.0~rc1' # The full version, including alpha/beta/rc tags. -release = '0.11.0' +release = '0.12.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 d4f6eefae0..182e1da408 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.11.0 - git tag -v 0.11.0 + git checkout 0.12.0~rc1 + git tag -v 0.12.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 f3fa44ea2d..557101991a 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.11.0" +securedrop_app_code_version: "0.12.0~rc1" 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 f96765f32a..2d226924b9 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.11.0 +Version: 0.12.0~rc1 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 ba5017a338..de2ba97481 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.12.0~rc1) trusty; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 13 Dec 2018 02:02:05 +0000 + securedrop-app-code (0.11.0) trusty; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 362f7e421f..0fe5c319d6 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.11.0 +Version: 0.1.1+0.12.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 cac76bbbbf..5fa5553cac 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.11.0 +Version: 0.1.2+0.12.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 10df27ce26..fcc76a2790 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.11.0 +Version: 3.0.0+0.12.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 b9ed7ed4e8..72115a6a50 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.11.0 +Version: 3.0.0+0.12.0~rc1 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 2c64a62ff4..f0f54ec967 100644 --- a/molecule/builder/tests/vars.yml +++ b/molecule/builder/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.11.0" +securedrop_version: "0.12.0~rc1" 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 f323a57bec..0e2de20665 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.11.0' +__version__ = '0.12.0~rc1'