From 68081498cde44d9b5320e795229865e46a1552ac Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 15:25:05 -0400 Subject: [PATCH 1/7] WRS: spec-include-TiS-patches.patch --- SPECS/dhcp.spec | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec index 9647a5a..78ee924 100644 --- a/SPECS/dhcp.spec +++ b/SPECS/dhcp.spec @@ -39,6 +39,10 @@ Source8: dhcrelay.service Source9: azure-cloud.sh Source10: README.scripts +# WRS +Source20: dhclient-exit-hooks +Source21: dhclient.conf + Patch0: dhcp-4.2.0-errwarn-message.patch Patch1: dhcp-4.2.4-dhclient-options.patch @@ -99,6 +103,14 @@ Patch62: dhcp-max-fd-value.patch Patch63: dhcp-4.2.5-rh1355827.patch Patch64: dhcp-4.2.5-centos-branding.patch +# WRS +Patch101: support-disable-nsupdate.patch +Patch102: dhclient-restrict-interfaces-to-command-line.patch +Patch103: dhclient-ipv6-bind-to-interface.patch +Patch104: dhclient-ipv6-conditionally-set-hostname.patch +Patch105: dhclient-handle-wrs-install-uuid.patch +Patch106: dhclient-dhcp6-wrs-install-uuid.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -409,6 +421,14 @@ rm -rf includes/isc-dhcp %patch63 -p1 %patch64 -p1 +# WRS +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 + # Update paths in all man pages for page in client/dhclient.conf.5 client/dhclient.leases.5 \ client/dhclient-script.8 client/dhclient.8 ; do @@ -552,6 +572,10 @@ EOF # Don't package libtool *.la files find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; +# WRS: Overwrite with our config +%{__install} -p -m 0755 %{SOURCE20} %{buildroot}%{dhcpconfdir}/dhclient-exit-hooks +%{__install} -p -m 0644 %{SOURCE21} %{buildroot}%{dhcpconfdir}/dhclient.conf + %pre # /usr/share/doc/setup/uidgid %global gid_uid 177 @@ -667,6 +691,10 @@ done %attr(0644,root,root) %{_mandir}/man8/dhclient.8.gz %attr(0644,root,root) %{_mandir}/man8/dhclient-script.8.gz +# WRS +%{dhcpconfdir}/dhclient-exit-hooks +%{dhcpconfdir}/dhclient.conf + %files common %doc LICENSE README RELNOTES doc/References.txt %attr(0644,root,root) %{_mandir}/man5/dhcp-options.5.gz -- 1.9.1