--- a/components/krb5/patches/033-pkinit-pin.patch	Fri Sep 23 11:19:39 2016 -0700
+++ b/components/krb5/patches/033-pkinit-pin.patch	Mon Sep 26 15:58:55 2016 -0700
@@ -9,7 +9,6 @@
 # directly or through a utility library.
 # Patch source: in-house
 #
-diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
 --- a/src/plugins/preauth/pkinit/pkinit.h
 +++ b/src/plugins/preauth/pkinit/pkinit.h
 @@ -27,10 +27,14 @@
@@ -44,7 +43,6 @@
  #endif
  } pkinit_identity_opts;
  
-diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
 --- a/src/plugins/preauth/pkinit/pkinit_clnt.c
 +++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
 @@ -29,6 +29,10 @@
@@ -69,7 +67,6 @@
      }
      return 0;
  }
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
 +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
 @@ -29,6 +29,10 @@
@@ -319,7 +316,6 @@
      /* Convert the ascii cert_id string into a binary blob */
      if (idopts->cert_id_string != NULL) {
          BIGNUM *bn = NULL;
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
 +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
 @@ -28,6 +28,10 @@
@@ -341,7 +337,6 @@
      /* These are crypto-specific */
      void *p11_module;
      CK_SESSION_HANDLE session;
-diff --git a/src/plugins/preauth/pkinit/pkinit_identity.c b/src/plugins/preauth/pkinit/pkinit_identity.c
 --- a/src/plugins/preauth/pkinit/pkinit_identity.c
 +++ b/src/plugins/preauth/pkinit/pkinit_identity.c
 @@ -29,6 +29,10 @@