diff --git a/dhcp-patchs.patch b/dhcp-patchs.patch new file mode 100644 index 0000000..db2905f --- /dev/null +++ b/dhcp-patchs.patch @@ -0,0 +1,11 @@ +--- includes/dhcpd.h.orig 2018-10-09 23:57:26.022826271 +0300 ++++ includes/dhcpd.h 2018-10-09 23:57:49.108813082 +0300 +@@ -1568,7 +1568,7 @@ + #endif + + #ifndef _PATH_DHCLIENT_SCRIPT +-#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" ++#define _PATH_DHCLIENT_SCRIPT "/usr/sbin/dhclient-script" + #endif + + #ifndef _PATH_DHCLIENT_PID diff --git a/dhcp.spec b/dhcp.spec index af3ace4..35ba3d2 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -6,7 +6,7 @@ Name: dhcp Epoch: 3 Version: %{major_version}%{patch_version} -Release: 2 +Release: 3 Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client License: Distributable Group: System/Servers @@ -36,6 +36,7 @@ Source100: ROSA-NEWS Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch Patch18: dhcp-4.3.0-64_bit_lease_parse.patch Patch19: Arch-0002-iproute2.patch +Patch20: dhcp-patchs.patch # Starting from dhcp 4.x built in Bind libs are used #BuildRequires: bind-devel @@ -166,6 +167,7 @@ pushd bind ; tar -xvf bind.tar.gz >/dev/null ; popd %patch18 -p1 -b .64-bit_lease_parse # change ipconfig to modern ip (from Arch) %patch19 -p1 +%patch20 -p0 %build %serverbuild_hardened @@ -303,9 +305,6 @@ EOF [ ! -d %{var_dhclient}/ ] && mkdir -p %{var_dhclient}/ %tmpfiles_create dhclient.conf -%postun client -: - %postun server # Migrate from dhcpd user created by scripts # to a dynamic user by systemd-sysusers