SecureDrop 0.7.0

freedomofpress · May 16, 2018 · f1fdb5c · f1fdb5c
1 parent e3787e3
commit f1fdb5c
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 39 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.7.0~rc5
+## 0.7.0
 
 ### Web Applications
 * Updated messages on source interface (#3036, #3132, #3321, #3322)

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0~rc5'
+version = '0.7.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0~rc5'
+release = '0.7.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.7.0~rc5
-    git tag -v 0.7.0~rc5
+    git checkout 0.7.0
+    git tag -v 0.7.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.7.0~rc5"
+securedrop_app_code_version: "0.7.0"
 
 grsecurity: true
 install_local_packages: false

diff --git a/install_files/securedrop-app-code/DEBIAN/control b/install_files/securedrop-app-code/DEBIAN/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Package: securedrop-app-code
-Version: 0.7.0~rc5
+Version: 0.7.0
 Architecture: amd64
 Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor,securedrop-keyring,securedrop-config
 Description: Packages the SecureDrop application code pip dependencies and apparmor profiles. This package will put the apparmor profiles in enforce mode. This package does use pip to install the pip wheelhouse
diff --git a/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian b/install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian
@@ -1,32 +1,8 @@
-securedrop-app-code (0.7.0~rc5) trusty; urgency=medium
+securedrop-app-code (0.7.0) trusty; urgency=medium
 
   * See changelog.md
 
- -- SecureDrop Team <[email protected]>  Tue, 15 May 2018 02:02:50 +0000
-
-securedrop-app-code (0.7.0~rc4) trusty; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Thu, 10 May 2018 12:18:20 +0000
-
-securedrop-app-code (0.7.0~rc3) trusty; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Fri, 04 May 2018 21:33:36 +0000
-
-securedrop-app-code (0.7.0~rc2) trusty; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 02 May 2018 13:41:22 +0000
-
-securedrop-app-code (0.7.0~rc1) trusty; urgency=medium
-
-  * See changelog.md 
-
- -- SecureDrop Team <[email protected]>  Fri, 30 Mar 2018 00:38:08 +0000
+ -- SecureDrop Team <[email protected]>  Wed, 16 May 2018 00:00:56 +0000
 
 securedrop-app-code (0.6) trusty; 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.1+0.7.0~rc5
+Version: 0.1.1+0.7.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.1+0.7.0~rc5
+Version: 0.1.1+0.7.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: 2.8.2+0.7.0~rc5
+Version: 2.8.2+0.7.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: 2.8.2+0.7.0~rc5
+Version: 2.8.2+0.7.0
 Architecture: amd64
 Depends: ossec-server,securedrop-keyring,securedrop-config
 Replaces: ossec-server

diff --git a/molecule/builder/tests/vars.yml b/molecule/builder/tests/vars.yml
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "0.7.0~rc5"
+securedrop_version: "0.7.0"
 ossec_version: "2.8.2"
 keyring_version: "0.1.1"
 config_version: "0.1.1"

diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '0.7.0~rc5'
+__version__ = '0.7.0'