add systemd units; rel 2

based on fedora units adjusted to match init.d scripts in pld.
also included additional patch with systemd notify support

diff --git a/dhcp.spec b/dhcp.spec
index 2d1cd7a80f2be0c51b9ef627efd7bc4df5d960be..e534e60e8b6f8060d38858ea2f4806cfcea2a083 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without ldap    # without support for ldap storage
 %bcond_without static_libs     # don't build static library
+%bcond_without systemd         # without systemd units
 
 %define         ver     4.4.2
 %if 0
@@ -20,7 +21,7 @@ Summary(pl.UTF-8):    Serwer DHCP
 Summary(pt_BR.UTF-8):  Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
 Version:       %{ver}%{pverdot}
-Release:       1
+Release:       2
 Epoch:         4
 License:       MIT
 Group:         Networking/Daemons
@@ -31,6 +32,9 @@ Source2:      %{name}6.init
 Source3:       %{name}-relay.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}-relay.sysconfig
+Source6:       dhcpd.service
+Source7:       dhcpd6.service
+Source8:       dhcp-relay.service
 Source10:      %{name}.schema
 Source11:      %{name}-README.ldap
 Source12:      draft-ietf-dhc-ldap-schema-01.txt
@@ -46,6 +50,7 @@ Patch7:               %{name}-unicast-bootp.patch
 Patch8:                %{name}-default-requested-options.patch
 Patch9:                %{name}-manpages.patch
 Patch10:       %{name}-extravars.patch
+Patch11:       systemd-notify.patch
 URL:           https://www.isc.org/dhcp/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,10 +61,12 @@ BuildRequires:      libatomic-devel
 BuildRequires: libtool
 %{?with_ldap:BuildRequires:    openldap-devel}
 %{?with_ldap:BuildRequires:    openssl-devel}
-BuildRequires: rpmbuild(macros) >= 1.304
+BuildRequires: rpmbuild(macros) >= 1.644
+%{?with_systemd:BuildRequires: systemd-devel}
 Requires(post):        coreutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts >= 0.2.0
+%{?with_systemd:Requires:      systemd-units >= 38}
 Provides:      dhcpd
 Obsoletes:     dhcpv6-server
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -209,6 +216,7 @@ komunikacji z działającym serwerem ISC DHCP i jego kontroli.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 cp -a %{SOURCE11} README.ldap
@@ -252,7 +260,8 @@ CFLAGS="%{rpmcflags} -fPIC -D_GNU_SOURCE=1"
        --with-srv-pid-file=/var/run/dhcpd.pid \
        --with-cli-pid-file=/var/run/dhclient.pid \
        --with-relay-pid-file=/var/run/dhcrelay.pid \
-       --with%{!?with_ldap:out}-ldap
+       --with%{!?with_ldap:out}-ldap \
+       --with%{!?with_systemd:out}-systemd
 %{__make} -j1
 
 %install
@@ -268,6 +277,11 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp-relay
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/dhcpd
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/dhcp-relay
 
+%if %{with systemd}
+install -d $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}
+%endif
+
 install client/scripts/linux $RPM_BUILD_ROOT/sbin/dhclient-script
 
 install server/dhcpd.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd.conf
@@ -316,6 +330,7 @@ touch /var/lib/dhcpd/dhcpd6.leases
 %service dhcpd restart "dhcpd daemon"
 /sbin/chkconfig --add dhcpd6
 %service dhcpd6 restart "dhcpd IPv6 daemon"
+%{?with_systemd:%systemd_post dhcpd.service dhcpd6.service}
 
 %preun
 if [ "$1" = "0" ];then
@@ -324,11 +339,16 @@ if [ "$1" = "0" ];then
        %service dhcpd6 stop
        /sbin/chkconfig --del dhcpd6
 fi
+%{?with_systemd:%systemd_preun dhcpd.service dhcpd6.service}
+
+%postun
+%{?with_systemd:%systemd_reload}
 
-%triggerpostun -- dhcp < 3.0
+%triggerpostun -- dhcp < 4.4.2-2
 if ! grep -q ddns-update-style /etc/dhcpd.conf; then
        %{__sed} -i -e '1iddns-update-style none;' /etc/dhcpd.conf
 fi
+%systemd_trigger dhcpd.service dhcpd6.service
 
 %post -n openldap-schema-dhcp
 %openldap_schema_register %{schemadir}/dhcp.schema -d core
@@ -346,12 +366,20 @@ if [ -f /var/lock/subsys/dhcrelay ]; then
        mv -f /var/lock/subsys/{dhcrelay,dhcp-relay}
 fi
 %service dhcp-relay restart "dhcrelay daemon"
+%{?with_systemd:%systemd_post dhcp-relay.service}
 
 %preun relay
 if [ "$1" = "0" ];then
        %service dhcp-relay stop
        /sbin/chkconfig --del dhcp-relay
 fi
+%{?with_systemd:%systemd_preun dhcp-relay.service}
+
+%postun relay
+%{?with_systemd:%systemd_reload}
+
+%triggerpostun -- dhcp-relay < 4.4.2-2
+%systemd_trigger dhcp-relay.service
 
 %triggerun client -- %{name}-client < 4:4.0.2-2
 if [ -f /etc/dhclient-enter-hooks ] ; then
@@ -372,6 +400,10 @@ fi
 %attr(755,root,root) %{_sbindir}/dhcpd
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd
 %attr(754,root,root) /etc/rc.d/init.d/dhcpd6
+%if %{with systemd}
+%{systemdunitdir}/dhcpd.service
+%{systemdunitdir}/dhcpd6.service
+%endif
 %attr(750,root,root) %dir /var/lib/dhcpd
 %ghost /var/lib/dhcpd/dhcpd.leases
 %ghost /var/lib/dhcpd/dhcpd6.leases
@@ -406,6 +438,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp-relay
 %attr(755,root,root) %{_sbindir}/dhcrelay
 %attr(754,root,root) /etc/rc.d/init.d/dhcp-relay
+%{?with_systemd:%{systemdunitdir}/dhcp-relay.service}
 %{_mandir}/man8/dhcrelay.8*
 
 %files devel

diff --git a/systemd-notify.patch b/systemd-notify.patch
new file mode 100644 (file)
index 0000000..4f74075
--- /dev/null
+++ b/systemd-notify.patch
@@ -0,0 +1,97 @@
+From 8d974fd1f667e1b957ad4092fe66a8bb94f5f8fd Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Thu, 7 Nov 2019 14:47:45 +0100
+Subject: [PATCH 1/1] Add missed sd notify patch to manage dhcpd with systemd
+Cc: pzhukov@redhat.com
+
+---
+ configure.ac     | 11 +++++++++++
+ relay/dhcrelay.c | 12 ++++++++++++
+ server/dhcpd.c   | 12 ++++++++++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 15fc0d7..0c08000 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes;
+     AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS])
+ fi
+ 
++AC_ARG_WITH(systemd,
++        AC_HELP_STRING([--with-systemd],
++                       [enable sending status notifications to systemd daemon (default is no)]),
++        [systemd=$withval],
++        [systemd=no])
++
++if test x$systemd = xyes ; then
++   AC_CHECK_LIB(systemd, sd_notifyf, ,
++                AC_MSG_FAILURE([*** systemd library not present - do you need to install systemd-libs package?]))
++fi
++
+ # Append selected warning levels to CFLAGS before substitution (but after
+ # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
+index 7b4f4f1..9eb5bfd 100644
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -37,6 +37,10 @@
+ #include <sys/time.h>
+ #include <isc/file.h>
+ 
++#ifdef HAVE_LIBSYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+ struct tree_cache *global_options[256];
+@@ -845,6 +849,14 @@ main(int argc, char **argv) {
+       signal(SIGTERM, dhcp_signal_handler);  /* kill */
+ #endif
+ 
++#ifdef HAVE_LIBSYSTEMD
++        /* We are ready to process incomming packets. Let's notify systemd */
++        sd_notifyf(0, "READY=1\n"
++                   "STATUS=Dispatching packets...\n"
++                   "MAINPID=%lu",
++                   (unsigned long) getpid());
++#endif
++
+       /* Start dispatching packets and timeouts... */
+       dispatch();
+ 
+diff --git a/server/dhcpd.c b/server/dhcpd.c
+index 4aef16b..778ef8d 100644
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -60,6 +60,10 @@ gid_t set_gid = 0;
+ struct class unknown_class;
+ struct class known_class;
+ 
++#ifdef HAVE_LIBSYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+ 
+@@ -1057,6 +1061,14 @@ main(int argc, char **argv) {
+       /* Log that we are about to start working */
+       log_info("Server starting service.");
+ 
++#ifdef HAVE_LIBSYSTEMD
++        /* We are ready to process incomming packets. Let's notify systemd */
++        sd_notifyf(0, "READY=1\n"
++                   "STATUS=Dispatching packets...\n"
++                   "MAINPID=%lu",
++                   (unsigned long) getpid());
++#endif
++
+       /*
+        * Receive packets and dispatch them...
+        * dispatch() will never return.
+-- 
+2.14.5
+