Merge pull request #5328 from freedomofpress/backport-1.4.0-changes-t…

…o-develop Backport 1.4.0 changes to develop
freedomofpress · Jun 22, 2020 · 4c5f1d1 · 4c5f1d1
2 parents 3998ceb + 8c40638
commit 4c5f1d1
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 17 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,25 @@
 # Changelog
 
-## 1.4.0~rc1
+## 1.5.0~rc1
 
 
 
+## 1.4.0
+
+### Web Applications
+* Moved source deletion to a background process to resolve timeout issue (#2527)
+
+### Operations
+* Updated Tor from 0.4.2.7 to 0.4.3.5 (#5292)
+* Added check for nameserver configuration loaded during install (#5288)
+* Added system configuration check script to securedrop-ossec packages (#5287)
+* Updated SecureDrop Release signing key so that it doesn't expire until June 30, 2021 (#5277)
+
+### Documentation
+* Added instructions for password rotation to Admin Guide (#5301)
+* Updated references to uncommon OSSEC alerts (#5316)
+
+
 ## 1.3.0
 
 ### Web Applications

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.0'
+version = '1.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.0'
+release = '1.4.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
@@ -131,8 +131,8 @@ signed with the release signing key:
 .. code:: sh
 
     cd ~/Persistent/securedrop/
-    git checkout 1.3.0
-    git tag -v 1.3.0
+    git checkout 1.4.0
+    git tag -v 1.4.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.4.0~rc1"
-securedrop_app_code_sdist_version: "securedrop-app-code-1.4.0-rc1"
+securedrop_app_code_version: "1.5.0~rc1"
+securedrop_app_code_sdist_version: "securedrop-app-code-1.5.0-rc1"
 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,8 +1,14 @@
-securedrop-app-code (1.4.0~rc1+xenial) xenial; urgency=medium
+securedrop-app-code (1.5.0~rc1+xenial) xenial; urgency=medium
 
   * 
 
- -- SecureDrop Team <[email protected]>  Mon, 18 May 2020 09:48:39 -0700
+ -- SecureDrop Team <[email protected]>  Thu, 18 Jun 2020 21:58:23 +0000
+
+securedrop-app-code (1.4.0+xenial) xenial; urgency=medium
+
+  * See changelog.md 
+
+ -- SecureDrop Team <[email protected]>  Wed, 17 Jun 2020 21:35:57 +0000
 
 securedrop-app-code (1.3.0+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.4.0~rc1
+Version: 0.1.3+1.5.0~rc1
 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.4.0~rc1
+Version: 0.1.4+1.5.0~rc1
 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.4.0~rc1
+Version: 3.6.0+1.5.0~rc1
 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.4.0~rc1
+Version: 3.6.0+1.5.0~rc1
 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.4.0~rc1"
+securedrop_version: "1.5.0~rc1"
 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.3.0
+1.4.0
diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '1.4.0~rc1'
+__version__ = '1.5.0~rc1'
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="1.4.0~rc1",
+    version="1.5.0~rc1",
     author="Freedom of the Press Foundation",
     author_email="[email protected]",
     description="SecureDrop Server",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '1.4.0~rc1'
		__version__ = '1.5.0~rc1'