From 4dcbbfba5b18a3ec83203279c935f1299c99c429 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 9 Jul 2022 13:20:28 +0200
Subject: [PATCH] Release 2.4.0.

---
 CHANGELOG.rst                                  | 18 ++++++++++++++++++
 changelogs/changelog.yaml                      | 17 +++++++++++++++++
 changelogs/fragments/2.4.0.yml                 |  1 -
 .../487-openssl_pkcs12-other-certs-crash.yml   |  2 --
 .../fragments/deprecate-ansible-2.9-2.10.yml   |  2 --
 5 files changed, 35 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/2.4.0.yml
 delete mode 100644 changelogs/fragments/487-openssl_pkcs12-other-certs-crash.yml
 delete mode 100644 changelogs/fragments/deprecate-ansible-2.9-2.10.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 66fc4c57..c950bb03 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,24 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.4.0
+======
+
+Release Summary
+---------------
+
+Deprecation and bugfix release. No new features this time.
+
+Deprecated Features
+-------------------
+
+- Support for Ansible 2.9 and ansible-base 2.10 is deprecated, and will be removed in the next major release (community.crypto 3.0.0). Some modules might still work with these versions afterwards, but we will no longer keep compatibility code that was needed to support them (https://github.com/ansible-collections/community.crypto/pull/460).
+
+Bugfixes
+--------
+
+- openssl_pkcs12 - when using the pyOpenSSL backend, do not crash when trying to read non-existing other certificates (https://github.com/ansible-collections/community.crypto/issues/486, https://github.com/ansible-collections/community.crypto/pull/487).
+
 v2.3.4
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 6e742c1c..bca16636 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -924,3 +924,20 @@ releases:
     fragments:
     - 2.3.4.yml
     release_date: '2022-06-21'
+  2.4.0:
+    changes:
+      bugfixes:
+      - openssl_pkcs12 - when using the pyOpenSSL backend, do not crash when trying
+        to read non-existing other certificates (https://github.com/ansible-collections/community.crypto/issues/486,
+        https://github.com/ansible-collections/community.crypto/pull/487).
+      deprecated_features:
+      - Support for Ansible 2.9 and ansible-base 2.10 is deprecated, and will be removed
+        in the next major release (community.crypto 3.0.0). Some modules might still
+        work with these versions afterwards, but we will no longer keep compatibility
+        code that was needed to support them (https://github.com/ansible-collections/community.crypto/pull/460).
+      release_summary: Deprecation and bugfix release. No new features this time.
+    fragments:
+    - 2.4.0.yml
+    - 487-openssl_pkcs12-other-certs-crash.yml
+    - deprecate-ansible-2.9-2.10.yml
+    release_date: '2022-07-09'
diff --git a/changelogs/fragments/2.4.0.yml b/changelogs/fragments/2.4.0.yml
deleted file mode 100644
index f8bdd927..00000000
--- a/changelogs/fragments/2.4.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Deprecation and bugfix release. No new features this time.
diff --git a/changelogs/fragments/487-openssl_pkcs12-other-certs-crash.yml b/changelogs/fragments/487-openssl_pkcs12-other-certs-crash.yml
deleted file mode 100644
index 621f4ffd..00000000
--- a/changelogs/fragments/487-openssl_pkcs12-other-certs-crash.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "openssl_pkcs12 - when using the pyOpenSSL backend, do not crash when trying to read non-existing other certificates (https://github.com/ansible-collections/community.crypto/issues/486, https://github.com/ansible-collections/community.crypto/pull/487)."
diff --git a/changelogs/fragments/deprecate-ansible-2.9-2.10.yml b/changelogs/fragments/deprecate-ansible-2.9-2.10.yml
deleted file mode 100644
index 93cc5d87..00000000
--- a/changelogs/fragments/deprecate-ansible-2.9-2.10.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-deprecated_features:
-- Support for Ansible 2.9 and ansible-base 2.10 is deprecated, and will be removed in the next major release (community.crypto 3.0.0). Some modules might still work with these versions afterwards, but we will no longer keep compatibility code that was needed to support them (https://github.com/ansible-collections/community.crypto/pull/460).