From 15ad2448f1947dccae3a4ed329a74392b8b3d1a6 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 6 Nov 2022 12:55:53 +0100
Subject: [PATCH] Release 4.8.9.

---
 CHANGELOG.rst                                 | 16 +++++++++++++++
 changelogs/changelog.yaml                     | 20 +++++++++++++++++++
 changelogs/fragments/4.8.9.yml                |  4 ----
 ...5385-search_s-based-_is_value_present.yaml |  2 --
 .../fragments/5435-escape-ldap-param.yml      |  2 --
 5 files changed, 36 insertions(+), 8 deletions(-)
 delete mode 100644 changelogs/fragments/4.8.9.yml
 delete mode 100644 changelogs/fragments/5385-search_s-based-_is_value_present.yaml
 delete mode 100644 changelogs/fragments/5435-escape-ldap-param.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 935974226d..f7e9a78eaf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,22 @@ Community General Release Notes
 
 This changelog describes changes after version 3.0.0.
 
+v4.8.9
+======
+
+Release Summary
+---------------
+
+Bugfix release.
+
+Note that from now on, community.general 4.x.y only receives security fixes and major bugfixes, but no longer regular bugfixes.
+
+Bugfixes
+--------
+
+- ldap_attrs - fix bug which caused a ``Bad search filter`` error. The error was occuring when the ldap attribute value contained special characters such as ``(`` or ``*`` (https://github.com/ansible-collections/community.general/issues/5434, https://github.com/ansible-collections/community.general/pull/5435).
+- ldap_attrs - fix ordering issue by ignoring the ``{x}`` prefix on attribute values (https://github.com/ansible-collections/community.general/issues/977, https://github.com/ansible-collections/community.general/pull/5385).
+
 v4.8.8
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 8a54c922f1..894e1a98a8 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1979,3 +1979,23 @@ releases:
     - 5383-xenserver_facts.yml
     - 5393-archive.yml
     release_date: '2022-10-24'
+  4.8.9:
+    changes:
+      bugfixes:
+      - ldap_attrs - fix bug which caused a ``Bad search filter`` error. The error
+        was occuring when the ldap attribute value contained special characters such
+        as ``(`` or ``*`` (https://github.com/ansible-collections/community.general/issues/5434,
+        https://github.com/ansible-collections/community.general/pull/5435).
+      - ldap_attrs - fix ordering issue by ignoring the ``{x}`` prefix on attribute
+        values (https://github.com/ansible-collections/community.general/issues/977,
+        https://github.com/ansible-collections/community.general/pull/5385).
+      release_summary: 'Bugfix release.
+
+
+        Note that from now on, community.general 4.x.y only receives security fixes
+        and major bugfixes, but no longer regular bugfixes.'
+    fragments:
+    - 4.8.9.yml
+    - 5385-search_s-based-_is_value_present.yaml
+    - 5435-escape-ldap-param.yml
+    release_date: '2022-11-06'
diff --git a/changelogs/fragments/4.8.9.yml b/changelogs/fragments/4.8.9.yml
deleted file mode 100644
index 06b862c287..0000000000
--- a/changelogs/fragments/4.8.9.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-release_summary: |-
-  Bugfix release.
-
-  Note that from now on, community.general 4.x.y only receives security fixes and major bugfixes, but no longer regular bugfixes.
diff --git a/changelogs/fragments/5385-search_s-based-_is_value_present.yaml b/changelogs/fragments/5385-search_s-based-_is_value_present.yaml
deleted file mode 100644
index a3a3ba047c..0000000000
--- a/changelogs/fragments/5385-search_s-based-_is_value_present.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - ldap_attrs - fix ordering issue by ignoring the ``{x}`` prefix on attribute values (https://github.com/ansible-collections/community.general/issues/977, https://github.com/ansible-collections/community.general/pull/5385).
diff --git a/changelogs/fragments/5435-escape-ldap-param.yml b/changelogs/fragments/5435-escape-ldap-param.yml
deleted file mode 100644
index 3f22f61759..0000000000
--- a/changelogs/fragments/5435-escape-ldap-param.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - ldap_attrs - fix bug which caused a ``Bad search filter`` error. The error was occuring when the ldap attribute value contained special characters such as ``(`` or ``*`` (https://github.com/ansible-collections/community.general/issues/5434, https://github.com/ansible-collections/community.general/pull/5435).