SecureDrop 0.12.0

freedomofpress · Feb 27, 2019 · 1d92816 · 1d92816
1 parent 5ccaf92
commit 1d92816
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 79 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,37 +1,13 @@
 # Changelog
 
-## 0.12.0~rc3
-
-### Web Application
-
-* Added instructions for disabling NoScript XSS because upload problem (#4078, #4159)
-
-### Operations
-
-* Ensured Tor is installed from FPF repo (#4175, #4169)
-* Set Debian packages to only use explicitly declared conffiles (#4176, #4161)
-
-## 0.12.0~rc2
-
-### Web Application
-
-* Updated language referencing 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
+## 0.12.0
 
 ### Web Application
 
+* Add Romanian and Icelandic as supported languages (#4187)
 * Added toggle to show password for journalists on login (#3713)
+* Updated language referencing Tor button (#4131, #4141)
+* Added instructions for disabling NoScript XSS because of upload problem (#4078, #4159)
 * Prevented setting session cookies on API endpoints (#3876)
 * Updated API to allow clients to set a reply's UUID (#3957)
 * Changed GPG key generation to avoid leaking key creation date (#3912)
@@ -46,6 +22,11 @@
 ### Operations
 
 * Removed hardcoded Ansible plugin `profile_tasks` (#2943)
+* 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)
+* Ensured Tor is installed from FPF repo (#4175, #4169)
+* Set Debian packages to only use explicitly declared conffiles (#4176, #4161)
 * Removed `iptables` UID restrictions to allow `apt` to work correctly (#3952)
 * Updated kernels to 4.4.167 and removed wireless support (#2726)
 * Updated `cron-apt` remove action to occur after security (#4003)
@@ -61,6 +42,7 @@
 ### Developer Workflow
 
 * Fixed the QA data loader to prevent clobbering data (#3793)
+* Fixed updated version script (#4146)
 * Added nested virtualized to CI (#3702)
 * Moved to Vagrant 2.1.x (#3350)
 * Fixed linting tasks on macOS (#3996)

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~rc3'
+version = '0.12.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.0~rc3'
+release = '0.12.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
@@ -114,8 +114,8 @@ key:
 .. code:: sh
 
     cd ~/Persistent/securedrop/
-    git checkout 0.12.0~rc3
-    git tag -v 0.12.0~rc3
+    git checkout 0.12.0
+    git tag -v 0.12.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,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~rc3"
+securedrop_app_code_version: "0.12.0"
 
 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,26 +1,8 @@
-securedrop-app-code (0.12.0~rc3+trusty) trusty; urgency=medium
+securedrop-app-code (0.12.0+trusty) trusty; urgency=medium
 
   * See changelog.md 
 
- -- SecureDrop Team <[email protected]>  Fri, 22 Feb 2019 18:36:18 +0000
-
-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
-
- -- SecureDrop Team <[email protected]>  Wed, 13 Feb 2019 16:55:27 +0000
-
-securedrop-app-code (0.12.0~rc1+trusty) trusty; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Thu, 13 Dec 2018 02:02:05 +0000
+ -- SecureDrop Team <[email protected]>  Wed, 27 Feb 2019 00:36:47 +0000
 
 securedrop-app-code (0.11.1) trusty; urgency=medium
 

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,23 +1,6 @@
-securedrop-app-code (0.12.0~rc3+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Fri, 22 Feb 2019 18:36:27 +0000
-
-securedrop-app-code (0.12.0~rc2+xenial) xenial; urgency=medium
+securedrop-app-code (0.12.0+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
-
- -- SecureDrop Team <[email protected]>  Wed, 13 Feb 2019 16:55:40 +0000
-
-securedrop-app-code (0.12.0~rc1+xenial) xenial; urgency=medium
-
-  * See changelog.md
+ -- SecureDrop Team <[email protected]>  Wed, 27 Feb 2019 00:37:02 +0000
 
- -- SecureDrop Team <[email protected]>  Thu, 13 Dec 2018 02:02:05 +0000
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~rc3
+Version: 0.1.2+0.12.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.2+0.12.0~rc3
+Version: 0.1.2+0.12.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.0.0+0.12.0~rc3
+Version: 3.0.0+0.12.0
 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~rc3
+Version: 3.0.0+0.12.0
 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~rc3"
+securedrop_version: "0.12.0"
 ossec_version: "3.0.0"
 keyring_version: "0.1.2"
 config_version: "0.1.2"

diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
@@ -1 +1 @@
-0.11.1
+0.12.0
diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '0.12.0~rc3'
+__version__ = '0.12.0'