From dc5bb4b8d45d0f3d5456e21513137e888bdf8900 Mon Sep 17 00:00:00 2001
From: zhipengl <zhipengs.liu@intel.com>
Date: Wed, 5 Dec 2018 20:06:27 +0800
Subject: [PATCH] Remove NSUPDATE patch for dhcp package

After discussion with Eslimi, this patch disables DDNS on dhclient,
as the network port 2105 used by dhclient conflicts with thesame port
used on mtcClient. Now we change the port used by mtcClient from 2105
to 2118, then we can remove this patch.

Deployment test pass.

Story: 2003757
Task: 26445
Depends-on: https://review.openstack.org/#/c/622699/

Change-Id: I295ef87d55c9f5ab573c3906f776fcd6f65e82ff
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
 base/dhcp/centos/meta_patches/PATCH_ORDER     |  1 -
 .../dhclient-disable-NSUPDATE.patch           | 48 -------------------
 .../patches/dhclient-disable-NSUPDATE.patch   | 28 -----------
 3 files changed, 77 deletions(-)
 delete mode 100644 base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
 delete mode 100644 base/dhcp/centos/patches/dhclient-disable-NSUPDATE.patch

diff --git a/base/dhcp/centos/meta_patches/PATCH_ORDER b/base/dhcp/centos/meta_patches/PATCH_ORDER
index a6d71d594..2e6cab52b 100644
--- a/base/dhcp/centos/meta_patches/PATCH_ORDER
+++ b/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
diff --git a/base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch b/base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
deleted file mode 100644
index f397b6798..000000000
--- a/base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
+++ /dev/null
@@ -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
-
diff --git a/base/dhcp/centos/patches/dhclient-disable-NSUPDATE.patch b/base/dhcp/centos/patches/dhclient-disable-NSUPDATE.patch
deleted file mode 100644
index 73764c791..000000000
--- a/base/dhcp/centos/patches/dhclient-disable-NSUPDATE.patch
+++ /dev/null
@@ -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
-