From 138d67f7130813dc81a6b5c7c22f52bc90070631 Mon Sep 17 00:00:00 2001 From: mickael e Date: Thu, 25 Apr 2019 18:01:01 +0000 Subject: [PATCH] SecureDrop 0.12.2 --- changelog.md | 6 ++---- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- docs/upgrade/xenial_backup_install_restore.rst | 4 ++-- docs/upgrade/xenial_prep.rst | 18 +++++++++--------- docs/upgrade/xenial_upgrade_in_place.rst | 10 +++++----- .../ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-trusty | 10 ++-------- .../files/changelog-xenial | 12 +++--------- install_files/securedrop-config/DEBIAN/control | 2 +- .../securedrop-keyring/DEBIAN/control | 2 +- .../securedrop-ossec-agent/DEBIAN/control | 2 +- .../securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-trusty/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- 16 files changed, 35 insertions(+), 49 deletions(-) diff --git a/changelog.md b/changelog.md index 222013508e..592941c142 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,6 @@ # Changelog -## 0.12.2~rc2 - - -## 0.12.2~rc1 +## 0.12.2 ### Web Application @@ -15,6 +12,7 @@ * SecureDrop grsec kernels have been updated to 4.4.177 and provide support for Intel e1000e series NICs (#4308) * OSSEC test notifications will now generate ossec alerts (#4340) +* Updated AppArmor for Apache2 (#4362) ### Tails Environment diff --git a/docs/conf.py b/docs/conf.py index 1db4c54ebb..45a312283b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '0.12.1' +version = '0.12.2' # The full version, including alpha/beta/rc tags. -release = '0.12.1' +release = '0.12.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 8e651c35da..b1353d8daa 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.12.1 - git tag -v 0.12.1 + git checkout 0.12.2 + git tag -v 0.12.2 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/docs/upgrade/xenial_backup_install_restore.rst b/docs/upgrade/xenial_backup_install_restore.rst index 2cc3cc12be..2b9e1f1949 100644 --- a/docs/upgrade/xenial_backup_install_restore.rst +++ b/docs/upgrade/xenial_backup_install_restore.rst @@ -159,7 +159,7 @@ code is up-to-date and validated. From a terminal, run the following commands: cd ~/Persistent/securedrop git fetch --tags - git tag -v 0.12.1 + git tag -v 0.12.2 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command, along with the fingerprint ``"2224 5C81 E3BA EB41 @@ -177,7 +177,7 @@ First, check out the release tag that you validated above: .. code:: sh - git checkout 0.12.1 + git checkout 0.12.2 Next, run the following command to set up the SecureDrop administration environment: diff --git a/docs/upgrade/xenial_prep.rst b/docs/upgrade/xenial_prep.rst index b52456f4cb..f112bd69d8 100644 --- a/docs/upgrade/xenial_prep.rst +++ b/docs/upgrade/xenial_prep.rst @@ -13,7 +13,7 @@ release series on February 26. The operating system update itself must be performed manually. We recommend that you plan two working days (after your instance has been -updated to SecureDrop 0.12.1) to backup your instance, perform the upgrade, and +updated to SecureDrop 0.12.2) to backup your instance, perform the upgrade, and test your instance once it is upgraded. We recommend scheduling this maintenance window no earlier than March 6. @@ -51,7 +51,7 @@ from the command line on the *Application Server* by running the command: SecureDrop servers are updated automatically with the latest release version -(0.12.1). Recently, some long-running SecureDrop instances were affected by a +(0.12.2). Recently, some long-running SecureDrop instances were affected by a bug which will cause any updates after 0.10.0 to fail. If your instance is still running 0.10.0, please `consult our advisory `_ to update to the latest version. @@ -92,7 +92,7 @@ The output from ``git status`` should include the following text: where ```` is the version of the workstation code that is installed. -If the *Admin Workstation* is at version 0.12.1, it is up-to-date, and you can +If the *Admin Workstation* is at version 0.12.2, it is up-to-date, and you can proceed with :ref:`making a backup of the instance ` and :ref:`verifying SSH connectivity `. If the *Admin Workstation* is running an earlier version, you will need to upgrade it, using @@ -105,7 +105,7 @@ the appropriate steps for your version: Upgrading from version 0.9.1 or later ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -If the workstation is at least at version 0.9.1 and up to version 0.12.1, you +If the workstation is at least at version 0.9.1 and up to version 0.12.2, you should see a graphical updater informing you about the availability of a new version. The graphical updater looks like this: @@ -133,7 +133,7 @@ following commands: cd ~/Persistent/securedrop git fetch --tags gpg --recv-key "2224 5C81 E3BA EB41 38B3 6061 310F 5612 00F4 AD77" - git tag -v 0.12.1 + git tag -v 0.12.2 The output should include the following two lines: @@ -147,9 +147,9 @@ the screen of your workstation. If it does, you can check out the new release: .. code:: sh - git checkout 0.12.1 + git checkout 0.12.2 -.. important:: If you see the warning ``refname ‘0.12.1’ is ambiguous`` in the +.. important:: If you see the warning ``refname ‘0.12.2’ is ambiguous`` in the output, we recommend that you contact us immediately at securedrop@freedom.press (GPG encrypted). @@ -188,7 +188,7 @@ code: cd ~/Persistent git clone https://github.com/freedomofpress/securedrop.git cd ~Persistent/securedrop - git tag -v 0.12.1 + git tag -v 0.12.2 .. note:: The SecureDrop application code must be installed in the `~/Persistent/securedrop` directory in order to complete the reprovisioning @@ -211,7 +211,7 @@ Now, check out the current release with the following command: .. code:: sh - git checkout 0.12.1 + git checkout 0.12.2 Next, mount the persistent volume of the old *Admin Workstation* in order to retrieve instance-specific files that you’ll need to set up the new workstation. diff --git a/docs/upgrade/xenial_upgrade_in_place.rst b/docs/upgrade/xenial_upgrade_in_place.rst index db126a3851..aefa6cac0f 100644 --- a/docs/upgrade/xenial_upgrade_in_place.rst +++ b/docs/upgrade/xenial_upgrade_in_place.rst @@ -30,7 +30,7 @@ Before performing the upgrade, please perform all the steps outlined in .. warning:: In order to successfully upgrade your SecureDrop instance, it is of critical importance that your *Admin Workstation* and your servers use SecureDrop - 0.12.1. Releases prior to the 0.12 series of SecureDrop do not not support + 0.12.2. Releases prior to the 0.12 series of SecureDrop do not not support Ubuntu 16.04. @@ -213,7 +213,7 @@ code is up-to-date and validated. From a terminal, run the following commands: cd ~/Persistent/securedrop git fetch --tags - git tag -v 0.12.1 + git tag -v 0.12.2 You should see ``Good signature from "SecureDrop Release Signing Key"`` in the output of that last command, along with the fingerprint @@ -231,7 +231,7 @@ First, check out the release tag that you validated above: .. code:: sh - git checkout 0.12.1 + git checkout 0.12.2 Next, in the terminal, run the following command to set up the SecureDrop admin environment: @@ -277,7 +277,7 @@ Server* and your *Monitor Server*. Validate the application version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -To confirm that you are running SecureDrop 0.12.1 for Xenial, on the Tails +To confirm that you are running SecureDrop 0.12.2 for Xenial, on the Tails desktop, you should find a shortcut called **SecureDrop Source Interface**. Double-click it to launch the Tor browser. @@ -285,7 +285,7 @@ After the *Source Interface* loads, add the path ``/metadata`` to the URL in your address bar. If your *Source Interface* can be found at ``examplenot4real.onion``, then the address you should visit is ``examplenot4real.onion/metadata``. That page should show you key/value pairs, -including ``0.12.1`` for ``sd_version`` and ``16.04`` for ``server_os``. +including ``0.12.2`` for ``sd_version`` and ``16.04`` for ``server_os``. End-to-end test ^^^^^^^^^^^^^^^ diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 10af5663c2..d5248c9a2a 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.12.2~rc2" +securedrop_app_code_version: "0.12.2" grsecurity: true install_local_packages: false diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty index 37f4b25d95..fc03a43d93 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty @@ -1,14 +1,8 @@ -securedrop-app-code (0.12.2~rc2+trusty) trusty; urgency=medium +securedrop-app-code (0.12.2+trusty) trusty; urgency=medium * See changelog.md - -- SecureDrop Team Wed, 24 Apr 2019 22:19:53 +0000 - -securedrop-app-code (0.12.2~rc1+trusty) trusty; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 17 Apr 2019 18:32:37 +0000 + -- SecureDrop Team Thu, 25 Apr 2019 17:53:36 +0000 securedrop-app-code (0.12.1+trusty) trusty; urgency=medium diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index 705cc8b463..e18a0376f6 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial @@ -1,14 +1,8 @@ -securedrop-app-code (0.12.2~rc2+xenial) xenial; urgency=medium +securedrop-app-code (0.12.2+xenial) xenial; urgency=medium - * See changelog.md - - -- SecureDrop Team Wed, 24 Apr 2019 22:19:59 +0000 - -securedrop-app-code (0.12.2~rc1+xenial) xenial; urgency=medium - - * See changelog.md + * See changelog.md - -- SecureDrop Team Wed, 17 Apr 2019 18:32:47 +0000 + -- SecureDrop Team Thu, 25 Apr 2019 17:54:15 +0000 securedrop-app-code (0.12.1+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 0f30774dbd..0a728ec6d7 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.3+0.12.2~rc2 +Version: 0.1.3+0.12.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 9f8a45cc9a..caa9d10f50 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.12.2~rc2 +Version: 0.1.2+0.12.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 70e086a5da..4b4981b2f2 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.12.2~rc2 +Version: 3.0.0+0.12.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 496da3c5f0..dcaea1559b 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.12.2~rc2 +Version: 3.0.0+0.12.2 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-trusty/tests/vars.yml b/molecule/builder-trusty/tests/vars.yml index 87fbd8e655..09e3d9fcf0 100644 --- a/molecule/builder-trusty/tests/vars.yml +++ b/molecule/builder-trusty/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "0.12.2~rc2" +securedrop_version: "0.12.2" ossec_version: "3.0.0" keyring_version: "0.1.2" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 34a83616bb..26acbf080b 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -0.12.1 +0.12.2 diff --git a/securedrop/version.py b/securedrop/version.py index 9ef6249c4e..92a60bdf25 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '0.12.2~rc2' +__version__ = '0.12.2'