Merge pull request #6017 from freedomofpress/bump-2.0.0-rc5-version

Bumps SecureDrop version to 2.0.0-rc5
freedomofpress · Jun 23, 2021 · 6bf606d · 6bf606d
2 parents 30138c8 + 1668767
commit 6bf606d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.0~rc5
+
+* Bugfix: Prevent creation of a duplicate source keypair (#6011)
+
 ## 2.0.0~rc4
 
 * Bugfix: remove haveged from securedrop-app-code control file (#6006)

diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
@@ -2,7 +2,7 @@
 # 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_version: "2.0.0~rc4"
+securedrop_version: "2.0.0~rc5"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.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
@@ -1,3 +1,9 @@
+securedrop-app-code (2.0.0~rc5+focal) focal; urgency=medium
+
+  * see changelog.md
+
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 22 Jun 2021 23:32:45 -0400
+
 securedrop-app-code (2.0.0~rc4+focal) focal; urgency=medium
 
   * see changelog.md 

diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "2.0.0~rc4"
+securedrop_version: "2.0.0~rc5"
 ossec_version: "3.6.0"
 keyring_version: "0.1.5"
 config_version: "0.1.4"

diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '2.0.0~rc4'
+__version__ = '2.0.0~rc5'
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.0.0~rc4",
+    version="2.0.0~rc5",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",