Merge pull request #6495 from freedomofpress/backport-20220719-builder

[2.4.1] backport updated builder image and bump version to 2.4.1.rc1
freedomofpress · Jul 19, 2022 · 8764942 · 8764942
2 parents 50035cb + b220114
commit 8764942
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.4.1~rc1
+
+* Bugfix: fixed codename filter bug affecting messages with non-ASCII characters (#6492)
+* Added exclusions for 2 irrelevant safety db entries (#6473, #6477) 
+
 ## 2.4.0
 
 ### Web Applications

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

diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
@@ -1,3 +1,9 @@
+securedrop-app-code (2.4.1~rc1+focal) focal; urgency=medium
+
+  * see changelog.md 
+
+ -- SecureDrop Team <[email protected]>  Tue, 19 Jul 2022 08:32:11 -0400
+
 securedrop-app-code (2.4.0+focal) focal; urgency=medium
 
   * see changelog.md 

diff --git a/molecule/builder-focal/image_hash b/molecule/builder-focal/image_hash
@@ -1,2 +1,2 @@
-# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2022_05_23
-e206eeb8d1a307db74d7e782a505f83aa60a3455ab3dd71a496d8d7706cda615
+# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2022_07_19
+b33a676fbdaa7d7703648ca9ac8b6775dd8e51c75767af6d208c7201cb42c355
diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "2.4.0"
+securedrop_version: "2.4.1~rc1"
 ossec_version: "3.6.0"
 keyring_version: "0.1.6"
 config_version: "0.1.4"

diff --git a/securedrop/version.py b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '2.4.0'
+__version__ = '2.4.1~rc1'
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.4.0",
+    version="2.4.1~rc1",
     author="Freedom of the Press Foundation",
     author_email="[email protected]",
     description="SecureDrop Server",