From c65665b7547c3a25cdaaeffc1a6c67d237f081b8 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 18 Nov 2022 15:47:03 -0500
Subject: [PATCH] Bump version to 2.2.4-1

Resolves:  Bug 1132524 - [RFE] Compression of log files
---
 .gitignore       |  1 +
 389-ds-base.spec | 49 ++++++++----------------------------------------
 sources          |  2 +-
 tests/tests.yml  |  2 +-
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5527657..c3233a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -213,3 +213,4 @@
 /389-ds-base-2.1.1.tar.bz2
 /389-ds-base-2.1.3.tar.bz2
 /jemalloc-5.3.0.tar.bz2
+/389-ds-base-2.2.4.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 9b4c741..09a2773 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -46,8 +46,8 @@ ExcludeArch: i686
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          2.1.3
-Release:          4%{?dist}
+Version:          2.2.4
+Release:          1%{?dist}
 License:          GPLv3+ and (ASL 2.0 or MIT)
 URL:              https://www.port389.org
 Conflicts:        selinux-policy-base < 3.9.8
@@ -157,6 +157,7 @@ BuildRequires:    icu
 BuildRequires:    libicu-devel
 BuildRequires:    pcre-devel
 BuildRequires:    cracklib-devel
+BuildRequires:    json-c-devel
 %if %{use_clang}
 BuildRequires:    libatomic
 BuildRequires:    clang
@@ -228,6 +229,8 @@ Requires:         openldap-clients
 Requires:         /usr/bin/c_rehash
 Requires:         python%{python3_pkgversion}-ldap
 Requires:         acl
+Requires:         zlib
+Requires:         json-c
 
 # this is needed to setup SSL if you are not using the
 # administration server package
@@ -266,7 +269,6 @@ Source2:          %{name}-devel.README
 %if %{bundle_jemalloc}
 Source3:          https://github.com/jemalloc/%{jemalloc_name}/releases/download/%{jemalloc_ver}/%{jemalloc_name}-%{jemalloc_ver}.tar.bz2
 %endif
-Patch01:          0001-Issue-5254-dscreate-create-template-regression-due-t.patch
 
 %description
 389 Directory Server is an LDAPv3 compliant server.  The base package includes
@@ -717,42 +719,7 @@ exit 0
 %endif
 
 %changelog
-* Thu Oct 6 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.3-4
-- Bump version to 2.1.3-4
-- Resolves: Bug 1872451 - Fix regression with dscreate template
-
-* Fri Aug 19 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.3-3
-- Bump version to 2.1.3-3
-- Resolves: Bug 2118765
-
-* Thu Aug 18 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.3-2
-- Bump version to 2.1.3-2
-- Resolves: Bug 2118765 - SIGSEGV in sync_repl
-
-* Mon Jul 11 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.3-1
-- Bump version to 2.1.3-1
-- Resolves: Bug 2061801 - rebase 389-ds-base to 2.1.3
-- Resolves: Bug 1872451 - RFE - run as non-root
-- Resolves: Bug 2052527 - RFE - Provide an option to abort an Auto Member rebuild task
-- Resolves: Bug 2057056 - Import may break the replication because changelog starting csn may not be created
-- Resolves: Bug 2057063 - Add support for recursively deleting subentries
-- Resolves: Bug 2062778 - sending crafted message could result in DoS
-- Resolves: Bug 2064781 - expired password was still allowed to access the database
-- Resolves: Bug 2100337 - dsconf backend export userroot fails ldap.DECODING_ERROR
-
-* Mon Jun 13 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.1-3
-- Bump version to 2.1.1-3
-- Resolves: Bug 2061801 - Fix nss-tools requirement
-
-* Mon Jun 13 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.1-2
-- Bump version to 2.1.1-2
-- Resolves: Bug 2061801 - Fix lmdb-libs requirement
-
-* Thu May 12 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.1-1
-- Bump version to 2.1.1-1
-- Resolves: Bug 2061801 - rebase 389-ds-base to 2.1.1
-
-* Tue Mar 8 2022 Mark Reynolds <mreynolds@redhat.com> - 2.1.0-1
-- Bump version to 2.1.0-1
-- Resolves: Bug 2061801 - rebase 389-ds-base to 2.1.0
+* Fri Nov 11 2022 Mark Reynolds <mreynolds@redhat.com> - 2.2.4-1
+- Bump version to 2.2.4-1
+- Resolves:  Bug 1132524 - [RFE] Compression of log files
 
diff --git a/sources b/sources
index ea78a4c..e8c13c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (389-ds-base-2.1.3.tar.bz2) = b4665c6090f9f96c8673bfbad3f94a7fcef169409b243d5e266df3cf62129a33000a14fdc45cd6dfbadfdcd31c8a9d0d9c4c1db2f99d4e9ac5efb246ff0b4540
 SHA512 (jemalloc-5.3.0.tar.bz2) = 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1
+SHA512 (389-ds-base-2.2.4.tar.bz2) = 67640830c6de49a3d959e63f412ad614f820daca39b0473e25b986b7533a20c48f0df92e8e8d068c44fa65893e6b445ffffeec789489b71ba0efd6300619fe9f
diff --git a/tests/tests.yml b/tests/tests.yml
index a2570d1..24b21e8 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -4,7 +4,7 @@
   vars:
     ds_repo_url: https://github.com/389ds/389-ds-base.git
     ds_repo_dir: ds
-    ds_repo_version: 389-ds-base-2.1
+    ds_repo_version: 389-ds-base-2.2
     ds_tests: "{{ ds_repo_dir }}/dirsrvtests/tests"
     pytest: "py.test-3"
     pytest_args: "-v"