Merge "Remove NSUPDATE patch for dhcp package"

base/dhcp/centos/meta_patches/PATCH_ORDER

@@ -1,4 +1,3 @@
 spec-include-TiS-patches.patch
 dhclient-dhcp6-set-hostname.patch
 0001-Update-package-versioning-for-TIS-format.patch
-dhclient-disable-NSUPDATE.patch

base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch

@@ -1,48 +0,0 @@
-From a51920cbcd728da7d867a78daf1dc78e5e3d7598 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 15:25:05 -0400
-Subject: WRS: dhclient-disable-NSUPDATE.patch
-
----
- SPECS/dhcp.spec | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
-index fc17edb..b0a385e 100644
---- a/SPECS/dhcp.spec
-+++ b/SPECS/dhcp.spec
-@@ -118,6 +118,7 @@ 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
-+Patch107: dhclient-disable-NSUPDATE.patch        
- 
- BuildRequires: autoconf
- BuildRequires: automake
-@@ -454,6 +455,7 @@ rm -rf includes/isc-dhcp
- %patch104 -p1
- %patch105 -p1
- %patch106 -p1
-+%patch107 -p1
- 
- # Update paths in all man pages
- for page in client/dhclient.conf.5 client/dhclient.leases.5 \
-@@ -475,6 +477,7 @@ done
- #libtoolize --copy --force
- autoreconf --verbose --force --install
- 
-+# WR: failover and tracing need to be disabled in order to disable NSUPDATE
- CFLAGS="%{optflags} -fno-strict-aliasing" \
- %configure \
-     --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \
-@@ -489,6 +492,7 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \
-     --with-ldap \
-     --with-ldapcrypto \
-     --with-libbind=%{_includedir} --with-libbind-libs=%{_libdir} \
-+    --disable-tracing --disable-failover \
-     --disable-static \
- %if %sdt
-     --enable-systemtap \
--- 
-2.7.4
-

base/dhcp/centos/patches/dhclient-disable-NSUPDATE.patch

@@ -1,28 +0,0 @@
-From 4b0c758337d28109ac49f69ac334b4bebf09a0af Mon Sep 17 00:00:00 2001
-From: Hung Pham <hung.pham@windriver.com>
-Date: Mon, 10 Jul 2017 13:15:39 -0400
-Subject: [PATCH 1/1] dhclient-disable-NSUPDATE
-
----
- includes/site.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/includes/site.h b/includes/site.h
-index 8ff2834..f7dde00 100644
---- a/includes/site.h
-+++ b/includes/site.h
-@@ -115,7 +115,10 @@
- 
- /* Define this if you want DNS update functionality to be available. */
- 
--#define NSUPDATE
-+/* WRS: Comment out this define to disable the DDNS feature */
-+/*      TiS doesn't use DDNS, and enabling DDNS will cause dhclient to listen on */
-+/*      an extra port that may collide with MTCE */
-+/* #define NSUPDATE */
- 
- /* Define this if you want the dhcpd.pid file to go somewhere other than
-    the default (which varies from system to system, but is usually either
--- 
-1.8.3.1
-