New release 1.2.0 (#1440348)
This commit is contained in:
Pavel Zhukov
parent
4c7125abf0
commit
12c344a78d
|
|
@ -9,3 +9,4 @@
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -58,62 +58,6 @@ index a2b0daf..aa614c0 100644
|
|||
# Check for optreset in unistd.h. On BSD systems the optreset is
|
||||
# used to reset the state of getopt() function. Resetting its state
|
||||
# is required if command line arguments are parsed multiple times
|
||||
diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
|
||||
index c83a597..b494160 100644
|
||||
--- a/src/bin/keactrl/Makefile.am
|
||||
+++ b/src/bin/keactrl/Makefile.am
|
||||
@@ -32,9 +32,36 @@ endif
|
||||
kea.conf: kea.conf.pre
|
||||
$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea.conf.pre $@
|
||||
|
||||
+INSTALL_TARGETS = install-empty
|
||||
+
|
||||
if INSTALL_CONFIGURATIONS
|
||||
|
||||
-install-data-local:
|
||||
+INSTALL_TARGETS += install-config-files
|
||||
+
|
||||
+endif
|
||||
+
|
||||
+if USE_SYSTEMD
|
||||
+
|
||||
+EXTRA_DIST += kea-dhcp4.service.in kea-dhcp6.service.in kea-dhcp-ddns.service.in
|
||||
+DISTCLEANFILES += kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service
|
||||
+BUILT_SOURCES += kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service
|
||||
+INSTALL_TARGETS += install-systemd-files
|
||||
+
|
||||
+endif
|
||||
+
|
||||
+kea-dhcp4.service: kea-dhcp4.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+kea-dhcp6.service: kea-dhcp6.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+kea-dhcp-ddns.service: kea-dhcp-ddns.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+install-empty:
|
||||
+ :
|
||||
+
|
||||
+install-config-files:
|
||||
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
|
||||
for f in $(CONFIGFILES) ; do \
|
||||
if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
|
||||
@@ -42,4 +69,12 @@ install-data-local:
|
||||
fi ; \
|
||||
done
|
||||
|
||||
-endif
|
||||
+install-systemd-files:
|
||||
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNITDIR)
|
||||
+ $(INSTALL_DATA) kea-dhcp4.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp4.service
|
||||
+ $(INSTALL_DATA) kea-dhcp6.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp6.service
|
||||
+ $(INSTALL_DATA) kea-dhcp-ddns.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp-ddns.service
|
||||
+
|
||||
+install-data-local: $(INSTALL_TARGETS)
|
||||
+
|
||||
+uninstall-local: $(UNINSTALL_TARGETS)
|
||||
diff --git a/src/bin/keactrl/kea-dhcp-ddns.service.in b/src/bin/keactrl/kea-dhcp-ddns.service.in
|
||||
new file mode 100644
|
||||
index 0000000..d1e0526
|
||||
|
|
@ -191,3 +135,59 @@ index 43d7bff..82625ca 100644
|
|||
--
|
||||
2.3.4
|
||||
|
||||
diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
|
||||
index ac2c894..9bd8ed0 100644
|
||||
--- a/src/bin/keactrl/Makefile.am
|
||||
+++ b/src/bin/keactrl/Makefile.am
|
||||
@@ -35,10 +35,36 @@ kea.conf: kea.conf.pre
|
||||
kea-ca.conf: kea-ca.conf.pre
|
||||
$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-ca.conf.pre $@
|
||||
|
||||
+INSTALL_TARGETS = install-empty
|
||||
|
||||
if INSTALL_CONFIGURATIONS
|
||||
|
||||
-install-data-local:
|
||||
+INSTALL_TARGETS += install-config-files
|
||||
+
|
||||
+endif
|
||||
+
|
||||
+if USE_SYSTEMD
|
||||
+
|
||||
+EXTRA_DIST += kea-dhcp4.service.in kea-dhcp6.service.in kea-dhcp-ddns.service.in
|
||||
+DISTCLEANFILES += kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service
|
||||
+BUILT_SOURCES += kea-dhcp4.service kea-dhcp6.service kea-dhcp-ddns.service
|
||||
+INSTALL_TARGETS += install-systemd-files
|
||||
+
|
||||
+endif
|
||||
+
|
||||
+kea-dhcp4.service: kea-dhcp4.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+kea-dhcp6.service: kea-dhcp6.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+kea-dhcp-ddns.service: kea-dhcp-ddns.service.in
|
||||
+ $(top_builddir)/tools/path_replacer.sh $< $@
|
||||
+
|
||||
+install-empty:
|
||||
+ :
|
||||
+
|
||||
+install-config-files:
|
||||
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
|
||||
for f in $(CONFIGFILES) ; do \
|
||||
if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
|
||||
@@ -46,4 +72,12 @@ install-data-local:
|
||||
fi ; \
|
||||
done
|
||||
|
||||
-endif
|
||||
+install-systemd-files:
|
||||
+ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNITDIR)
|
||||
+ $(INSTALL_DATA) kea-dhcp4.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp4.service
|
||||
+ $(INSTALL_DATA) kea-dhcp6.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp6.service
|
||||
+ $(INSTALL_DATA) kea-dhcp-ddns.service $(DESTDIR)$(SYSTEMD_UNITDIR)/kea-dhcp-ddns.service
|
||||
+
|
||||
+install-data-local: $(INSTALL_TARGETS)
|
||||
+
|
||||
+uninstall-local: $(UNINSTALL_TARGETS)
|
||||
|
|
|
|||
20
kea.spec
20
kea.spec
|
|
@ -9,16 +9,14 @@
|
|||
|
||||
Summary: DHCPv4, DHCPv6 and DDNS server from ISC
|
||||
Name: kea
|
||||
Version: 1.1.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.2.0
|
||||
Release: 2%{?dist}
|
||||
License: MPLv2.0 and Boost
|
||||
URL: http://kea.isc.org
|
||||
Source0: http://ftp.isc.org/isc/kea/%{VERSION}/kea-%{VERSION}.tar.gz
|
||||
|
||||
# http://kea.isc.org/ticket/3529
|
||||
Patch0: kea-systemd.patch
|
||||
## https://github.com/isc-projects/kea/pull/34
|
||||
Patch1: kea-openssl-1.1.patch
|
||||
|
||||
# autoreconf
|
||||
BuildRequires: autoconf automake libtool
|
||||
|
|
@ -79,7 +77,6 @@ Header files and API documentation.
|
|||
%setup -q -n kea-%{VERSION}
|
||||
|
||||
%patch0 -p1 -b .systemd
|
||||
%patch1 -p1 -b .openssl
|
||||
|
||||
# install leases db in /var/lib/kea/ not /var/kea/
|
||||
# http://kea.isc.org/ticket/3523
|
||||
|
|
@ -166,12 +163,14 @@ EOF
|
|||
%{_sbindir}/keactrl
|
||||
%{_sbindir}/perfdhcp
|
||||
%{_bindir}/kea-msg-compiler
|
||||
%{_sbindir}/kea-ctrl-agent
|
||||
%{_unitdir}/kea-dhcp4.service
|
||||
%{_unitdir}/kea-dhcp6.service
|
||||
%{_unitdir}/kea-dhcp-ddns.service
|
||||
%dir %{_sysconfdir}/kea/
|
||||
%config(noreplace) %{_sysconfdir}/kea/kea.conf
|
||||
%config(noreplace) %{_sysconfdir}/kea/keactrl.conf
|
||||
%config(noreplace) %{_sysconfdir}/kea/kea-ca.conf
|
||||
%dir %{_datarootdir}/kea/
|
||||
%{_datarootdir}/kea/scripts
|
||||
%dir /run/kea/
|
||||
|
|
@ -196,6 +195,8 @@ EOF
|
|||
%{_mandir}/man8/kea-lfc.8.gz
|
||||
%{_mandir}/man8/keactrl.8.gz
|
||||
%{_mandir}/man8/perfdhcp.8.gz
|
||||
%{_mandir}/man8/kea-ctrl-agent.8.gz
|
||||
%{_mandir}/man8/kea-shell.8.gz
|
||||
|
||||
%files libs
|
||||
#%%dir %%{_pkgdocdir}/
|
||||
|
|
@ -220,6 +221,12 @@ EOF
|
|||
%{_libdir}/libkea-threads.so.*
|
||||
%{_libdir}/libkea-util-io.so.*
|
||||
%{_libdir}/libkea-util.so.*
|
||||
%{_libdir}/libkea-http.so
|
||||
%{_libdir}/libkea-http.so.0
|
||||
%{_libdir}/libkea-http.so.0.0.0
|
||||
%{_libdir}/libkea-process.so
|
||||
%{_libdir}/libkea-process.so.0
|
||||
%{_libdir}/libkea-process.so.0.0.0
|
||||
|
||||
%files devel
|
||||
%{_includedir}/kea
|
||||
|
|
@ -243,6 +250,9 @@ EOF
|
|||
%{_libdir}/pkgconfig/dns++.pc
|
||||
|
||||
%changelog
|
||||
* Fri May 26 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.2.0-2
|
||||
- New release 1.2.0 (#1440348)
|
||||
|
||||
* Tue Apr 04 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 1.1.0-3
|
||||
- Add patch for OpenSSL 1.1. Fix FTBFS (#1423812)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue