Merge pull request #4150 from freedomofpress/bump-to-rc2

SecureDrop 0.12.0~rc2
freedomofpress · Feb 18, 2019 · b0f3c43 · b0f3c43
2 parents c0582a7 + 4689627
commit b0f3c43
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 11 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.12.0~rc2
+
+### Web Application
+
+* Updated language referenceing Tor button (#4131, #4141)
+
+### Developer Workflow
+
+* Fixed updated version script (#4146)
+
+### Operations
+
+* Fixed restore logic to ensure recreation of onion services (#3960, #4136)
+* Added logic to conditionally update the `release-upgrades` prompt (#4104, #4142)
+* Added logic to ensure packages required by Ansible are present on Xenial systems (#4109, #4143)
+
 ## 0.12.0~rc1
 
 ### Web Application

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.12.0~rc1'
+version = '0.12.0~rc2'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.0~rc1'
+release = '0.12.0~rc2'
 
 # 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
@@ -114,8 +114,8 @@ key:
 .. code:: sh
 
     cd ~/Persistent/securedrop/
-    git checkout 0.12.0~rc1
-    git tag -v 0.12.0~rc1
+    git checkout 0.12.0~rc2
+    git tag -v 0.12.0~rc2
 
 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,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_app_code_version: "0.12.0~rc1"
+securedrop_app_code_version: "0.12.0~rc2"
 
 grsecurity: true
 install_local_packages: false

diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-trusty
@@ -1,3 +1,9 @@
+securedrop-app-code (0.12.0~rc2+trusty) trusty; urgency=medium
+
+  * See changelog.md 
+
+ -- SecureDrop Team <[email protected]>  Mon, 18 Feb 2019 09:16:16 +0000
+
 securedrop-app-code (0.12.0~rc1+trusty) trusty; urgency=medium
 
   * See changelog.md

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,3 +1,9 @@
+securedrop-app-code (0.12.0~rc2+xenial) xenial; urgency=medium
+
+  * See changelog.md 
+
+ -- SecureDrop Team <[email protected]>  Mon, 18 Feb 2019 09:16:25 +0000
+
 securedrop-app-code (0.12.0~rc1+xenial) xenial; urgency=medium
 
   * See changelog.md

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.2+0.12.0~rc1
+Version: 0.1.2+0.12.0~rc2
 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.2+0.12.0~rc1
+Version: 0.1.2+0.12.0~rc2
 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.0.0+0.12.0~rc1
+Version: 3.0.0+0.12.0~rc2
 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
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-ossec-server
-Version: 3.0.0+0.12.0~rc1
+Version: 3.0.0+0.12.0~rc2
 Architecture: amd64
 Depends: ossec-server,securedrop-keyring,securedrop-config
 Replaces: ossec-server

diff --git a/molecule/builder-trusty/tests/vars.yml b/molecule/builder-trusty/tests/vars.yml
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "0.12.0~rc1"
+securedrop_version: "0.12.0~rc2"
 ossec_version: "3.0.0"
 keyring_version: "0.1.2"
 config_version: "0.1.2"

diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '0.12.0~rc1'
+__version__ = '0.12.0~rc2'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '0.12.0~rc1'
		__version__ = '0.12.0~rc2'