From 1d8ac698731fef6437cd2c5febe58ac0b1e61f46 Mon Sep 17 00:00:00 2001 From: mickael e Date: Thu, 17 Oct 2019 16:42:05 -0400 Subject: [PATCH] SecureDrop 1.1.0-rc4 --- changelog.md | 2 ++ install_files/ansible-base/group_vars/all/securedrop | 4 ++-- .../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 | 2 +- install_files/securedrop-ossec-server/DEBIAN/control | 2 +- molecule/builder-xenial/tests/vars.yml | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index 8b438d96dc..c96b498c7c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ # Changelog +## 1.1.0~rc4 + ## 1.1.0~rc3 ## 1.1.0~rc2 diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index a0f67e4eb9..59ca4a165a 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.1.0~rc3" -securedrop_app_code_sdist_version: "securedrop-app-code-1.1.0-rc3" +securedrop_app_code_version: "1.1.0~rc4" +securedrop_app_code_sdist_version: "securedrop-app-code-1.1.0-rc4" 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-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index 202dcab30b..509e51ac75 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.1.0~rc4+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Thu, 17 Oct 2019 20:41:34 +0000 + securedrop-app-code (1.1.0~rc3+xenial) xenial; urgency=medium * See changelog.md diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 2acddee17d..8b37ddf7a8 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.1.0~rc3 +Version: 0.1.3+1.1.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 194630fe7c..571060e2a8 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.3+1.1.0~rc3 +Version: 0.1.3+1.1.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 4ad93e5201..2041ba334f 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+1.1.0~rc3 +Version: 3.0.0+1.1.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 1052d22083..8f7061a4c0 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+1.1.0~rc3 +Version: 3.0.0+1.1.0~rc4 Architecture: amd64 Depends: ossec-server,securedrop-keyring,securedrop-config Replaces: ossec-server diff --git a/molecule/builder-xenial/tests/vars.yml b/molecule/builder-xenial/tests/vars.yml index 35899ad0f4..9c24237276 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.1.0~rc3" +securedrop_version: "1.1.0~rc4" ossec_version: "3.0.0" keyring_version: "0.1.3" config_version: "0.1.3" diff --git a/securedrop/version.py b/securedrop/version.py index 594199ca80..97f8bf04cc 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.1.0~rc3' +__version__ = '1.1.0~rc4' diff --git a/setup.py b/setup.py index f969967d1d..838a7c6df8 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.1.0~rc3", + version="1.1.0~rc4", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",