Merge pull request #6018 from freedomofpress/update-2.0.0-version

Update SecureDrop to  version 2.0.0

changelog.md

@@ -1,34 +1,16 @@
 # 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)
-* Bugfix: disable haveged if it is present (#6008)
-
-## 2.0.0~rc3
-
-* Bugfix: torrc_additions file is now created if it doesn't already exist (#5999)
-* Bugfix: updater tag signature verification now matches 2021 key (#5998)
-
-## 2.0.0~rc2
-
-* Bugfix: Tails config validation allows for fresh installs (#5990)
-
-## 2.0.0~rc1
+## 2.0.0
 
 ### Web applications
 
 * Removed inappropriate terms from wordlist (#5895)
 * Updated dependencies: babel from 2.5.1 to 2.9.1; cryptography from 3.2.1 to 3.4.7 (#5968, #5964)
-* Removed flag-for-reply functionality (#5954)
+* Removed flag-for-reply functionality (#5954, #6006, #6008, #6011)
 * Removed workaround for CSRF token set under Python 2 (#5957)
 * Removed `source_v2_url` field from SI metadata endpoint (#5926)
 * Bugfix: store directory is recreated if missing for an existing source (#5944)
-* Removed Xenial-only code from codebase (#5911)
+* Removed Xenial-only code from codebase (#5911, #5990, #5999)
 * Updated error message text (#5905, #5932)
 * Updated server OS information check (#5878)
 * Improved performance of logo image requests (#5874)
@@ -45,6 +27,7 @@
 * Removed upload-screenshots.py from application package (#5941)
 * Updated dependencies: py from 1.9.0 to 1.10.0; ansible from 2.9.7 -> 2.9.21 (#5925)
 * Bugfix: corrected errors in `tailsconfig` validation logic and set requirement for Tails 4.x (#5965)
+* Bugfix: updater tag signature verification now matches 2021 key (#5998)
 * Removed support for v2 service configuration (#5915)
 
 ### Development

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~rc5"
+securedrop_version: "2.0.0"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal

@@ -1,38 +1,8 @@
-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 
-
- -- SecureDrop Team <securedrop@freedom.press>  Mon, 21 Jun 2021 18:22:56 -0700
-
-securedrop-app-code (2.0.0~rc3+focal) focal; urgency=medium
-
-  * see changelog.md
-
- -- SecureDrop Team <securedrop@freedom.press>  Thu, 17 Jun 2021 10:50:35 -0400
-
-securedrop-app-code (2.0.0~rc2+focal) focal; urgency=medium
-
-  * see changelog.md
-
- -- SecureDrop Team <securedrop@freedom.press>  Tue, 15 Jun 2021 15:09:33 -0400
-
-securedrop-app-code (2.0.0~rc1+focal) focal; urgency=medium
+securedrop-app-code (2.0.0+focal) focal; urgency=medium
 
   * see changelog.md 
 
- -- SecureDrop Team <securedrop@freedom.press>  Wed, 09 Jun 2021 13:49:31 -0400
-
-securedrop-app-code (1.9.0~rc1+focal) focal; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <securedrop@freedom.press>  Fri, 12 Mar 2021 10:19:54 -0500
+ -- SecureDrop Team <securedrop@freedom.press>  Wed, 23 Jun 2021 16:15:44 -0400
 
 securedrop-app-code (1.8.2+focal) focal; urgency=medium
 

molecule/builder-focal/tests/vars.yml

@@ -1,5 +1,5 @@
 ---
-securedrop_version: "2.0.0~rc5"
+securedrop_version: "2.0.0"
 ossec_version: "3.6.0"
 keyring_version: "0.1.5"
 config_version: "0.1.4"

molecule/shared/stable.ver

@@ -1 +1 @@
-1.8.2
+2.0.0

securedrop/version.py

@@ -1 +1 @@
-__version__ = '2.0.0~rc5'
+__version__ = '2.0.0'

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.0.0~rc5",
+    version="2.0.0",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",