Djam/dhcp
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/dhcp.git synced 2025-02-23 21:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix patch: use sed to change hardcoded paths

Browse source
This commit is contained in:
Mikhail Novosyolov 2018-10-10 01:07:23 +03:00
parent 2123cf8715
commit 6fb0cd0559
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dhcp-patchs.patch
View file

@ -1,11 +0,0 @@
--- 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

4
dhcp.spec
View file

@ -36,7 +36,6 @@ 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
@ -168,7 +167,8 @@ 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 # change hardcoded path /sbin/dhclient-script to /usr/sbin/dhclient-script
sed -i 'includes/dhcpd.h' -e 's,/sbin/dhclient-script,/usr/sbin/dhclient-script,g' || true
%build %build
%serverbuild_hardened %serverbuild_hardened