SecureDrop 1.5.0

freedomofpress · Jul 28, 2020 · f6f873e · f6f873e
1 parent df50e08
commit f6f873e
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 41 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,33 +1,41 @@
 # Changelog
 
-## 1.5.0~rc3
+## 1.5.0
 
-* Remove unused/disabled source onion service info files (#5404)
-
-## 1.5.0~rc2
+### Web Applications
 
 * Fixes #5378, adds more checks for invalid username (#5380)
-* Consistent usage of "onion services" terminology (#5379)
-* Add v2 deprecation timeline & warnings to docs (#5373)
+* Add v2 onion service deprecation warning to journalist interface (#5366)
+* Changed modal_warning message in the delete source dialogue to match the context (#5358)
+* Further redaction of wordlist (#5357)
+* Handle case of deleted journalists (#5284)
 
-## 1.5.0~rc1
+### Operations
 
+* Remove unused/disabled source onion service info files (#5404)
 * Update Tor to 0.4.3.6 (#5374)
 * Add v2 onion service deprecation warning to securedrop-admin (#5370)
-* Add v2 onion service deprecation warning to journalist interface (#5366)
 * Update kernel version to 4.14.188 (#5365)
-* Changed modal_warning message in the delete source dialogue to match the context (#5358)
-* Further redaction of wordlist (#5357)
+* Ignore tmp files in /var/lib/securedrop/shredder (#5308)
+
+### Journalist API
+
 * Handle disconnected replies in API endpoint (#5351)
 * Handle disconnected submissions in API endpoint (#5345)
-* Ignore tmp files in /var/lib/securedrop/shredder (#5308)
+
+### Documentation
+
+* Consistent usage of "onion services" terminology (#5379)
+* Add v2 deprecation timeline & warnings to docs (#5373)
+
+### Development 
+
 * Add type annotations for source_app/utils.py (#5300)
 * Update syntax for existing type annotations (#5298)
-* Handle case of deleted journalists (#5284)
 
 ## 1.4.1
 
-* Bugfix: Updated securedrop-admin utility to validate instance configuration correctly when v3 onion services are disabled (#5334)`
+* Bugfix: Updated securedrop-admin utility to validate instance configuration correctly when v3 onion services are disabled (#5334)
 
 ## 1.4.0
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "1.4.1"
+version = "1.5.0"
 # The full version, including alpha/beta/rc tags.
-release = "1.4.1"
+release = "1.5.0"
 
 # 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
@@ -136,8 +136,8 @@ signed with the release signing key:
 .. code:: sh
 
     cd ~/Persistent/securedrop/
-    git checkout 1.4.1
-    git tag -v 1.4.1
+    git checkout 1.5.0
+    git tag -v 1.5.0
 
 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
@@ -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.5.0~rc3"
-securedrop_app_code_sdist_version: "securedrop-app-code-1.5.0-rc3"
+securedrop_app_code_version: "1.5.0"
+securedrop_app_code_sdist_version: "securedrop-app-code-1.5.0"
 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
@@ -1,20 +1,8 @@
-securedrop-app-code (1.5.0~rc3+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Mon, 27 Jul 2020 13:10:13 +0000
-
-securedrop-app-code (1.5.0~rc2+xenial) xenial; urgency=medium
-
-  * See changelog.md 
-
- -- SecureDrop Team <[email protected]>  Mon, 20 Jul 2020 19:25:36 +0000
-
-securedrop-app-code (1.5.0~rc1+xenial) xenial; urgency=medium
+securedrop-app-code (1.5.0+xenial) xenial; urgency=medium
 
   * See changelog.md 
 
- -- SecureDrop Team <[email protected]>  Tue, 14 Jul 2020 21:37:42 +0000
+ -- SecureDrop Team <[email protected]>  Tue, 28 Jul 2020 15:39:05 +0000
 
 securedrop-app-code (1.4.1+xenial) xenial; urgency=medium
 

diff --git a/install_files/securedrop-config/DEBIAN/control b/install_files/securedrop-config/DEBIAN/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-config
-Version: 0.1.3+1.5.0~rc3
+Version: 0.1.3+1.5.0
 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
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-keyring
-Version: 0.1.4+1.5.0~rc3
+Version: 0.1.4+1.5.0
 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
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-ossec-agent
-Version: 3.6.0+1.5.0~rc3
+Version: 3.6.0+1.5.0
 Architecture: amd64
 Depends: libevent-1.4-2,libpcre2-8-0,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
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-ossec-server
-Version: 3.6.0+1.5.0~rc3
+Version: 3.6.0+1.5.0
 Architecture: amd64
 Depends: libevent-1.4-2,libpcre2-8-0,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
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "1.5.0~rc3"
+securedrop_version: "1.5.0"
 ossec_version: "3.6.0"
 keyring_version: "0.1.4"
 config_version: "0.1.3"

diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
@@ -1 +1 @@
-1.4.1
+1.5.0
diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '1.5.0~rc3'
+__version__ = '1.5.0'
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="1.5.0~rc3",
+    version="1.5.0",
     author="Freedom of the Press Foundation",
     author_email="[email protected]",
     description="SecureDrop Server",