From b9a900d642163a426a22b9e3b01b12c1be70884f Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Thu, 1 Aug 2024 06:08:05 +0200
Subject: [PATCH] New version 2.6.1 (rhbz#2301927)

---
 .gitignore | 48 ++++++------------------------------------------
 kea.spec   | 21 +++++++++++++--------
 sources    |  4 ++--
 3 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/.gitignore b/.gitignore
index 732a052..7bb4cbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,6 @@
-/kea-0.9-beta1.tar.gz
-/kea-0.9.tar.gz
-/kea-0.9.1-beta.tar.gz
-/kea-0.9.1.tar.gz
-/kea-0.9.2-beta.tar.gz
-/kea-0.9.2.tar.gz
-/kea-1.0.0-beta.tar.gz
-/kea-1.0.0-beta2.tar.gz
-/kea-1.0.0.tar.gz
-/kea-1.1.0-beta.tar.gz
-/kea-1.1.0.tar.gz
-/kea-1.2.0.tar.gz
-/kea-1.3.0-beta.tar.gz
-/kea-1.3.0.tar.gz
-/kea-1.5.0-beta1.tar.gz
-/kea-1.5.0-beta2.tar.gz
-/kea-1.5.0.tar.gz
-/kea-1.5.0-P1.tar.gz
-/kea-1.6.0.tar.gz
-/kea-1.7.9.tar.gz
-/kea-1.8.0.tar.gz
-/kea-1.9.1.tar.gz
-/kea-1.9.2.tar.gz
-/kea-1.9.3.tar.gz
-/kea-1.9.4.tar.gz
-/kea-1.9.5.tar.gz
-/kea-1.9.6.tar.gz
-/kea-1.9.8.tar.gz
-/kea-2.0.1.tar.gz
-/kea-2.0.2.tar.gz
-/kea-2.0.3.tar.gz
-/kea-2.0.3.tar.gz.asc
-/kea-2.2.0.tar.gz
-/kea-2.2.0.tar.gz.asc
-/kea-2.4.0.tar.gz
-/kea-2.4.0.tar.gz.asc
-/kea-2.4.1.tar.gz
-/kea-2.4.1.tar.gz.asc
-/keama-4.5.0.tar.gz
-/keama-4.5.0.tar.gz.asc
-/kea-2.6.0.tar.gz
-/kea-2.6.0.tar.gz.asc
+/.*.swp
+/*.src.rpm
+/kea-*.tar.gz
+/kea-*.tar.gz.asc
+/keama-*.tar.gz
+/keama-*.tar.gz.asc
diff --git a/kea.spec b/kea.spec
index 4a41a4c..5a3a695 100644
--- a/kea.spec
+++ b/kea.spec
@@ -1,5 +1,5 @@
 Name:           kea
-Version:        2.6.0
+Version:        2.6.1
 Release:        %autorelease
 Summary:        DHCPv4, DHCPv6 and DDNS server from ISC
 License:        MPL-2.0 AND BSL-1.0
@@ -41,7 +41,11 @@ BuildRequires: autoconf automake libtool
 BuildRequires: boost-devel
 BuildRequires: gcc-c++
 # %%configure --with-openssl
-BuildRequires: openssl-devel openssl-devel-engine
+BuildRequires: openssl-devel
+%if 0%{?fedora} > 40
+# https://bugzilla.redhat.com/show_bug.cgi?id=2300868#c4
+BuildRequires: openssl-devel-engine
+%endif
 %if 0%{?fedora} || 0%{?rhel} > 7
 # %%configure --with-mysql
 BuildRequires: mariadb-connector-c-devel
@@ -317,7 +321,8 @@ install -Dpm 0644 %{S:15} %{buildroot}%{_tmpfilesdir}/kea.conf
 
 %files libs
 %license COPYING
-# find `rpm --eval %%{_topdir}`/BUILDROOT/kea-*/usr/lib64/ -type f | grep /usr/lib64/libkea | sed -e 's#.*/usr/lib64\(.*\.so\.[0-9]\+\)\.[0-9]\+\.[0-9]\+#%%{_libdir}\1*#' | sort
+# old: find `rpm --eval %%{_topdir}`/BUILDROOT/kea-*/usr/lib64/ -type f | grep /usr/lib64/libkea | sed -e 's#.*/usr/lib64\(.*\.so\.[0-9]\+\)\.[0-9]\+\.[0-9]\+#%%{_libdir}\1*#' | sort
+# f41: find `rpm --eval %%{_topdir}`/BUILD/kea-*/BUILDROOT/usr/lib64/ -type f | grep /usr/lib64/libkea | sed -e 's#.*/usr/lib64\(.*\.so\.[0-9]\+\)\.[0-9]\+\.[0-9]\+#%%{_libdir}\1*#' | sort
 %{_libdir}/libkea-asiodns.so.48*
 %{_libdir}/libkea-asiolink.so.71*
 %{_libdir}/libkea-cc.so.68*
@@ -326,16 +331,16 @@ install -Dpm 0644 %{S:15} %{buildroot}%{_tmpfilesdir}/kea.conf
 %{_libdir}/libkea-d2srv.so.46*
 %{_libdir}/libkea-database.so.61*
 %{_libdir}/libkea-dhcp_ddns.so.56*
-%{_libdir}/libkea-dhcp++.so.89*
-%{_libdir}/libkea-dhcpsrv.so.108*
+%{_libdir}/libkea-dhcp++.so.90*
+%{_libdir}/libkea-dhcpsrv.so.109*
 %{_libdir}/libkea-dns++.so.56*
 %{_libdir}/libkea-eval.so.69*
 %{_libdir}/libkea-exceptions.so.33*
-%{_libdir}/libkea-hooks.so.97*
+%{_libdir}/libkea-hooks.so.98*
 %{_libdir}/libkea-http.so.71*
 %{_libdir}/libkea-log.so.61*
-%{_libdir}/libkea-mysql.so.69*
-%{_libdir}/libkea-pgsql.so.69*
+%{_libdir}/libkea-mysql.so.70*
+%{_libdir}/libkea-pgsql.so.70*
 %{_libdir}/libkea-process.so.72*
 %{_libdir}/libkea-stats.so.41*
 %{_libdir}/libkea-tcp.so.18*
diff --git a/sources b/sources
index 25debd5..4a83917 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (kea-2.6.0.tar.gz) = 6451be2f2556324fba8ab75238e8a46203ef8d94db98a7590718715a3bb5dff49d113bf387c413376a36ca0674077425ee46be0c6e50803397aa6f9428f7b50d
-SHA512 (kea-2.6.0.tar.gz.asc) = 9dc485c2d9d2e11ea263ac8bbda51eb4ac570f45a55c38ab1979920dadcd96e03aeefd6e4fc552c2c4fa2401329ac40e0321fc866716ca23e1418c16b6dbf34b
+SHA512 (kea-2.6.1.tar.gz) = 23a4c431117097538a15afd8a28016b49db5490f866aa03abd2bdfef5eaab5031491320acdf3097899d4b071cccff4b53c032ff076b13cab853e063aaa2810ec
+SHA512 (kea-2.6.1.tar.gz.asc) = 66681f183141832011c63b3b18b21b2b8a577ab1c61d14888df4bbbcdd757a0772c21fc73779a218c36e2f4d31ef4a82f04fe4e71b101da223e906065bafe6c3
 SHA512 (keama-4.5.0.tar.gz) = 2e48987e21999718be7ceb5b604be672c84666b07dde9545285ff7146ab6825e81af1ec3b5a4b50f20e61b40ed11b0254e3705cc580bb85de24b77ee8cbca162
 SHA512 (keama-4.5.0.tar.gz.asc) = 8ec416e44e143037a6936682d1e11b96c1a48be05f3e747e7a26b190e1f11c75104ef16c23eda9b257433b8de5a73c081b65fd903b611d8faa9c4b3b47702763