diff --git a/0001-Fix-hooks-directory.patch b/0001-Fix-hooks-directory.patch deleted file mode 100644 index 638aa91..0000000 --- a/0001-Fix-hooks-directory.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a82663945fe1220a151f11283b34c4cb42cee778 Mon Sep 17 00:00:00 2001 -From: Felix Kaechele -Date: Sun, 17 Jun 2018 20:30:36 +0200 -Subject: [PATCH 1/3] Fix hooks directory - -Signed-off-by: Felix Kaechele ---- - src/hooks/dhcp/high_availability/Makefile.am | 4 ++-- - src/hooks/dhcp/lease_cmds/Makefile.am | 4 ++-- - src/hooks/dhcp/stat_cmds/Makefile.am | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/hooks/dhcp/high_availability/Makefile.am b/src/hooks/dhcp/high_availability/Makefile.am -index 8550cca..ffba51c 100644 ---- a/src/hooks/dhcp/high_availability/Makefile.am -+++ b/src/hooks/dhcp/high_availability/Makefile.am -@@ -43,8 +43,8 @@ nodist_libha_la_SOURCES = ha_messages.cc ha_messages.h - libha_la_CXXFLAGS = $(AM_CXXFLAGS) - libha_la_CPPFLAGS = $(AM_CPPFLAGS) - --# install the shared object into $(libdir)/hooks --lib_hooksdir = $(libdir)/hooks -+# install the shared object into $(libdir)/kea/hooks -+lib_hooksdir = $(libdir)/kea/hooks - lib_hooks_LTLIBRARIES = libdhcp_ha.la - - libdhcp_ha_la_SOURCES = -diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am -index 841298f..d328255 100644 ---- a/src/hooks/dhcp/lease_cmds/Makefile.am -+++ b/src/hooks/dhcp/lease_cmds/Makefile.am -@@ -36,8 +36,8 @@ nodist_liblease_cmds_la_SOURCES = lease_cmds_messages.cc lease_cmds_messages.h - liblease_cmds_la_CXXFLAGS = $(AM_CXXFLAGS) - liblease_cmds_la_CPPFLAGS = $(AM_CPPFLAGS) - --# install the shared object into $(libdir)/hooks --lib_hooksdir = $(libdir)/hooks -+# install the shared object into $(libdir)/kea/hooks -+lib_hooksdir = $(libdir)/kea/hooks - lib_hooks_LTLIBRARIES = libdhcp_lease_cmds.la - - libdhcp_lease_cmds_la_SOURCES = -diff --git a/src/hooks/dhcp/stat_cmds/Makefile.am b/src/hooks/dhcp/stat_cmds/Makefile.am -index e6ff587..ccfc3ad 100644 ---- a/src/hooks/dhcp/stat_cmds/Makefile.am -+++ b/src/hooks/dhcp/stat_cmds/Makefile.am -@@ -35,8 +35,8 @@ nodist_libstat_cmds_la_SOURCES = stat_cmds_messages.cc stat_cmds_messages.h - libstat_cmds_la_CXXFLAGS = $(AM_CXXFLAGS) - libstat_cmds_la_CPPFLAGS = $(AM_CPPFLAGS) - --# install the shared object into $(libdir)/hooks --lib_hooksdir = $(libdir)/hooks -+# install the shared object into $(libdir)/kea/hooks -+lib_hooksdir = $(libdir)/kea/hooks - lib_hooks_LTLIBRARIES = libdhcp_stat_cmds.la - - libdhcp_stat_cmds_la_SOURCES = --- -2.19.2 - diff --git a/0002-Fix-dns-pc-file.patch b/0002-Fix-dns-pc-file.patch deleted file mode 100644 index 0e442da..0000000 --- a/0002-Fix-dns-pc-file.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 76eb124d88c378e3259c437d55b328ed55befc60 Mon Sep 17 00:00:00 2001 -From: Felix Kaechele -Date: Sun, 17 Jun 2018 20:32:52 +0200 -Subject: [PATCH 2/3] Fix dns++ pc file - -Signed-off-by: Felix Kaechele ---- - dns++.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dns++.pc.in b/dns++.pc.in -index ef65c7e..399a0eb 100644 ---- a/dns++.pc.in -+++ b/dns++.pc.in -@@ -8,4 +8,4 @@ Description: BIND 10 DNS library - Version: @PACKAGE_VERSION@ - Requires: @CRYPTO_PACKAGE@ - Cflags: -I${includedir}/@PACKAGE_NAME@ --Libs: -L${libdir} -lb10-dns++ -lb10-cryptolink -lb10-util -lb10-exceptions -lm -+Libs: -L${libdir} -lkea-dns++ -lkea-cryptolink -lkea-util -lkea-exceptions -lm --- -2.19.2 - diff --git a/0003-Remove-spurious-fi.patch b/0003-Remove-spurious-fi.patch deleted file mode 100644 index 8ea6130..0000000 --- a/0003-Remove-spurious-fi.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ac5987d32c555a7515334abf7cab5dc40c4056f2 Mon Sep 17 00:00:00 2001 -From: Felix Kaechele -Date: Sun, 17 Jun 2018 20:33:48 +0200 -Subject: [PATCH 3/3] Remove spurious fi - -Signed-off-by: Felix Kaechele ---- - src/bin/keactrl/keactrl.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in -index 9869bc3..a229c68 100644 ---- a/src/bin/keactrl/keactrl.in -+++ b/src/bin/keactrl/keactrl.in -@@ -549,4 +549,3 @@ ${args}" 1 - log_error "Invalid command: ${command}." - exit 1 ;; - esac --fi --- -2.19.2 - diff --git a/0005-disablenetconf.patch b/0005-disablenetconf.patch new file mode 100644 index 0000000..bc81a3a --- /dev/null +++ b/0005-disablenetconf.patch @@ -0,0 +1,12 @@ +--- kea-1.6.0.new/doc/sphinx/Makefile.am 2019-09-11 15:13:01.480900859 -0400 ++++ kea-1.6.0.new/doc/sphinx/Makefile.am 2019-09-11 15:14:05.066858096 -0400 +@@ -63,7 +63,9 @@ + rst_man_sources+=man/kea-dhcp6.8.rst + rst_man_sources+=man/kea-dhcp-ddns.8.rst + rst_man_sources+=man/kea-lfc.8.rst ++if HAVE_SYSREPO + rst_man_sources+=man/kea-netconf.8.rst ++endif + rst_man_sources+=man/kea-shell.8.rst + rst_man_sources+=man/keactrl.8.rst + rst_man_sources+=man/perfdhcp.8.rst diff --git a/kea.spec b/kea.spec index 59f8d38..7f64b20 100644 --- a/kea.spec +++ b/kea.spec @@ -1,11 +1,12 @@ #http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html %global _hardened_build 1 +%global sysrepo 0 -%global prever P1 +#%%global prever P1 Name: kea -Version: 1.5.0 -Release: 10%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: DHCPv4, DHCPv6 and DDNS server from ISC License: MPLv2.0 and Boost @@ -16,10 +17,8 @@ Source2: kea-dhcp6.service Source3: kea-dhcp-ddns.service Source4: kea-ctrl-agent.service -Patch0: 0001-Fix-hooks-directory.patch -Patch1: 0002-Fix-dns-pc-file.patch -Patch2: 0003-Remove-spurious-fi.patch Patch3: 0004-Openssl-version.patch +Patch4: 0005-disablenetconf.patch # autoreconf BuildRequires: autoconf automake libtool @@ -41,6 +40,11 @@ BuildRequires: mariadb-devel BuildRequires: postgresql-devel %endif BuildRequires: log4cplus-devel +%if %{sysrepo} +# %%configure --with-sysrepo +BuildRequires: sysrepo-devel +%endif + %ifnarch s390 %{mips} BuildRequires: valgrind-devel %endif @@ -54,6 +58,7 @@ BuildRequires: python3-devel # in case you ever wanted to use %%configure --enable-generate-docs #BuildRequires: elinks asciidoc plantuml BuildRequires: systemd +BuildRequires: python3-sphinx Requires: kea-libs%{?_isa} = %{version}-%{release} Requires(post): systemd @@ -124,10 +129,16 @@ export CXXFLAGS="%{optflags} -std=gnu++11 -Wno-deprecated-declarations" --enable-debug \ --enable-generate-parser \ --enable-shell \ + --enable-generate-docs \ + --enable-generate-messages \ + --enable-perfdhcp \ --with-mysql \ --with-pgsql \ --with-gnu-ld \ --with-log4cplus \ +%if %{sysrepo} + --with-sysrepo \ +%endif --with-openssl %make_build @@ -200,20 +211,23 @@ EOF %config(noreplace) %{_sysconfdir}/kea/kea-dhcp6.conf %config(noreplace) %{_sysconfdir}/kea/kea-dhcp4.conf %config(noreplace) %{_sysconfdir}/kea/kea-dhcp-ddns.conf +%if %{sysrepo} %config(noreplace) %{_sysconfdir}/kea/kea-netconf.conf +%endif %dir %{_datarootdir}/kea/ %{_datarootdir}/kea/scripts +%if %{sysrepo} %{_datarootdir}/kea/yang +%endif %dir %{_sharedstatedir}/kea %config(noreplace) %{_sharedstatedir}/kea/kea-leases4.csv %config(noreplace) %{_sharedstatedir}/kea/kea-leases6.csv %{_pkgdocdir}/AUTHORS %{_pkgdocdir}/ChangeLog %{_pkgdocdir}/README +%{_pkgdocdir}/CONTRIBUTING.md %{_pkgdocdir}/examples -%{_pkgdocdir}/kea-guide.* -%{_pkgdocdir}/kea-logo-100x70.png -%{_pkgdocdir}/kea-messages.html +%{_pkgdocdir}/html %{python3_sitelib}/%{name} %{_mandir}/man8/kea-admin.8.gz %{_mandir}/man8/keactrl.8.gz @@ -224,6 +238,9 @@ EOF %{_mandir}/man8/kea-lfc.8.gz %{_mandir}/man8/kea-shell.8.gz %{_mandir}/man8/perfdhcp.8.gz +%if %{sysrepo} +%{_mandir}/man8/kea-netconf.8.gz +%endif %dir /run/kea/ %{_tmpfilesdir}/kea.conf @@ -252,7 +269,6 @@ EOF %{_libdir}/libkea-threads.so %{_libdir}/libkea-util-io.so %{_libdir}/libkea-util.so -%{_libdir}/pkgconfig/dns++.pc %files hooks %dir %{_libdir}/%{name} @@ -285,8 +301,9 @@ EOF %changelog -* Mon Aug 19 2019 Miro Hrončok - 1.5.0-9 -- Rebuilt for Python 3.8 +* Wed Sep 11 2019 Kenneth Topp - 1.6.0-1 +- update to 1.6.0 +- includes fixes for CVE-2019-6472, CVE-2019-6473 and CVE-2019-6474 * Tue Jul 30 2019 Pavel Zhukov - 1.5.0-8 - Do not specify openssl version