From 717b83e28cad02cfa6ef4532c46fa1764a0ea957 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Mon, 10 May 2021 11:29:06 -0400 Subject: [PATCH 1/4] SecureDrop 1.8.2~rc1 (cherry picked from commit 486e3589af16e50b1c8cead13b434cdaa52bc414) --- changelog.md | 7 +++++++ .../files/changelog-focal | 6 ++++++ .../files/changelog-xenial | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/changelog.md b/changelog.md index cbcd054e45..494d88bbab 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,13 @@ * +## 1.8.2~rc1 + +## Operations + +* BUGFIX: restore process no longer copies backup tarballs into memory before unpacking them (#5919) +* BUGFIX: The From: address for OSSEC alerts is now explicitly set (#5916) + ## 1.8.1 ### Operations 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 index fdaa471eba..2e3b7aa603 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+focal) focal; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:19:54 -0500 +securedrop-app-code (1.8.2~rc1+focal) focal; urgency=medium + + * See changelog.md + + -- SecureDrop Team Mon, 10 May 2021 11:28:42 -0400 + securedrop-app-code (1.8.1+focal) focal; 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 index a5d74fbd4f..a9f6bf7f69 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+xenial) xenial; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:18:41 -0500 +securedrop-app-code (1.8.2~rc1+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Mon, 10 May 2021 11:28:14 -0400 + securedrop-app-code (1.8.1+xenial) xenial; urgency=medium * See changelog.md From 6ec0132a6906971ac58313d57357aa2603bcf9df Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 11 May 2021 14:08:58 -0400 Subject: [PATCH 2/4] SecureDrop 1.8.2-rc2 (cherry picked from commit 4fafece6392c0593c9b6d5f1797564717352f09e) --- changelog.md | 10 ++++++++-- .../files/changelog-focal | 6 ++++++ .../files/changelog-xenial | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 494d88bbab..77523e1a99 100644 --- a/changelog.md +++ b/changelog.md @@ -4,12 +4,18 @@ * +## 1.8.2~rc2 + +### Operations + +* Add new pubkey for future release signing key rotation (#5930) + ## 1.8.2~rc1 -## Operations +### Operations * BUGFIX: restore process no longer copies backup tarballs into memory before unpacking them (#5919) -* BUGFIX: The From: address for OSSEC alerts is now explicitly set (#5916) +* BUGFIX: The From: address for OSSEC alerts is now explicitly set (#5916) ## 1.8.1 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 index 2e3b7aa603..d30948dc88 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+focal) focal; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:19:54 -0500 +securedrop-app-code (1.8.2~rc2+focal) focal; urgency=medium + + * See changelog.md + + -- SecureDrop Team Tue, 11 May 2021 14:05:24 -0400 + securedrop-app-code (1.8.2~rc1+focal) focal; 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 index a9f6bf7f69..8d1b9ab1a9 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+xenial) xenial; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:18:41 -0500 +securedrop-app-code (1.8.2~rc2+xenial) xenial; urgency=medium + + * See changelog.md + + -- SecureDrop Team Tue, 11 May 2021 14:04:56 -0400 + securedrop-app-code (1.8.2~rc1+xenial) xenial; urgency=medium * See changelog.md From f1118febae3af2f3e0bfc939c846cf62db8f4c9b Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 18 May 2021 10:02:40 -0400 Subject: [PATCH 3/4] SecureDrop 1.8.2-rc3 (cherry picked from commit a2d5a64f84f6d7771ada891a2374af2f0957f3cd) --- changelog.md | 4 ++++ .../build-securedrop-app-code-deb-pkg/files/changelog-focal | 6 ++++++ .../files/changelog-xenial | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/changelog.md b/changelog.md index 77523e1a99..a5c7b8955a 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,10 @@ * +## 1.8.2~rc3 + +* BUGFIX: use post method for ossec-test-alert endpoint (#5947) + ## 1.8.2~rc2 ### Operations 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 index d30948dc88..a52c4f6366 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+focal) focal; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:19:54 -0500 +securedrop-app-code (1.8.2~rc3+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Tue, 18 May 2021 10:02:15 -0400 + securedrop-app-code (1.8.2~rc2+focal) focal; 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 index 8d1b9ab1a9..d4fe10b3d8 100644 --- 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 @@ -4,6 +4,12 @@ securedrop-app-code (1.9.0~rc1+xenial) xenial; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:18:41 -0500 +securedrop-app-code (1.8.2~rc3+xenial) xenial; urgency=medium + + * see changelog.md + + -- SecureDrop Team Tue, 18 May 2021 10:01:50 -0400 + securedrop-app-code (1.8.2~rc2+xenial) xenial; urgency=medium * See changelog.md From 295dabb023c348846620f86b36cf10707f995d7a Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 18 May 2021 20:36:02 +0000 Subject: [PATCH 4/4] SecureDrop 1.8.2 (cherry picked from commit f9baa82372de82bcbc08d9bad74ccd603ac9db1d) --- changelog.md | 13 ++++--------- .../files/changelog-focal | 18 +++--------------- .../files/changelog-xenial | 16 ++-------------- molecule/shared/stable.ver | 2 +- 4 files changed, 10 insertions(+), 39 deletions(-) diff --git a/changelog.md b/changelog.md index a5c7b8955a..9702bf66b0 100644 --- a/changelog.md +++ b/changelog.md @@ -4,22 +4,17 @@ * -## 1.8.2~rc3 +## 1.8.2 -* BUGFIX: use post method for ossec-test-alert endpoint (#5947) +### Web applications -## 1.8.2~rc2 +* BUGFIX: use post method for ossec-test-alert endpoint (#5947) ### Operations * Add new pubkey for future release signing key rotation (#5930) - -## 1.8.2~rc1 - -### Operations - * BUGFIX: restore process no longer copies backup tarballs into memory before unpacking them (#5919) -* BUGFIX: The From: address for OSSEC alerts is now explicitly set (#5916) +* BUGFIX: The From: address for OSSEC alerts is now explicitly set (#5916, #5937) ## 1.8.1 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 index a52c4f6366..db599b8e88 100644 --- 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 @@ -4,23 +4,11 @@ securedrop-app-code (1.9.0~rc1+focal) focal; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:19:54 -0500 -securedrop-app-code (1.8.2~rc3+focal) focal; urgency=medium +securedrop-app-code (1.8.2+focal) focal; urgency=medium - * see changelog.md - - -- SecureDrop Team Tue, 18 May 2021 10:02:15 -0400 - -securedrop-app-code (1.8.2~rc2+focal) focal; urgency=medium - - * See changelog.md - - -- SecureDrop Team Tue, 11 May 2021 14:05:24 -0400 - -securedrop-app-code (1.8.2~rc1+focal) focal; urgency=medium - - * See changelog.md + * see changelog.md - -- SecureDrop Team Mon, 10 May 2021 11:28:42 -0400 + -- SecureDrop Team Tue, 18 May 2021 20:35:33 +0000 securedrop-app-code (1.8.1+focal) focal; 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 index d4fe10b3d8..ffc5710328 100644 --- 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 @@ -4,23 +4,11 @@ securedrop-app-code (1.9.0~rc1+xenial) xenial; urgency=medium -- SecureDrop Team Fri, 12 Mar 2021 10:18:41 -0500 -securedrop-app-code (1.8.2~rc3+xenial) xenial; urgency=medium +securedrop-app-code (1.8.2+xenial) xenial; urgency=medium * see changelog.md - -- SecureDrop Team Tue, 18 May 2021 10:01:50 -0400 - -securedrop-app-code (1.8.2~rc2+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Tue, 11 May 2021 14:04:56 -0400 - -securedrop-app-code (1.8.2~rc1+xenial) xenial; urgency=medium - - * See changelog.md - - -- SecureDrop Team Mon, 10 May 2021 11:28:14 -0400 + -- SecureDrop Team Tue, 18 May 2021 20:34:33 +0000 securedrop-app-code (1.8.1+xenial) xenial; urgency=medium diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index a8fdfda1c7..53adb84c82 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -1.8.1 +1.8.2