From eba66c3a99f7ce543b94440100fe2dad42aa2aef Mon Sep 17 00:00:00 2001 From: John Hensley Date: Wed, 19 Feb 2020 14:40:50 +0000 Subject: [PATCH] Update version to 1.2.1 final --- changelog.md | 2 +- docs/conf.py | 4 ++-- docs/set_up_admin_tails.rst | 4 ++-- install_files/ansible-base/group_vars/all/securedrop | 4 ++-- .../build-securedrop-app-code-deb-pkg/files/changelog-xenial | 4 ++-- 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 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/changelog.md b/changelog.md index ecb484674f..0c093543eb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 1.2.1~rc1 +## 1.2.1 ### Web Applications diff --git a/docs/conf.py b/docs/conf.py index 1a76aa3a89..6d51c124ef 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,9 +57,9 @@ # built documents. # # The short X.Y version. -version = '1.2.0' +version = '1.2.1' # The full version, including alpha/beta/rc tags. -release = '1.2.0' +release = '1.2.1' # 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 270bb22ef4..6a660eaec5 100644 --- a/docs/set_up_admin_tails.rst +++ b/docs/set_up_admin_tails.rst @@ -131,8 +131,8 @@ signed with the release signing key: .. code:: sh cd ~/Persistent/securedrop/ - git checkout 1.2.0 - git tag -v 1.2.0 + git checkout 1.2.1 + git tag -v 1.2.1 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/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 23aa708577..0ea9f84a12 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.2.1~rc1" -securedrop_app_code_sdist_version: "securedrop-app-code-1.2.1-rc1" +securedrop_app_code_version: "1.2.1" +securedrop_app_code_sdist_version: "securedrop-app-code-1.2.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-xenial b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-xenial index 282ef4c61f..5b9ab5e057 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,8 +1,8 @@ -securedrop-app-code (1.2.1~rc1+xenial) xenial; urgency=medium +securedrop-app-code (1.2.1+xenial) xenial; urgency=medium * See changelog.md - -- SecureDrop Team Wed, 12 Feb 2020 23:45:26 +0000 + -- SecureDrop Team Wed, 19 Feb 2020 14:40:43 +0000 securedrop-app-code (1.2.0+xenial) xenial; urgency=medium diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control index 2a8cea3154..1b4f87eb28 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.2.1~rc1 +Version: 0.1.3+1.2.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 df5237f951..115ff2479b 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.2.1~rc1 +Version: 0.1.3+1.2.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 b/install_files/securedrop-ossec-agent/DEBIAN/control index 70706aa1a7..64666a082f 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.2.1~rc1 +Version: 3.0.0+1.2.1 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 c5bb42cc09..bb6ec120b7 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.2.1~rc1 +Version: 3.0.0+1.2.1 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 148785881a..ab4719072f 100644 --- a/molecule/builder-xenial/tests/vars.yml +++ b/molecule/builder-xenial/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "1.2.1~rc1" +securedrop_version: "1.2.1" ossec_version: "3.0.0" keyring_version: "0.1.3" config_version: "0.1.3" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 26aaba0e86..6085e94650 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.2.0 +1.2.1 diff --git a/securedrop/version.py b/securedrop/version.py index 3bcaa6d30b..3f262a6347 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '1.2.1~rc1' +__version__ = '1.2.1' diff --git a/setup.py b/setup.py index 99e32af2a8..7429b61440 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="1.2.1~rc1", + version="1.2.1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",