From 09bfa45c827c5eb0012e5de921505461e7859154 Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 4 Sep 2019 18:11:36 -0400 Subject: [PATCH] SecureDrop 1.0.0-rc2 --- 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 a5d4fd53ee..08f68bceec 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ # Changelog +## 1.0.0~rc2 + ## 1.0.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 187dd2bf1f..d6a0e100eb 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.0.0~rc1" -securedrop_app_code_sdist_version: "securedrop-app-code-1.0.0-rc1" +securedrop_app_code_version: "1.0.0~rc2" +securedrop_app_code_sdist_version: "securedrop-app-code-1.0.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-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index aed0288095..50ebb28ab7 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.0.0~rc2+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Wed, 04 Sep 2019 22:10:54 +0000 + securedrop-app-code (1.0.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 811f1dd101..4f4db949e5 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.0.0~rc1 +Version: 0.1.3+1.0.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 b3477bfa35..9dd0637ee8 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.0.0~rc1 +Version: 0.1.3+1.0.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 3452501b1b..f393188c01 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.0.0~rc1 +Version: 3.0.0+1.0.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 75ab2b47f9..ecfc576f08 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.0.0~rc1 +Version: 3.0.0+1.0.0~rc2 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 99d695220f..e5c706cadc 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.0.0~rc1" +securedrop_version: "1.0.0~rc2" 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 890cd683ad..b72c94507f 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.0.0~rc1' +__version__ = '1.0.0~rc2' diff --git a/setup.py b/setup.py index 2387c4a735..e033c0641a 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.0.0~rc1", + version="1.0.0~rc2", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",