--- a/components/krb5/patches/048-dns-fix.patch	Fri Sep 23 11:19:39 2016 -0700
+++ b/components/krb5/patches/048-dns-fix.patch	Mon Sep 26 15:58:55 2016 -0700
@@ -7,7 +7,6 @@
 # feature that this patch is not intended to be contributed upstream.
 # Patch source: in-house
 #
-diff --git a/src/lib/kadm5/unit-test/api.current/init-v2.exp b/src/lib/kadm5/unit-test/api.current/init-v2.exp
 --- a/src/lib/kadm5/unit-test/api.current/init-v2.exp
 +++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp
 @@ -14,7 +14,7 @@ proc get_hostname { } {
@@ -19,7 +18,6 @@
      if ![string match "" $exec_output] {
  	send_log "$exec_output\n"
  	verbose $exec_output
-diff --git a/src/lib/kadm5/unit-test/api.current/init.exp b/src/lib/kadm5/unit-test/api.current/init.exp
 --- a/src/lib/kadm5/unit-test/api.current/init.exp
 +++ b/src/lib/kadm5/unit-test/api.current/init.exp
 @@ -9,6 +9,39 @@ load_lib lib.t
@@ -84,7 +82,6 @@
  }
  
  return ""
-diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
 --- a/src/tests/dejagnu/config/default.exp
 +++ b/src/tests/dejagnu/config/default.exp
 @@ -682,7 +682,7 @@ proc get_hostname { } {
@@ -96,7 +93,6 @@
      envstack_pop
      if ![string match "" $exec_output] {
  	verbose -log $exec_output
-diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
 --- a/src/tests/resolve/Makefile.in
 +++ b/src/tests/resolve/Makefile.in
 @@ -8,7 +8,7 @@ SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
@@ -108,7 +104,6 @@
  
  addrinfo-test: addrinfo-test.o
  	$(CC_LINK) -o $@ addrinfo-test.o $(SUPPORT_LIB) $(LIBS)
-diff --git a/src/tests/resolve/resolve.c b/src/tests/resolve/resolve.c
 --- a/src/tests/resolve/resolve.c
 +++ b/src/tests/resolve/resolve.c
 @@ -73,6 +73,94 @@ char *strchr();