New version 2.6.0 (rhbz#2283671)

.gitignore

@@ -38,3 +38,5 @@
 /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

kea-gtest.patch

@@ -1,8 +1,8 @@
 diff --git a/m4macros/ax_gtest.m4 b/m4macros/ax_gtest.m4
-index 2681b43..852fd2a 100644
+index 138a03f..80ebb98 100644
 --- a/m4macros/ax_gtest.m4
 +++ b/m4macros/ax_gtest.m4
-@@ -136,9 +136,9 @@ if test "x$enable_gtest" = "xyes" ; then
+@@ -173,9 +173,9 @@ if test "x$enable_gtest" = "xyes" ; then
              for dir in $GTEST_PATHS; do
                  if test -f "$dir/include/gtest/gtest.h"; then
                      if test -f "$dir/lib/libgtest.a" || \
@@ -13,7 +13,7 @@ index 2681b43..852fd2a 100644
 +                        GTEST_LDFLAGS="-L$dir/lib64"
                          GTEST_LDADD="-lgtest"
                          GTEST_FOUND="true"
-                         break
+                         AC_MSG_RESULT([$dir/lib])
 diff --git a/src/lib/util/tests/pid_file_unittest.cc b/src/lib/util/tests/pid_file_unittest.cc
 index 5f00d72..583a35b 100644
 --- a/src/lib/util/tests/pid_file_unittest.cc

kea.spec

@@ -1,3 +1,10 @@
+Name:           kea
+Version:        2.6.0
+Release:        %autorelease
+Summary:        DHCPv4, DHCPv6 and DDNS server from ISC
+License:        MPL-2.0 AND BSL-1.0
+URL:            http://kea.isc.org
+
 # TODO: no support for netconf/sysconf yet
 %bcond_with sysrepo
 %bcond_with gtest
@@ -7,13 +14,14 @@
 # Bundled version of Bind libraries linked into Keama
 %global bind_version 9.11.36
 
-Name:           kea
+# Conflict with different package name
-Version:        2.4.1
+%global upstream_name kea
-Release:        %autorelease
+%define upstream_name_compat() \
-Summary:        DHCPv4, DHCPv6 and DDNS server from ISC
+%if "%{name}" != "%{upstream_name}" \
+Provides: %1 = %{version}-%{release} \
+Conflicts: %1 \
+%endif
 
-License:        MPL-2.0 AND BSL-1.0
-URL:            http://kea.isc.org
 Source0:        https://downloads.isc.org/isc/kea/%{version}%{?prever:-%{prever}}/kea-%{version}%{?prever:-%{prever}}.tar.gz
 Source1:        https://downloads.isc.org/isc/kea/%{version}%{?prever:-%{prever}}/kea-%{version}%{?prever:-%{prever}}.tar.gz.asc
 Source2:        https://downloads.isc.org/isc/keama/%{keama_version}/keama-%{keama_version}.tar.gz
@@ -75,6 +83,7 @@ BuildRequires: make
 BuildRequires: gnupg2
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%upstream_name_compat %{upstream_name}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -120,6 +129,7 @@ custom processing is required.
 
 %package libs
 Summary: Shared libraries used by Kea DHCP server
+%upstream_name_compat %{upstream_name}-libs
 
 %description libs
 This package contains shared libraries used by Kea DHCP server.
@@ -291,6 +301,7 @@ install -Dpm 0644 %{S:15} %{buildroot}%{_tmpfilesdir}/kea.conf
 %doc %{_pkgdocdir}/html
 %doc %{_pkgdocdir}/platforms.rst
 %doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/SECURITY.md
 
 %files devel
 %{_includedir}/kea
@@ -303,29 +314,29 @@ 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
-%{_libdir}/libkea-asiodns.so.35*
+%{_libdir}/libkea-asiodns.so.48*
-%{_libdir}/libkea-asiolink.so.56*
+%{_libdir}/libkea-asiolink.so.71*
-%{_libdir}/libkea-cc.so.54*
+%{_libdir}/libkea-cc.so.68*
-%{_libdir}/libkea-cfgclient.so.51*
+%{_libdir}/libkea-cfgclient.so.65*
-%{_libdir}/libkea-cryptolink.so.38*
+%{_libdir}/libkea-cryptolink.so.50*
-%{_libdir}/libkea-d2srv.so.30*
+%{_libdir}/libkea-d2srv.so.46*
-%{_libdir}/libkea-database.so.48*
+%{_libdir}/libkea-database.so.61*
-%{_libdir}/libkea-dhcp_ddns.so.41*
+%{_libdir}/libkea-dhcp_ddns.so.56*
-%{_libdir}/libkea-dhcp++.so.74*
+%{_libdir}/libkea-dhcp++.so.89*
-%{_libdir}/libkea-dhcpsrv.so.90*
+%{_libdir}/libkea-dhcpsrv.so.108*
-%{_libdir}/libkea-dns++.so.42*
+%{_libdir}/libkea-dns++.so.56*
-%{_libdir}/libkea-eval.so.52*
+%{_libdir}/libkea-eval.so.69*
-%{_libdir}/libkea-exceptions.so.23*
+%{_libdir}/libkea-exceptions.so.33*
-%{_libdir}/libkea-hooks.so.78*
+%{_libdir}/libkea-hooks.so.97*
-%{_libdir}/libkea-http.so.56*
+%{_libdir}/libkea-http.so.71*
-%{_libdir}/libkea-log.so.48*
+%{_libdir}/libkea-log.so.61*
-%{_libdir}/libkea-mysql.so.53*
+%{_libdir}/libkea-mysql.so.69*
-%{_libdir}/libkea-pgsql.so.53*
+%{_libdir}/libkea-pgsql.so.69*
-%{_libdir}/libkea-process.so.57*
+%{_libdir}/libkea-process.so.72*
-%{_libdir}/libkea-stats.so.29*
+%{_libdir}/libkea-stats.so.41*
-%{_libdir}/libkea-tcp.so.5*
+%{_libdir}/libkea-tcp.so.18*
 %{_libdir}/libkea-util-io.so.0*
-%{_libdir}/libkea-util.so.68*
+%{_libdir}/libkea-util.so.84*
 
 %files keama
 %license COPYING

sources

@@ -1,4 +1,4 @@
-SHA512 (kea-2.4.1.tar.gz) = b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224
+SHA512 (kea-2.6.0.tar.gz) = 6451be2f2556324fba8ab75238e8a46203ef8d94db98a7590718715a3bb5dff49d113bf387c413376a36ca0674077425ee46be0c6e50803397aa6f9428f7b50d
-SHA512 (kea-2.4.1.tar.gz.asc) = 68050e555018b882fb796081075e64c1004ebe330397318e9e6e8eb3519f1086ad2796e20c1af9fa551df3af8857509c54e0cf57ecaedc8dffa946b879205c99
+SHA512 (kea-2.6.0.tar.gz.asc) = 9dc485c2d9d2e11ea263ac8bbda51eb4ac570f45a55c38ab1979920dadcd96e03aeefd6e4fc552c2c4fa2401329ac40e0321fc866716ca23e1418c16b6dbf34b
 SHA512 (keama-4.5.0.tar.gz) = 2e48987e21999718be7ceb5b604be672c84666b07dde9545285ff7146ab6825e81af1ec3b5a4b50f20e61b40ed11b0254e3705cc580bb85de24b77ee8cbca162
 SHA512 (keama-4.5.0.tar.gz.asc) = 8ec416e44e143037a6936682d1e11b96c1a48be05f3e747e7a26b190e1f11c75104ef16c23eda9b257433b8de5a73c081b65fd903b611d8faa9c4b3b47702763