From 5af4a16e57bf6ef03527ec5e901c3ca6c9f81592 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 17 Jun 2022 08:25:13 +0200
Subject: [PATCH] Release 2.3.3.

---
 CHANGELOG.rst                                   | 15 +++++++++++++++
 changelogs/changelog.yaml                       | 17 +++++++++++++++++
 changelogs/fragments/2.3.3.yml                  |  1 -
 .../fragments/474-x509_crl-ed25519-ed448.yml    |  2 --
 ...ubtrees-must-be-a-non-empty-list-or-None.yml |  2 --
 changelogs/fragments/apache-license.yml         |  2 --
 6 files changed, 32 insertions(+), 7 deletions(-)
 delete mode 100644 changelogs/fragments/2.3.3.yml
 delete mode 100644 changelogs/fragments/474-x509_crl-ed25519-ed448.yml
 delete mode 100644 changelogs/fragments/481-fix-excluded_subtrees-must-be-a-non-empty-list-or-None.yml
 delete mode 100644 changelogs/fragments/apache-license.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4ae2101b..60c22caf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.3.3
+======
+
+Release Summary
+---------------
+
+Bugfix release.
+
+Bugfixes
+--------
+
+- Include ``Apache-2.0.txt`` file for ``plugins/module_utils/crypto/_obj2txt.py`` and ``plugins/module_utils/crypto/_objects_data.py``.
+- openssl_csr - the module no longer crashes with 'permitted_subtrees/excluded_subtrees must be a non-empty list or None' if only one of ``name_constraints_permitted`` and ``name_constraints_excluded`` is provided (https://github.com/ansible-collections/community.crypto/issues/481).
+- x509_crl - do not crash when signing CRL with Ed25519 or Ed448 keys (https://github.com/ansible-collections/community.crypto/issues/473, https://github.com/ansible-collections/community.crypto/pull/474).
+
 v2.3.2
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 8fc637df..34c55c28 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -885,3 +885,20 @@ releases:
     - 457-certificate_complete_chain-unsupported-algorithm.yml
     - simplified-bsd-license.yml
     release_date: '2022-06-02'
+  2.3.3:
+    changes:
+      bugfixes:
+      - Include ``Apache-2.0.txt`` file for ``plugins/module_utils/crypto/_obj2txt.py``
+        and ``plugins/module_utils/crypto/_objects_data.py``.
+      - openssl_csr - the module no longer crashes with 'permitted_subtrees/excluded_subtrees
+        must be a non-empty list or None' if only one of ``name_constraints_permitted``
+        and ``name_constraints_excluded`` is provided (https://github.com/ansible-collections/community.crypto/issues/481).
+      - x509_crl - do not crash when signing CRL with Ed25519 or Ed448 keys (https://github.com/ansible-collections/community.crypto/issues/473,
+        https://github.com/ansible-collections/community.crypto/pull/474).
+      release_summary: Bugfix release.
+    fragments:
+    - 2.3.3.yml
+    - 474-x509_crl-ed25519-ed448.yml
+    - 481-fix-excluded_subtrees-must-be-a-non-empty-list-or-None.yml
+    - apache-license.yml
+    release_date: '2022-06-17'
diff --git a/changelogs/fragments/2.3.3.yml b/changelogs/fragments/2.3.3.yml
deleted file mode 100644
index 8ce9aa96..00000000
--- a/changelogs/fragments/2.3.3.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release.
diff --git a/changelogs/fragments/474-x509_crl-ed25519-ed448.yml b/changelogs/fragments/474-x509_crl-ed25519-ed448.yml
deleted file mode 100644
index 9e28f4bc..00000000
--- a/changelogs/fragments/474-x509_crl-ed25519-ed448.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "x509_crl - do not crash when signing CRL with Ed25519 or Ed448 keys (https://github.com/ansible-collections/community.crypto/issues/473, https://github.com/ansible-collections/community.crypto/pull/474)."
diff --git a/changelogs/fragments/481-fix-excluded_subtrees-must-be-a-non-empty-list-or-None.yml b/changelogs/fragments/481-fix-excluded_subtrees-must-be-a-non-empty-list-or-None.yml
deleted file mode 100644
index 0e38d035..00000000
--- a/changelogs/fragments/481-fix-excluded_subtrees-must-be-a-non-empty-list-or-None.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "openssl_csr - the module no longer crashes with 'permitted_subtrees/excluded_subtrees must be a non-empty list or None' if only one of ``name_constraints_permitted`` and ``name_constraints_excluded`` is provided (https://github.com/ansible-collections/community.crypto/issues/481)."
diff --git a/changelogs/fragments/apache-license.yml b/changelogs/fragments/apache-license.yml
deleted file mode 100644
index 81b0fdf6..00000000
--- a/changelogs/fragments/apache-license.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "Include ``Apache-2.0.txt`` file for ``plugins/module_utils/crypto/_obj2txt.py`` and ``plugins/module_utils/crypto/_objects_data.py``."