4 files changed, 6 insertions, 80 deletions

diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile
index 7831f7c43bdd..bff37dda0d9b 100644
--- a/security/krb5-devel/Makefile
+++ b/security/krb5-devel/Makefile
@@ -3,13 +3,12 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.17.${MIT_COMMIT_DATE}
-PORTREVISION=		2
 CATEGORIES=		security
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=		-devel
 .endif
-HASH=			9ef59b4
-MIT_COMMIT_DATE=	2018.05.14
+HASH=			beeb282
+MIT_COMMIT_DATE=	2018.06.18
 
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 PATCH_DIST_STRIP=	-p2
diff --git a/security/krb5-devel/distinfo b/security/krb5-devel/distinfo
index 560803cabf5b..fd2726e607cc 100644
--- a/security/krb5-devel/distinfo
+++ b/security/krb5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526301427
-SHA256 (krb5-krb5-1.17.2018.05.14-9ef59b4_GH0.tar.gz) = 925be698ab541b6f343f1b7e06f4297aff7fda7b5d1d0bbc49387d249fb1a22a
-SIZE (krb5-krb5-1.17.2018.05.14-9ef59b4_GH0.tar.gz) = 6112516
+TIMESTAMP = 1529391436
+SHA256 (krb5-krb5-1.17.2018.06.18-beeb282_GH0.tar.gz) = addb9381f02a9a004d66a0f9b6e3734c71e79dd10b8c9fc3897ee8b3912f0172
+SIZE (krb5-krb5-1.17.2018.06.18-beeb282_GH0.tar.gz) = 5235060
diff --git a/security/krb5-devel/files/patch-include_krb5_krb5.hin b/security/krb5-devel/files/patch-include_krb5_krb5.hin
deleted file mode 100644
index 462dcc14a19e..000000000000
--- a/security/krb5-devel/files/patch-include_krb5_krb5.hin
+++ /dev/null
@@ -1,74 +0,0 @@
---- include/krb5/krb5.hin.orig	2018-05-12 22:15:24.000000000 -0700
-+++ include/krb5/krb5.hin	2018-06-18 23:46:02.119491000 -0700
-@@ -3566,7 +3566,7 @@
-  */
- krb5_error_code KRB5_CALLCONV
- krb5_unparse_name(krb5_context context, krb5_const_principal principal,
--                  register char **name);
-+                  char **name);
- 
- /**
-  * Convert krb5_principal structure to string and length.
-@@ -4389,7 +4389,7 @@
-  */
- krb5_error_code KRB5_CALLCONV_WRONG
- krb5_principal2salt(krb5_context context,
--                    register krb5_const_principal pr, krb5_data *ret);
-+                    krb5_const_principal pr, krb5_data *ret);
- /* librc.spec--see rcache.h */
- 
- /* libcc.spec */
-@@ -4730,7 +4730,7 @@
-  * This function frees the contents of @a val and the structure itself.
-  */
- void KRB5_CALLCONV
--krb5_free_error(krb5_context context, register krb5_error *val);
-+krb5_free_error(krb5_context context, krb5_error *val);
- 
- /**
-  * Free a krb5_creds structure.
-@@ -4763,7 +4763,7 @@
-  * This function frees the contents of @a val and the structure itself.
-  */
- void KRB5_CALLCONV
--krb5_free_checksum(krb5_context context, register krb5_checksum *val);
-+krb5_free_checksum(krb5_context context, krb5_checksum *val);
- 
- /**
-  * Free the contents of a krb5_checksum structure.
-@@ -4774,7 +4774,7 @@
-  * This function frees the contents of @a val, but not the structure itself.
-  */
- void KRB5_CALLCONV
--krb5_free_checksum_contents(krb5_context context, register krb5_checksum *val);
-+krb5_free_checksum_contents(krb5_context context, krb5_checksum *val);
- 
- /**
-  * Free a krb5_keyblock structure.
-@@ -4785,7 +4785,7 @@
-  * This function frees the contents of @a val and the structure itself.
-  */
- void KRB5_CALLCONV
--krb5_free_keyblock(krb5_context context, register krb5_keyblock *val);
-+krb5_free_keyblock(krb5_context context, krb5_keyblock *val);
- 
- /**
-  * Free the contents of a krb5_keyblock structure.
-@@ -4796,7 +4796,7 @@
-  * This function frees the contents of @a key, but not the structure itself.
-  */
- void KRB5_CALLCONV
--krb5_free_keyblock_contents(krb5_context context, register krb5_keyblock *key);
-+krb5_free_keyblock_contents(krb5_context context, krb5_keyblock *key);
- 
- /**
-  * Free a krb5_ap_rep_enc_part structure.
-@@ -4912,7 +4912,7 @@
-  * Kerberos error codes
-  */
- krb5_error_code KRB5_CALLCONV
--krb5_timeofday(krb5_context context, register krb5_timestamp *timeret);
-+krb5_timeofday(krb5_context context, krb5_timestamp *timeret);
- 
- /**
-  * Check if a timestamp is within the allowed clock skew of the current time.
diff --git a/security/krb5-devel/pkg-plist b/security/krb5-devel/pkg-plist
index a484d75162f1..4991bf7c34ab 100644
--- a/security/krb5-devel/pkg-plist
+++ b/security/krb5-devel/pkg-plist
@@ -96,6 +96,7 @@ lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/libkrb5support.so.0.1
 lib/krb5/plugins/kdb/db2.so
+lib/krb5/plugins/kdb/klmdb.so
 lib/krb5/plugins/tls/k5tls.so
 %%LDAP%%lib/krb5/plugins/kdb/kldap.so
 lib/krb5/plugins/preauth/otp.so