Merge pull request #6881 from freedomofpress/update-2.6.0-changelog

Backport 2.6.0 changelog and update development version.

changelog.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## 2.6.0~rc1
+## 2.7.0~rc1
+
+
+## 2.6.0
 
 ### Web applications
 * Don't treat Tor Browser for Android as desktop Tor Browser (#6573)
@@ -12,18 +15,20 @@
 * Add `<title>` blocks for better accessibility (#6313, #6738)
 * Set `Cross-Origin-Resource-Policy: same-origin` (#6768)
 * Automatically and regularly remove pending sources (#6488, #6785)
+* Fixed display bug when duplicate locales are specified (#6853)
 * Dependency changes:
+  * Update cryptography from 39.0.1 to 41.0.1 (#6855)
   * Update mod-wsgi from 4.6.7 to 4.9.4 (#6775)
   * Update pytz from 2017.3 to 2022.2.1 (#6569, #6571)
   * Update pycparser from 2.20 to 2.21 (#6618, #6686)
-  * Update redis from 3.5.3 to 4.5.4 (#6783)
+  * Update redis from 3.5.3 to 4.5.4 (#6783, #6867)
   * Update requests from 2.26.0 to 2.31.0 (#6821)
   * Update wheel from 0.33.6 to 0.38.4 (#6680)
   * Remove passlib (#6631)
   * Remove pyotp (#5613, #6679)
 
 ### Journalist Workstation
-* Add a GNOME shell extension (#6531, #6712)
+* Add a GNOME shell extension (#6531, #6712, 6847)
 
 ### Operations
 * Update SecureDrop release key expiry date to 2024-07-08 (#6803, #6804, #6819)
@@ -36,7 +41,6 @@
 * Reorganize Debian packaging, having debhelper do most of the work and other cleanup (#6544)
 * Reorganize OSSEC packaging to use debhelper and other cleanup (#6754)
 * Use plain container for package building, not molecule (#6706, #6754)
-* 
 
 ### Development
 * Remove "sh" dependency (#6547, #6562, #6580)

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_version: "2.6.0~rc1"
+securedrop_version: "2.7.0~rc1"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true

molecule/shared/stable.ver

@@ -1 +1 @@
-2.5.2
+2.6.0

securedrop/debian/changelog

@@ -1,8 +1,14 @@
-securedrop (2.6.0~rc1+focal) focal; urgency=medium
+securedrop (2.7.0~rc1+focal) focal; urgency=medium
 
-  * 
+  * see changelog.md
+
+ -- SecureDrop Team <[email protected]>  Fri, 23 Jun 2023 09:59:44 -0400
+
+securedrop (2.6.0+focal) focal; urgency=medium
+
+  * see changelog.md 
 
- -- SecureDrop Team <[email protected]>  Tue, 28 Feb 2023 12:37:26 -0500
+ -- SecureDrop Team <[email protected]>  Thu, 22 Jun 2023 13:35:42 -0400
 
 securedrop-app-code (2.5.2+focal) focal; urgency=medium
 

securedrop/setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.6.0~rc1",
+    version="2.7.0~rc1",
     author="Freedom of the Press Foundation",
     author_email="[email protected]",
     description="SecureDrop Server",

securedrop/version.py

@@ -1 +1 @@
-__version__ = "2.6.0~rc1"
+__version__ = "2.7.0~rc1"