From aaca72cb7f0f2b836b2167a4a2a7708a8b1ef7a3 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Wed, 27 Jan 2021 14:11:53 -0500 Subject: [PATCH] SecureDrop 1.7.1 --- changelog.md | 4 ++++ install_files/ansible-base/group_vars/all/securedrop | 4 ++-- .../build-securedrop-app-code-deb-pkg/files/changelog-focal | 6 ++++++ .../files/changelog-xenial | 6 ++++++ install_files/securedrop-config/DEBIAN/control | 2 +- install_files/securedrop-keyring/DEBIAN/control | 2 +- install_files/securedrop-ossec-agent/DEBIAN/control.j2 | 2 +- install_files/securedrop-ossec-server/DEBIAN/control.j2 | 2 +- molecule/builder-xenial/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 12 files changed, 26 insertions(+), 10 deletions(-) diff --git a/changelog.md b/changelog.md index 862ecd8194..dc8c293a97 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 1.7.1 + +* Bugfix: Fixes an issue affecting availability of Source and Journalist Interfaces for a subset of instances. (#5759) + ## 1.7.0 ### Web Applications diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index be4e8622f2..571034ed92 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,8 +2,8 @@ # 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: "1.7.0" -securedrop_app_code_sdist_version: "securedrop-app-code-1.7.0" +securedrop_app_code_version: "1.7.1" +securedrop_app_code_sdist_version: "securedrop-app-code-1.7.1" securedrop_app_code_sdist_name: "{{ securedrop_app_code_sdist_version }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index b218f1ed4a..4db8a39ae1 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,3 +1,9 @@ +securedrop-app-code (1.7.1+focal) focal; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 27 Jan 2021 14:11:24 -0500 + securedrop-app-code (1.7.0~rc4+focal) focal; urgency=medium * See changelog.md 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 d1be24c0eb..20b991185e 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,3 +1,9 @@ +securedrop-app-code (1.7.1+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 27 Jan 2021 14:10:48 -0500 + securedrop-app-code (1.7.0+xenial) xenial; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 3c2d48c56c..224903b818 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+1.7.0 +Version: 0.1.3+1.7.1 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 504e8f0aaa..59b57537ee 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.4+1.7.0 +Version: 0.1.4+1.7.1 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.j2 b/install_files/securedrop-ossec-agent/DEBIAN/control.j2 index d60bcc7946..9b5abc16a0 100644 --- a/install_files/securedrop-ossec-agent/DEBIAN/control.j2 +++ b/install_files/securedrop-ossec-agent/DEBIAN/control.j2 @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-agent -Version: 3.6.0+1.7.0 +Version: 3.6.0+1.7.1 Architecture: amd64 {% if securedrop_build_focal_support %} Depends: libevent-2.1-7,libpcre2-8-0,ossec-agent,securedrop-keyring,securedrop-config diff --git a/install_files/securedrop-ossec-server/DEBIAN/control.j2 b/install_files/securedrop-ossec-server/DEBIAN/control.j2 index f58f98c837..5f8b879c9b 100644 --- a/install_files/securedrop-ossec-server/DEBIAN/control.j2 +++ b/install_files/securedrop-ossec-server/DEBIAN/control.j2 @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-ossec-server -Version: 3.6.0+1.7.0 +Version: 3.6.0+1.7.1 Architecture: amd64 {% if securedrop_build_focal_support %} Depends: libevent-2.1-7,libpcre2-8-0,ossec-server,securedrop-keyring,securedrop-config diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index 7cc14d39d5..ad426fa3f1 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.7.0" +securedrop_version: "1.7.1" ossec_version: "3.6.0" keyring_version: "0.1.4" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index bd8bf882d0..943f9cbc4e 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.7.0 +1.7.1 diff --git a/securedrop/version.py b/securedrop/version.py index 0e1a38d3c2..48c2f6b0b3 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.7.0' +__version__ = '1.7.1' diff --git a/setup.py b/setup.py index b7987727c7..95cc3d7acf 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.7.0", + version="1.7.1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",