mirror of
https://abf.rosa.ru/djam/dhcp.git
synced 2025-02-23 13:32:48 +00:00
patch path to dhclient-script. Remove empty %postun
This commit is contained in:
parent
c409ed2fb9
commit
b2e0aea917
2 changed files with 14 additions and 4 deletions
11
dhcp-patchs.patch
Normal file
11
dhcp-patchs.patch
Normal file
|
@ -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
|
|
@ -6,7 +6,7 @@
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
Epoch: 3
|
Epoch: 3
|
||||||
Version: %{major_version}%{patch_version}
|
Version: %{major_version}%{patch_version}
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client
|
Summary: The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client
|
||||||
License: Distributable
|
License: Distributable
|
||||||
Group: System/Servers
|
Group: System/Servers
|
||||||
|
@ -36,6 +36,7 @@ Source100: ROSA-NEWS
|
||||||
Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch
|
Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch
|
||||||
Patch18: dhcp-4.3.0-64_bit_lease_parse.patch
|
Patch18: dhcp-4.3.0-64_bit_lease_parse.patch
|
||||||
Patch19: Arch-0002-iproute2.patch
|
Patch19: Arch-0002-iproute2.patch
|
||||||
|
Patch20: dhcp-patchs.patch
|
||||||
|
|
||||||
# Starting from dhcp 4.x built in Bind libs are used
|
# Starting from dhcp 4.x built in Bind libs are used
|
||||||
#BuildRequires: bind-devel
|
#BuildRequires: bind-devel
|
||||||
|
@ -166,6 +167,7 @@ pushd bind ; tar -xvf bind.tar.gz >/dev/null ; popd
|
||||||
%patch18 -p1 -b .64-bit_lease_parse
|
%patch18 -p1 -b .64-bit_lease_parse
|
||||||
# change ipconfig to modern ip (from Arch)
|
# change ipconfig to modern ip (from Arch)
|
||||||
%patch19 -p1
|
%patch19 -p1
|
||||||
|
%patch20 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%serverbuild_hardened
|
%serverbuild_hardened
|
||||||
|
@ -303,9 +305,6 @@ EOF
|
||||||
[ ! -d %{var_dhclient}/ ] && mkdir -p %{var_dhclient}/
|
[ ! -d %{var_dhclient}/ ] && mkdir -p %{var_dhclient}/
|
||||||
%tmpfiles_create dhclient.conf
|
%tmpfiles_create dhclient.conf
|
||||||
|
|
||||||
%postun client
|
|
||||||
:
|
|
||||||
|
|
||||||
%postun server
|
%postun server
|
||||||
# Migrate from dhcpd user created by scripts
|
# Migrate from dhcpd user created by scripts
|
||||||
# to a dynamic user by systemd-sysusers
|
# to a dynamic user by systemd-sysusers
|
||||||
|
|
Loading…
Add table
Reference in a new issue