diff --git a/changelog.md b/changelog.md index 8439b6d46a..f3ecf4e0c3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## 1.7.0~rc2 + +* Fixup commits for RC1 changes: + - AppArmor rule fixes (#5705) + - String pluralization improvements (#5707) + ## 1.7.0~rc1 ### Web Applications diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 3905e60ab7..89342a0e1a 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~rc1" -securedrop_app_code_sdist_version: "securedrop-app-code-1.7.0-rc1" +securedrop_app_code_version: "1.7.0~rc2" +securedrop_app_code_sdist_version: "securedrop-app-code-1.7.0-rc2" 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 aa99db4fb5..1dfad82c76 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.0~rc2+focal) focal; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 14 Jan 2021 17:45:17 -0800 + securedrop-app-code (1.7.0~rc1+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 ba8126b38b..d5f57588c6 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.0~rc2+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 14 Jan 2021 17:45:06 -0800 + securedrop-app-code (1.7.0~rc1+xenial) xenial; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 3a6236a500..4e570efe9f 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~rc1 +Version: 0.1.3+1.7.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 b97c107796..30cfa76d02 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~rc1 +Version: 0.1.4+1.7.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.j2 b/install_files/securedrop-ossec-agent/DEBIAN/control.j2 index b98765c64e..d32747ae77 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~rc1 +Version: 3.6.0+1.7.0~rc2 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 ef9ee3508a..e63590dc25 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~rc1 +Version: 3.6.0+1.7.0~rc2 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 ac6f33d92a..212c311b6a 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.7.0~rc1" +securedrop_version: "1.7.0~rc2" ossec_version: "3.6.0" keyring_version: "0.1.4" config_version: "0.1.3" diff --git a/securedrop/version.py b/securedrop/version.py index 3f31c7120e..a59437b68e 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.7.0~rc1' +__version__ = '1.7.0~rc2' diff --git a/setup.py b/setup.py index 28ecd112d4..813d94a770 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.7.0~rc1", + version="1.7.0~rc2", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",