Update to 7.1.0. Changes include:

- hcrypto is now thread safe on all platforms and as much as possible
  hcrypto now uses the operating system's preferred crypto
  implementation ensuring that optimized hardware assisted
  implementations of AES-NI are used.

- RFC 6113 Generalized Framework for Kerberos Pre-Authentication
  (FAST).

- Hierarchical capath support

- iprop has been revamped to fix a number of race conditions that
  could lead to inconsistent replication.

- The KDC process now uses a multi-process model improving resiliency
  and performance.

- AES Encryption with HMAC-SHA2 for Kerberos 5
  draft-ietf-kitten-aes-cts-hmac-sha2-11

- Moved kadmin and ktutil to /usr/bin

- Stricter fcache checks (see fcache_strict_checking krb5.conf setting)

- Removed legacy applications: ftp, kx, login, popper, push, rcp, rsh,
  telnet, xnlock

34 files changed, 1059 insertions, 356 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 90a45e3d9be8..f4d3c7714e8b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	heimdal
-PORTVERSION=	1.5.3
-PORTREVISION=	7
+PORTVERSION=	7.1.0
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -23,7 +22,6 @@ USES=		gettext gssapi:bootstrap,heimdal libtool pathfix pkgconfig \
 		readline makeinfo ssl
 USE_LDCONFIG=	${GSSAPILIBDIR}
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
 		ac_cv_header_db_h=no \
 		ac_cv_header_db3_db_h=no \
@@ -47,6 +45,7 @@ CONFIGURE_ARGS=	--with-libintl \
 		--sysconfdir="${PREFIX}/etc"
 # XXX --with-readline picks up libreadline even if found in /usr/lib.
 MAKE_ENV=	INSTALL_CATPAGES=no
+INSTALL_TARGET=	install-strip
 .if !exists(/etc/rc.d/ipropd_master)
 USE_RC_SUBR=	ipropd_master ipropd_slave
 .endif
@@ -54,7 +53,7 @@ INFO=		heimdal hx509
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	IPV6 BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB X11
+OPTIONS_DEFINE=	IPV6 BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
 OPTIONS_DEFAULT=     BDB             PKINIT DIGEST KX509
 OPTIONS_SUB=	yes
 
@@ -90,11 +89,7 @@ KX509_DESC=		Enable kx509 support
 KX509_CONFIGURE_ENABLE=	kx509
 
 CRACKLIB_DESC=		Use CrackLib for password quality checking
-CRACKLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:security/cracklib
-
-X11_DESC=		Build X11 utilies
-X11_USE=		XORG=x11,xt
-X11_CONFIGURE_WITH=	x
+CRACKLIB_LIB_DEPENDS=	libcrack.so:security/cracklib
 
 .include <bsd.port.options.mk>
 
@@ -109,14 +104,12 @@ post-extract:
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
 	    ${WRKSRC}/kpasswdd-cracklib/Makefile
 
-.if ${PORT_OPTIONS:MCRACKLIB}
-post-build:
+post-build-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET}
 
-post-install:
+post-install-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 676242a8382c..93eac224405c 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (heimdal-1.5.3.tar.gz) = aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5
-SIZE (heimdal-1.5.3.tar.gz) = 6798305
+TIMESTAMP = 1483392507
+SHA256 (heimdal-7.1.0.tar.gz) = cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d
+SIZE (heimdal-7.1.0.tar.gz) = 9925587
diff --git a/security/heimdal/files/patch-admin-Makefile.in b/security/heimdal/files/patch-admin-Makefile.in
new file mode 100644
index 000000000000..d2343478d4a4
--- /dev/null
+++ b/security/heimdal/files/patch-admin-Makefile.in
@@ -0,0 +1,17 @@
+--- admin/Makefile.in.orig	2017-01-03 13:45:05 UTC
++++ admin/Makefile.in
+@@ -156,9 +156,13 @@ dist_ktutil_OBJECTS = add.$(OBJEXT) chan
+ 	rename.$(OBJEXT)
+ nodist_ktutil_OBJECTS = ktutil-commands.$(OBJEXT)
+ ktutil_OBJECTS = $(dist_ktutil_OBJECTS) $(nodist_ktutil_OBJECTS)
+-ktutil_LDADD = $(LDADD)
++ktutil_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ ktutil_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
diff --git a/security/heimdal/files/patch-appl-afsutil-Makefile.in b/security/heimdal/files/patch-appl-afsutil-Makefile.in
new file mode 100644
index 000000000000..528bd79b976e
--- /dev/null
+++ b/security/heimdal/files/patch-appl-afsutil-Makefile.in
@@ -0,0 +1,36 @@
+--- appl/afsutil/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ appl/afsutil/Makefile.in
+@@ -152,13 +152,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ PROGRAMS = $(bin_PROGRAMS)
+ am_afslog_OBJECTS = afslog.$(OBJEXT)
+ afslog_OBJECTS = $(am_afslog_OBJECTS)
+-afslog_LDADD = $(LDADD)
++afslog_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ @NO_AFS_FALSE@am__DEPENDENCIES_2 =  \
+ @NO_AFS_FALSE@	$(top_builddir)/lib/kafs/libkafs.la \
+ @NO_AFS_FALSE@	$(am__DEPENDENCIES_1)
+ afslog_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -167,9 +171,13 @@ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ am_pagsh_OBJECTS = pagsh.$(OBJEXT)
+ pagsh_OBJECTS = $(am_pagsh_OBJECTS)
+-pagsh_LDADD = $(LDADD)
++pagsh_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ pagsh_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
diff --git a/security/heimdal/files/patch-appl-gssmask-Makefile.in b/security/heimdal/files/patch-appl-gssmask-Makefile.in
new file mode 100644
index 000000000000..df672dfe07eb
--- /dev/null
+++ b/security/heimdal/files/patch-appl-gssmask-Makefile.in
@@ -0,0 +1,35 @@
+--- appl/gssmask/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ appl/gssmask/Makefile.in
+@@ -151,9 +151,15 @@ CONFIG_CLEAN_VPATH_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_gssmaestro_OBJECTS = gssmaestro.$(OBJEXT) common.$(OBJEXT)
+ gssmaestro_OBJECTS = $(am_gssmaestro_OBJECTS)
+-gssmaestro_LDADD = $(LDADD)
++gssmaestro_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(top_builddir)/lib/asn1/libasn1.la
+ am__DEPENDENCIES_1 =
+ gssmaestro_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -161,8 +167,14 @@ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ am_gssmask_OBJECTS = gssmask.$(OBJEXT) common.$(OBJEXT)
+ gssmask_OBJECTS = $(am_gssmask_OBJECTS)
+-gssmask_LDADD = $(LDADD)
++gssmask_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(top_builddir)/lib/asn1/libasn1.la
+ gssmask_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
diff --git a/security/heimdal/files/patch-appl-kf-Makefile.in b/security/heimdal/files/patch-appl-kf-Makefile.in
new file mode 100644
index 000000000000..277d9cd3bdb9
--- /dev/null
+++ b/security/heimdal/files/patch-appl-kf-Makefile.in
@@ -0,0 +1,31 @@
+--- appl/kf/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ appl/kf/Makefile.in
+@@ -154,9 +154,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+ am_kf_OBJECTS = kf.$(OBJEXT)
+ kf_OBJECTS = $(am_kf_OBJECTS)
+-kf_LDADD = $(LDADD)
++kf_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kf_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -165,8 +169,12 @@ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ am_kfd_OBJECTS = kfd.$(OBJEXT)
+ kfd_OBJECTS = $(am_kfd_OBJECTS)
+-kfd_LDADD = $(LDADD)
++kfd_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ kfd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
diff --git a/security/heimdal/files/patch-appl-su-Makefile.in b/security/heimdal/files/patch-appl-su-Makefile.in
new file mode 100644
index 000000000000..ba9144d3681e
--- /dev/null
+++ b/security/heimdal/files/patch-appl-su-Makefile.in
@@ -0,0 +1,20 @@
+--- appl/su/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ appl/su/Makefile.in
+@@ -152,12 +152,16 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ PROGRAMS = $(bin_PROGRAMS)
+ am_su_OBJECTS = su.$(OBJEXT)
+ su_OBJECTS = $(am_su_OBJECTS)
+-su_LDADD = $(LDADD)
++su_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ @NO_AFS_FALSE@am__DEPENDENCIES_2 =  \
+ @NO_AFS_FALSE@	$(top_builddir)/lib/kafs/libkafs.la \
+ @NO_AFS_FALSE@	$(am__DEPENDENCIES_1)
+ su_DEPENDENCIES = $(am__DEPENDENCIES_2) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
diff --git a/security/heimdal/files/patch-appl-test-Makefile.in b/security/heimdal/files/patch-appl-test-Makefile.in
new file mode 100644
index 000000000000..81e3bb6b172b
--- /dev/null
+++ b/security/heimdal/files/patch-appl-test-Makefile.in
@@ -0,0 +1,81 @@
+--- appl/test/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ appl/test/Makefile.in
+@@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server
+ 	gss_common.$(OBJEXT) common.$(OBJEXT)
+ gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS)
+ gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_2)
+ am_http_client_OBJECTS = http_client.$(OBJEXT) gss_common.$(OBJEXT) \
+ 	common.$(OBJEXT)
+ http_client_OBJECTS = $(am_http_client_OBJECTS)
+ http_client_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_2)
+ am_nt_gss_client_OBJECTS = nt_gss_client.$(OBJEXT) \
+ 	nt_gss_common.$(OBJEXT) common.$(OBJEXT)
+@@ -187,26 +191,42 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_
+ nt_gss_server_DEPENDENCIES = $(am__DEPENDENCIES_4)
+ am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT)
+ tcp_client_OBJECTS = $(am_tcp_client_OBJECTS)
+-tcp_client_LDADD = $(LDADD)
++tcp_client_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ tcp_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ am_tcp_server_OBJECTS = tcp_server.$(OBJEXT) common.$(OBJEXT)
+ tcp_server_OBJECTS = $(am_tcp_server_OBJECTS)
+-tcp_server_LDADD = $(LDADD)
++tcp_server_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ tcp_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ am_uu_client_OBJECTS = uu_client.$(OBJEXT) common.$(OBJEXT)
+ uu_client_OBJECTS = $(am_uu_client_OBJECTS)
+-uu_client_LDADD = $(LDADD)
++uu_client_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ uu_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ am_uu_server_OBJECTS = uu_server.$(OBJEXT) common.$(OBJEXT)
+ uu_server_OBJECTS = $(am_uu_server_OBJECTS)
+-uu_server_LDADD = $(LDADD)
++uu_server_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ uu_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -545,9 +565,13 @@ http_client_SOURCES = http_client.c gss_
+ 
+ uu_server_SOURCES = uu_server.c common.c test_locl.h
+ uu_client_SOURCES = uu_client.c common.c test_locl.h
+-gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
++gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ gssapi_client_LDADD = $(gssapi_server_LDADD)
+-http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
++http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ nt_gss_client_SOURCES = nt_gss_client.c nt_gss_common.c nt_gss_common.h common.c
+ nt_gss_server_SOURCES = nt_gss_server.c nt_gss_common.c nt_gss_common.h
+ nt_gss_client_LDADD = $(gssapi_server_LDADD)
diff --git a/security/heimdal/files/patch-configure b/security/heimdal/files/patch-configure
index 49b1668ed158..308c4a2146c2 100644
--- a/security/heimdal/files/patch-configure
+++ b/security/heimdal/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-12-10 07:09:32.000000000 +0900
-+++ configure	2016-11-13 03:23:46.814899000 +0900
-@@ -8869,7 +8869,7 @@
+--- configure.orig	2016-12-20 04:24:03 UTC
++++ configure
+@@ -9588,7 +9588,7 @@ $as_echo_n "checking whether the $compil
    hardcode_minus_L=no
    hardcode_shlibpath_var=unsupported
    inherit_rpath=no
@@ -9,110 +9,21 @@
    module_cmds=
    module_expsym_cmds=
    old_archive_from_new_cmds=
-@@ -9567,29 +9567,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
--    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--    # support.  Future versions do this automatically, but an explicit c++rt0.o
--    # does not break anything, and helps significantly (at the cost of a little
--    # extra space).
--    freebsd2.2*)
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec='-R$libdir'
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
--
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct=yes
--      hardcode_minus_L=yes
--      hardcode_shlibpath_var=no
--      ;;
--
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
-       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10561,10 +10538,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -10572,7 +10545,6 @@
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -10590,18 +10562,6 @@
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
--  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
-   *) # from 4.6 on, and DragonFly
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-@@ -11661,7 +11621,7 @@
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -14227,9 +14187,9 @@
- 	native_pthread_support="netbsd 3 uses explict pthread"
- 		PTHREAD_LIBADD="-lpthread"
- 	;;
--*-*-freebsd[56789]*)
-+*-*-freebsd*)
+@@ -16126,7 +16126,7 @@ case "$host" in
+     ;;
+ *-*-freebsd*)
  	native_pthread_support=yes
 -	PTHREAD_LIBADD="-pthread"
 +	PTHREAD_LIBADD="-lpthread"
  	;;
  *-*-openbsd*)
  	native_pthread_support=yes
-@@ -14488,7 +14448,7 @@
- fi
- # db_create
- eval "ac_tr_func=HAVE_`echo db_create | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
--eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//;s/[-.]/_/g' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
- eval "LIB_db_create=$ac_res"
- 
- case "$ac_res" in
-@@ -28245,7 +28205,7 @@
+@@ -28685,7 +28685,7 @@ fi
  
  krb_cv_compile_et="no"
  krb_cv_com_err_need_r=""
 -krb_cv_compile_et_cross=no
 +krb_cv_compile_et_cross=yes
- if test "${COMPILE_ET}" = "compile_et"; then
+ if test "${COMPILE_ET}" != "no"; then
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5
diff --git a/security/heimdal/files/patch-doc-hx509.texi b/security/heimdal/files/patch-doc-hx509.texi
deleted file mode 100644
index 1a82a81b4fb6..000000000000
--- a/security/heimdal/files/patch-doc-hx509.texi
+++ /dev/null
@@ -1,36 +0,0 @@
---- doc/hx509.texi.orig	2014-09-13 17:49:23.000000000 +0900
-+++ doc/hx509.texi	2014-09-13 17:50:20.000000000 +0900
-@@ -34,9 +34,19 @@
- @subtitle 2008
- @author Love Hörnquist Åstrand
- 
-+@iftex
- @def@copynext{@vskip 20pt plus 1fil}
- @def@copyrightstart{}
- @def@copyrightend{}
-+@end iftex
-+@ifinfo
-+@macro copynext
-+@end macro
-+@macro copyrightstart
-+@end macro
-+@macro copyrightend
-+@end macro
-+@end ifinfo
- @page
- @copyrightstart
- Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
-@@ -183,6 +193,13 @@
- * CMS signing and encryption::
- * Certificate matching::
- * Software PKCS 11 module::
-+* Creating a CA certificate::
-+* Issuing certificates::
-+* Issuing CRLs::
-+* Application requirements::
-+* CMS background::
-+* Matching syntax::
-+* How to use the PKCS11 module::
- 
- @detailmenu
-  --- The Detailed Node Listing ---
diff --git a/security/heimdal/files/patch-doc-whatis.texi b/security/heimdal/files/patch-doc-whatis.texi
deleted file mode 100644
index d5a94513e4c9..000000000000
--- a/security/heimdal/files/patch-doc-whatis.texi
+++ /dev/null
@@ -1,18 +0,0 @@
---- doc/whatis.texi.orig	2014-09-13 16:40:50.000000000 +0900
-+++ doc/whatis.texi	2014-09-13 16:41:45.000000000 +0900
-@@ -35,10 +35,11 @@
- @end macro
- @end ifinfo
- 
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
- 
- @ifhtml
- @macro sub{arg}
diff --git a/security/heimdal/files/patch-doc__Makefile.in b/security/heimdal/files/patch-doc__Makefile.in
index 602ba8523413..d9b67a9866bc 100644
--- a/security/heimdal/files/patch-doc__Makefile.in
+++ b/security/heimdal/files/patch-doc__Makefile.in
@@ -1,31 +1,31 @@
---- doc/Makefile.in.orig	2013-03-26 23:18:01.813922381 +1030
-+++ doc/Makefile.in	2013-03-26 23:19:41.535922356 +1030
-@@ -386,7 +380,7 @@
- texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \
+--- doc/Makefile.in.orig	2017-01-03 13:44:59 UTC
++++ doc/Makefile.in
+@@ -501,7 +501,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc
+ 	-e 's,[@]dbtype[@],$(db_type),g' \
  	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
  
--PROJECTS = hcrypto hdb hx509 gssapi krb5 ntlm wind 
-+PROJECTS = hdb hx509 gssapi krb5 ntlm wind 
+-PROJECTS = base hdb hx509 gssapi krb5 ntlm wind hcrypto
++PROJECTS = base hdb hx509 gssapi krb5 ntlm wind
  heimdal_TEXINFOS = \
  	ack.texi \
  	apps.texi \
-@@ -409,7 +403,6 @@
+@@ -524,7 +524,6 @@ EXTRA_DIST = \
  	footer.html \
  	gssapi.din \
  	hdb.din \
 -	hcrypto.din \
  	header.html \
  	heimdal.css \
- 	hx509.din \
-@@ -423,7 +416,6 @@
+ 	base.din \
+@@ -542,7 +541,6 @@ EXTRA_DIST = \
  	vars.tin
  
  CLEANFILES = \
 -	hcrypto.dxy* \
+ 	base.dxy* \
  	hx509.dxy* \
  	hdb.dxy* \
- 	gssapi.dxy* \
-@@ -1040,11 +1032,6 @@
+@@ -1199,11 +1197,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
  	  fi ; \
  	done
  
@@ -37,12 +37,12 @@
  hdb.dxy: hdb.din Makefile
  	$(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp
  	chmod +x hdb.dxy.tmp
-@@ -1080,7 +1067,7 @@
+@@ -1244,7 +1237,7 @@ vars.texi: vars.tin Makefile
  	chmod +x vars.texi.tmp
  	mv vars.texi.tmp vars.texi
  
--doxyout doxygen: hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
-+doxyout doxygen: hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
+-doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
++doxyout doxygen: base.dxy hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
  	@find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \
  	rm -rf $(srcdir)/doxyout ; \
  	mkdir $(srcdir)/doxyout ; \
diff --git a/security/heimdal/files/patch-kadmin-Makefile.in b/security/heimdal/files/patch-kadmin-Makefile.in
new file mode 100644
index 000000000000..caf1bdf1288b
--- /dev/null
+++ b/security/heimdal/files/patch-kadmin-Makefile.in
@@ -0,0 +1,56 @@
+--- kadmin/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ kadmin/Makefile.in
+@@ -166,6 +166,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ add_random_users_DEPENDENCIES =  \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la $(am__DEPENDENCIES_2) \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -181,6 +183,8 @@ dist_kadmin_OBJECTS = ank.$(OBJEXT) add_
+ nodist_kadmin_OBJECTS = kadmin-commands.$(OBJEXT)
+ kadmin_OBJECTS = $(dist_kadmin_OBJECTS) $(nodist_kadmin_OBJECTS)
+ kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+@@ -188,6 +192,8 @@ am_kadmind_OBJECTS = rpc.$(OBJEXT) serve
+ 	kadm_conn.$(OBJEXT)
+ kadmind_OBJECTS = $(am_kadmind_OBJECTS)
+ kadmind_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	../lib/gssapi/libgssapi.la $(am__DEPENDENCIES_2) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_test_util_OBJECTS = test_util.$(OBJEXT) util.$(OBJEXT)
+@@ -770,6 +776,8 @@ LDADD_common = \
+ 
+ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	../lib/gssapi/libgssapi.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LDADD_common) \
+ 	$(LIB_pidfile) \
+ 	$(LIB_dlopen)
+@@ -777,6 +785,8 @@ kadmind_LDADD = $(top_builddir)/lib/kadm
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/sl/libsl.la \
+ 	$(LIB_readline) \
+ 	$(LDADD_common) \
+@@ -785,6 +795,8 @@ kadmin_LDADD = \
+ add_random_users_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
diff --git a/security/heimdal/files/patch-kcm-Makefile.in b/security/heimdal/files/patch-kcm-Makefile.in
new file mode 100644
index 000000000000..20cc44579cbb
--- /dev/null
+++ b/security/heimdal/files/patch-kcm-Makefile.in
@@ -0,0 +1,16 @@
+--- kcm/Makefile.in.orig	2017-01-03 13:45:00 UTC
++++ kcm/Makefile.in
+@@ -157,10 +157,12 @@ am_kcm_OBJECTS = acl.$(OBJEXT) acquire.$
+ 	events.$(OBJEXT) glue.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
+ 	protocol.$(OBJEXT) sessions.$(OBJEXT) renew.$(OBJEXT)
+ kcm_OBJECTS = $(am_kcm_OBJECTS)
+-kcm_LDADD = $(LDADD)
++kcm_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kcm_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la \
+ 	$(top_builddir)/lib/ipc/libheim-ipcs.la $(am__DEPENDENCIES_1) \
diff --git a/security/heimdal/files/patch-kcm__cache.c b/security/heimdal/files/patch-kcm__cache.c
deleted file mode 100644
index 21f1d259dedb..000000000000
--- a/security/heimdal/files/patch-kcm__cache.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcm/cache.c.orig	2013-03-28 14:22:47.807924196 +1030
-+++ kcm/cache.c	2013-03-28 14:23:09.600166386 +1030
-@@ -102,7 +102,7 @@
-     for (p = ccache_head; p != NULL; p = p->next) {
- 	if ((p->flags & KCM_FLAGS_VALID) == 0)
- 	    continue;
--	if (memcmp(p->uuid, uuid, sizeof(uuid)) == 0) {
-+	if (memcmp(p->uuid, uuid, sizeof(kcmuuid_t)) == 0) {
- 	    ret = 0;
- 	    break;
- 	}
diff --git a/security/heimdal/files/patch-kdc-Makefile.in b/security/heimdal/files/patch-kdc-Makefile.in
new file mode 100644
index 000000000000..bbf0139d99fe
--- /dev/null
+++ b/security/heimdal/files/patch-kdc-Makefile.in
@@ -0,0 +1,122 @@
+--- kdc/Makefile.in.orig	2017-01-03 13:45:00 UTC
++++ kdc/Makefile.in
+@@ -213,6 +213,8 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO
+ am_digest_service_OBJECTS = digest-service.$(OBJEXT)
+ digest_service_OBJECTS = $(am_digest_service_OBJECTS)
+ am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -224,6 +226,8 @@ digest_service_DEPENDENCIES = libkdc.la 
+ am_hprop_OBJECTS = hprop.$(OBJEXT) mit_dump.$(OBJEXT)
+ hprop_OBJECTS = $(am_hprop_OBJECTS)
+ hprop_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -232,6 +236,8 @@ hprop_DEPENDENCIES = $(top_builddir)/lib
+ am_hpropd_OBJECTS = hpropd.$(OBJEXT)
+ hpropd_OBJECTS = $(am_hpropd_OBJECTS)
+ hpropd_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -241,6 +247,8 @@ am_kdc_OBJECTS = kdc-connect.$(OBJEXT) k
+ 	kdc-announce.$(OBJEXT) kdc-main.$(OBJEXT)
+ kdc_OBJECTS = $(am_kdc_OBJECTS)
+ kdc_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ kdc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(kdc_CFLAGS) $(CFLAGS) \
+@@ -248,23 +256,35 @@ kdc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=C
+ kdc_replay_SOURCES = kdc-replay.c
+ kdc_replay_OBJECTS = kdc-replay.$(OBJEXT)
+ kdc_replay_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ am_kdc_tester_OBJECTS = config.$(OBJEXT) kdc-tester.$(OBJEXT)
+ kdc_tester_OBJECTS = $(am_kdc_tester_OBJECTS)
+ kdc_tester_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(LIB_heimbase)
+ am_kstash_OBJECTS = kstash.$(OBJEXT)
+ kstash_OBJECTS = $(am_kstash_OBJECTS)
+-kstash_LDADD = $(LDADD)
++kstash_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ kstash_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_string2key_OBJECTS = string2key.$(OBJEXT)
+ string2key_OBJECTS = $(am_string2key_OBJECTS)
+-string2key_LDADD = $(LDADD)
++string2key_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ string2key_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -636,6 +656,8 @@ libkdc_la_LDFLAGS = -version-info 2:0:0 
+ hprop_LDADD = \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LIB_kdb)  \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+@@ -645,6 +667,8 @@ hprop_LDADD = \
+ hpropd_LDADD = \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LIB_kdb)  \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+@@ -671,17 +695,24 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.l
+ 	$(LIB_roken) \
+ 	$(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB)
+ 
+-kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS)
++kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ @FRAMEWORK_SECURITY_TRUE@kdc_LDFLAGS = -framework SystemConfiguration -framework CoreFoundation
+ kdc_CFLAGS = $(CAPNG_CFLAGS)
+ digest_service_LDADD = \
+ 	libkdc.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la \
+ 	$(top_builddir)/lib/ipc/libheim-ipcs.la \
+ 	$(LDADD) $(LIB_pidfile)
+ 
+-kdc_replay_LDADD = libkdc.la $(LDADD) $(LIB_pidfile)
+-kdc_tester_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase)
++kdc_replay_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
++kdc_tester_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ include_HEADERS = kdc.h $(srcdir)/kdc-protos.h
+ noinst_HEADERS = $(srcdir)/kdc-private.h
+ krb5dir = $(includedir)/krb5
diff --git a/security/heimdal/files/patch-kpasswd-Makefile.in b/security/heimdal/files/patch-kpasswd-Makefile.in
new file mode 100644
index 000000000000..291412705069
--- /dev/null
+++ b/security/heimdal/files/patch-kpasswd-Makefile.in
@@ -0,0 +1,49 @@
+--- kpasswd/Makefile.in.orig	2017-01-03 13:45:01 UTC
++++ kpasswd/Makefile.in
+@@ -155,9 +155,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ am_kpasswd_OBJECTS = kpasswd.$(OBJEXT)
+ kpasswd_OBJECTS = $(am_kpasswd_OBJECTS)
+-kpasswd_LDADD = $(LDADD)
++kpasswd_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kpasswd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -166,8 +170,12 @@ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ kpasswd_generator_SOURCES = kpasswd-generator.c
+ kpasswd_generator_OBJECTS = kpasswd-generator.$(OBJEXT)
+-kpasswd_generator_LDADD = $(LDADD)
++kpasswd_generator_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ kpasswd_generator_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ am_kpasswdd_OBJECTS = kpasswdd.$(OBJEXT)
+@@ -176,6 +184,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ kpasswdd_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_2) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -532,6 +542,8 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_lo
+ kpasswdd_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LDADD) \
+ 	$(LIB_pidfile) \
+ 	$(LIB_dlopen) \
diff --git a/security/heimdal/files/patch-kuser-Makefile.in b/security/heimdal/files/patch-kuser-Makefile.in
new file mode 100644
index 000000000000..d48980c3043f
--- /dev/null
+++ b/security/heimdal/files/patch-kuser-Makefile.in
@@ -0,0 +1,92 @@
+--- kuser/Makefile.in.orig	2017-01-03 13:45:00 UTC
++++ kuser/Makefile.in
+@@ -157,9 +157,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ generate_requests_SOURCES = generate-requests.c
+ generate_requests_OBJECTS = generate-requests.$(OBJEXT)
+-generate_requests_LDADD = $(LDADD)
++generate_requests_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ generate_requests_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -184,8 +188,12 @@ heimtools_DEPENDENCIES = $(top_builddir)
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1)
+ kdecode_ticket_SOURCES = kdecode_ticket.c
+ kdecode_ticket_OBJECTS = kdecode_ticket.$(OBJEXT)
+-kdecode_ticket_LDADD = $(LDADD)
++kdecode_ticket_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ kdecode_ticket_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ kdestroy_SOURCES = kdestroy.c
+@@ -195,13 +203,20 @@ dist_kdigest_OBJECTS = kdigest.$(OBJEXT)
+ nodist_kdigest_OBJECTS = kdigest-commands.$(OBJEXT)
+ kdigest_OBJECTS = $(dist_kdigest_OBJECTS) $(nodist_kdigest_OBJECTS)
+ kdigest_DEPENDENCIES = $(top_builddir)/lib/ntlm/libheimntlm.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1)
+ kgetcred_SOURCES = kgetcred.c
+ kgetcred_OBJECTS = kgetcred.$(OBJEXT)
+-kgetcred_LDADD = $(LDADD)
++kgetcred_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_libintl)
+ kgetcred_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ kimpersonate_SOURCES = kimpersonate.c
+@@ -211,13 +226,19 @@ kinit_SOURCES = kinit.c
+ kinit_OBJECTS = kinit.$(OBJEXT)
+ kinit_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ kverify_SOURCES = kverify.c
+ kverify_OBJECTS = kverify.$(OBJEXT)
+-kverify_LDADD = $(LDADD)
++kverify_LDADD = $(LDADD) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ kverify_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -583,6 +604,8 @@ man_MANS = \
+ 
+ kinit_LDADD = \
+ 	$(afs_lib) \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la \
+ 	$(LIB_hcrypto) \
+@@ -604,6 +627,8 @@ nodist_kdigest_SOURCES = kdigest-command
+ kdigest_LDADD = \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/sl/libsl.la \
diff --git a/security/heimdal/files/patch-lib-base-Makefile.in b/security/heimdal/files/patch-lib-base-Makefile.in
new file mode 100644
index 000000000000..ee74c4eb5303
--- /dev/null
+++ b/security/heimdal/files/patch-lib-base-Makefile.in
@@ -0,0 +1,11 @@
+--- lib/base/Makefile.in.orig	2017-01-03 13:45:02 UTC
++++ lib/base/Makefile.in
+@@ -705,7 +705,7 @@ heim_verbose_0 = @echo "  GEN    "$@;
+ IMPLEMENT_TLS = $(am__append_1)
+ lib_LTLIBRARIES = libheimbase.la
+ libheimbase_la_LDFLAGS = -version-info 1:0:0 $(am__append_3)
+-libheimbase_la_LIBADD = $(PTHREAD_LIBADD)
++libheimbase_la_LIBADD = $(PTHREAD_LIBADD) $(LIB_libintl)
+ include_HEADERS = heimbase.h
+ dist_libheimbase_la_SOURCES = \
+ 	array.c			\
diff --git a/security/heimdal/files/patch-lib-com_err-Makefile.in b/security/heimdal/files/patch-lib-com_err-Makefile.in
deleted file mode 100644
index 2d1e67f5f3fc..000000000000
--- a/security/heimdal/files/patch-lib-com_err-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/com_err/Makefile.in.orig	2014-08-31 01:54:15.000000000 +0900
-+++ lib/com_err/Makefile.in	2014-08-31 01:58:56.000000000 +0900
-@@ -802,7 +802,7 @@
- 
- install-dvi-am:
- 
--install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-html: install-html-am
diff --git a/security/heimdal/files/patch-lib-gssapi-Makefile.in b/security/heimdal/files/patch-lib-gssapi-Makefile.in
new file mode 100644
index 000000000000..590b87e16579
--- /dev/null
+++ b/security/heimdal/files/patch-lib-gssapi-Makefile.in
@@ -0,0 +1,92 @@
+--- lib/gssapi/Makefile.in.orig	2017-01-03 13:45:04 UTC
++++ lib/gssapi/Makefile.in
+@@ -304,8 +304,14 @@ test_acquire_cred_DEPENDENCIES = libgssa
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_add_store_cred_OBJECTS = test_add_store_cred.$(OBJEXT)
+ test_add_store_cred_OBJECTS = $(am_test_add_store_cred_OBJECTS)
+-test_add_store_cred_LDADD = $(LDADD)
++test_add_store_cred_LDADD = $(LDADD) \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase)
+ test_add_store_cred_DEPENDENCIES = libgssapi.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_cfx_OBJECTS = krb5/test_cfx.$(OBJEXT)
+ test_cfx_OBJECTS = $(am_test_cfx_OBJECTS)
+@@ -314,18 +320,38 @@ test_cfx_DEPENDENCIES = libgssapi.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_context_OBJECTS = test_context.$(OBJEXT) test_common.$(OBJEXT)
+ test_context_OBJECTS = $(am_test_context_OBJECTS)
+-test_context_LDADD = $(LDADD)
++test_context_LDADD = $(LDADD) \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase)
++test_cred_DEPENDENCIES = libgssapi.la \
+ test_context_DEPENDENCIES = libgssapi.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase)
++test_cred_DEPENDENCIES = libgssapi.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_cred_SOURCES = test_cred.c
+ test_cred_OBJECTS = test_cred.$(OBJEXT)
+-test_cred_LDADD = $(LDADD)
++test_cred_LDADD = $(LDADD) \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase)
+ test_cred_DEPENDENCIES = libgssapi.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_kcred_SOURCES = test_kcred.c
+ test_kcred_OBJECTS = test_kcred.$(OBJEXT)
+-test_kcred_LDADD = $(LDADD)
++test_kcred_LDADD = $(LDADD) \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase)
+ test_kcred_DEPENDENCIES = libgssapi.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_names_SOURCES = test_names.c
+ test_names_OBJECTS = test_names.$(OBJEXT)
+@@ -337,8 +363,10 @@ test_ntlm_OBJECTS = $(am_test_ntlm_OBJEC
+ am__DEPENDENCIES_2 = libgssapi.la $(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(am__DEPENDENCIES_1)
+ test_ntlm_DEPENDENCIES = $(top_builddir)/lib/ntlm/libheimntlm.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(am__DEPENDENCIES_2)
+-test_oid_SOURCES = test_oid.c
+ test_oid_OBJECTS = test_oid.$(OBJEXT)
+ test_oid_LDADD = $(LDADD)
+ test_oid_DEPENDENCIES = libgssapi.la \
+@@ -1103,6 +1131,9 @@ test_acquire_cred_SOURCES = test_acquire
+ test_add_store_cred_SOURCES = test_add_store_cred.c
+ test_ntlm_LDADD = \
+ 	$(top_builddir)/lib/ntlm/libheimntlm.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(LDADD)
+ 
+ LDADD = libgssapi.la \
+@@ -1116,6 +1147,9 @@ nodist_gsstool_SOURCES = gss-commands.c 
+ gsstool_LDADD = libgssapi.la \
+ 	$(top_builddir)/lib/sl/libsl.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
++	$(LIB_heimbase) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+ 
diff --git a/security/heimdal/files/patch-lib-hdb-Makefile.in b/security/heimdal/files/patch-lib-hdb-Makefile.in
index 3b32d92794f7..8880d9386c2c 100644
--- a/security/heimdal/files/patch-lib-hdb-Makefile.in
+++ b/security/heimdal/files/patch-lib-hdb-Makefile.in
@@ -1,6 +1,57 @@
---- lib/hdb/Makefile.in.orig	2014-08-31 01:38:01.000000000 +0900
-+++ lib/hdb/Makefile.in	2014-08-31 01:44:03.000000000 +0900
-@@ -451,7 +451,8 @@
+--- lib/hdb/Makefile.in.orig	2017-01-03 13:45:03 UTC
++++ lib/hdb/Makefile.in
+@@ -225,26 +225,46 @@ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) -
+ PROGRAMS = $(noinst_PROGRAMS)
+ test_dbinfo_SOURCES = test_dbinfo.c
+ test_dbinfo_OBJECTS = test_dbinfo.$(OBJEXT)
+-test_dbinfo_LDADD = $(LDADD)
++test_dbinfo_LDADD = $(LDADD) \
++	../asn1/libasn1.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_dbinfo_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ test_hdbkeys_SOURCES = test_hdbkeys.c
+ test_hdbkeys_OBJECTS = test_hdbkeys.$(OBJEXT)
+-test_hdbkeys_LDADD = $(LDADD)
++test_hdbkeys_LDADD = $(LDADD) \
++	../asn1/libasn1.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_hdbkeys_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ test_hdbplugin_SOURCES = test_hdbplugin.c
+ test_hdbplugin_OBJECTS = test_hdbplugin.$(OBJEXT)
+-test_hdbplugin_LDADD = $(LDADD)
++test_hdbplugin_LDADD = $(LDADD) \
++	../asn1/libasn1.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_hdbplugin_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ test_mkey_SOURCES = test_mkey.c
+ test_mkey_OBJECTS = test_mkey.$(OBJEXT)
+-test_mkey_LDADD = $(LDADD)
++test_mkey_LDADD = $(LDADD) \
++	../asn1/libasn1.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_mkey_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -574,7 +594,8 @@ heim_verbose_0 = @echo "  GEN    "$@;
  BUILT_SOURCES = \
  	$(gen_files_hdb:.x=.c)	\
  	hdb_err.c \
diff --git a/security/heimdal/files/patch-lib-hx509-Makefile.in b/security/heimdal/files/patch-lib-hx509-Makefile.in
new file mode 100644
index 000000000000..7a37252af57c
--- /dev/null
+++ b/security/heimdal/files/patch-lib-hx509-Makefile.in
@@ -0,0 +1,13 @@
+--- lib/hx509/Makefile.in.orig	2017-01-03 13:45:03 UTC
++++ lib/hx509/Makefile.in
+@@ -859,7 +859,9 @@ hxtool_LDADD = \
+ 	libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_hcrypto) \
+-	$(LIB_roken) \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/vers/libvers.la \
++	$(LIBADD_roken) \
+ 	$(top_builddir)/lib/sl/libsl.la
+ 
+ CLEANFILES = $(BUILT_SOURCES) sel-gram.c sel-lex.c \
diff --git a/security/heimdal/files/patch-lib-kadm5-Makefile.in b/security/heimdal/files/patch-lib-kadm5-Makefile.in
new file mode 100644
index 000000000000..226ccb92a011
--- /dev/null
+++ b/security/heimdal/files/patch-lib-kadm5-Makefile.in
@@ -0,0 +1,68 @@
+--- lib/kadm5/Makefile.in.orig	2017-01-03 13:45:02 UTC
++++ lib/kadm5/Makefile.in
+@@ -253,6 +253,8 @@ iprop_log_OBJECTS = $(dist_iprop_log_OBJ
+ iprop_log_DEPENDENCIES = libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -262,10 +264,14 @@ iprop_log_DEPENDENCIES = libkadm5srv.la 
+ am_ipropd_master_OBJECTS = ipropd_master.$(OBJEXT) \
+ 	ipropd_common.$(OBJEXT)
+ ipropd_master_OBJECTS = $(am_ipropd_master_OBJECTS)
+-ipropd_master_LDADD = $(LDADD)
++ipropd_master_LDADD = $(LDADD) \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ ipropd_master_DEPENDENCIES = libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -274,10 +280,14 @@ ipropd_master_DEPENDENCIES = libkadm5srv
+ am_ipropd_slave_OBJECTS = ipropd_slave.$(OBJEXT) \
+ 	ipropd_common.$(OBJEXT)
+ ipropd_slave_OBJECTS = $(am_ipropd_slave_OBJECTS)
+-ipropd_slave_LDADD = $(LDADD)
++ipropd_slave_LDADD = $(LDADD) \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ ipropd_slave_DEPENDENCIES = libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -285,10 +295,14 @@ ipropd_slave_DEPENDENCIES = libkadm5srv.
+ 	$(am__DEPENDENCIES_1)
+ test_pw_quality_SOURCES = test_pw_quality.c
+ test_pw_quality_OBJECTS = test_pw_quality.$(OBJEXT)
+-test_pw_quality_LDADD = $(LDADD)
++test_pw_quality_LDADD = $(LDADD) \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_pw_quality_DEPENDENCIES = libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -730,6 +744,8 @@ LDADD = \
+ 
+ iprop_log_LDADD = \
+ 	libkadm5srv.la \
++	$(top_builddir)/lib/base/libheimbase.la \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
diff --git a/security/heimdal/files/patch-lib-krb5-Makefile.in b/security/heimdal/files/patch-lib-krb5-Makefile.in
new file mode 100644
index 000000000000..baae3317a4f5
--- /dev/null
+++ b/security/heimdal/files/patch-lib-krb5-Makefile.in
@@ -0,0 +1,124 @@
+--- lib/krb5/Makefile.in.orig	2017-01-03 13:45:04 UTC
++++ lib/krb5/Makefile.in
+@@ -330,10 +330,12 @@ derived_key_test_DEPENDENCIES = libkrb5.
+ 	$(am__DEPENDENCIES_1)
+ krbhst_test_SOURCES = krbhst-test.c
+ krbhst_test_OBJECTS = krbhst-test.$(OBJEXT)
+-krbhst_test_LDADD = $(LDADD)
++krbhst_test_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ krbhst_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ n_fold_test_SOURCES = n-fold-test.c
+ n_fold_test_OBJECTS = n-fold-test.$(OBJEXT)
+@@ -386,10 +388,12 @@ test_addr_DEPENDENCIES = libkrb5.la $(am
+ 	$(am__DEPENDENCIES_1)
+ test_alname_SOURCES = test_alname.c
+ test_alname_OBJECTS = test_alname.$(OBJEXT)
+-test_alname_LDADD = $(LDADD)
++test_alname_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_alname_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_ap_req_SOURCES = test_ap-req.c
+ test_ap_req_OBJECTS = test_ap-req.$(OBJEXT)
+@@ -421,10 +425,12 @@ test_config_DEPENDENCIES = libkrb5.la $(
+ 	$(am__DEPENDENCIES_1)
+ test_crypto_SOURCES = test_crypto.c
+ test_crypto_OBJECTS = test_crypto.$(OBJEXT)
+-test_crypto_LDADD = $(LDADD)
++test_crypto_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_crypto_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_crypto_wrapping_SOURCES = test_crypto_wrapping.c
+ test_crypto_wrapping_OBJECTS = test_crypto_wrapping.$(OBJEXT)
+@@ -442,10 +448,12 @@ test_expand_toks_DEPENDENCIES = libkrb5.
+ 	$(am__DEPENDENCIES_1)
+ test_forward_SOURCES = test_forward.c
+ test_forward_OBJECTS = test_forward.$(OBJEXT)
+-test_forward_LDADD = $(LDADD)
++test_forward_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_forward_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_fx_SOURCES = test_fx.c
+ test_fx_OBJECTS = test_fx.$(OBJEXT)
+@@ -456,17 +464,21 @@ test_fx_DEPENDENCIES = libkrb5.la $(am__
+ 	$(am__DEPENDENCIES_1)
+ test_get_addrs_SOURCES = test_get_addrs.c
+ test_get_addrs_OBJECTS = test_get_addrs.$(OBJEXT)
+-test_get_addrs_LDADD = $(LDADD)
++test_get_addrs_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_get_addrs_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_gic_SOURCES = test_gic.c
+ test_gic_OBJECTS = test_gic.$(OBJEXT)
+-test_gic_LDADD = $(LDADD)
++test_gic_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_gic_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_hostname_SOURCES = test_hostname.c
+ test_hostname_OBJECTS = test_hostname.$(OBJEXT)
+@@ -484,10 +496,12 @@ test_keytab_DEPENDENCIES = libkrb5.la $(
+ 	$(am__DEPENDENCIES_1)
+ test_kuserok_SOURCES = test_kuserok.c
+ test_kuserok_OBJECTS = test_kuserok.$(OBJEXT)
+-test_kuserok_LDADD = $(LDADD)
++test_kuserok_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_kuserok_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_mem_SOURCES = test_mem.c
+ test_mem_OBJECTS = test_mem.$(OBJEXT)
+@@ -540,10 +554,12 @@ test_princ_DEPENDENCIES = libkrb5.la $(a
+ 	$(am__DEPENDENCIES_1)
+ test_renew_SOURCES = test_renew.c
+ test_renew_OBJECTS = test_renew.$(OBJEXT)
+-test_renew_LDADD = $(LDADD)
++test_renew_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ test_renew_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ test_rfc3961_SOURCES = test_rfc3961.c
+ test_rfc3961_OBJECTS = test_rfc3961.$(OBJEXT)
+@@ -581,10 +597,12 @@ test_x500_DEPENDENCIES = libkrb5.la $(am
+ 	$(am__DEPENDENCIES_1)
+ verify_krb5_conf_SOURCES = verify_krb5_conf.c
+ verify_krb5_conf_OBJECTS = verify_krb5_conf.$(OBJEXT)
+-verify_krb5_conf_LDADD = $(LDADD)
++verify_krb5_conf_LDADD = $(LDADD) \
++	$(top_builddir)/lib/hx509/libhx509.la
+ verify_krb5_conf_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(top_builddir)/lib/wind/libwind.la $(LIB_heimbase) \
++	$(top_builddir)/lib/hx509/libhx509.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
diff --git a/security/heimdal/files/patch-lib-roken-Makefile.in b/security/heimdal/files/patch-lib-roken-Makefile.in
index 823a45631105..4b43e134c98c 100644
--- a/security/heimdal/files/patch-lib-roken-Makefile.in
+++ b/security/heimdal/files/patch-lib-roken-Makefile.in
@@ -1,26 +1,26 @@
---- lib/roken/Makefile.in.orig	2012-12-10 07:09:39.000000000 +0900
-+++ lib/roken/Makefile.in	2015-03-04 21:35:04.000000000 +0900
-@@ -150,8 +150,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+--- lib/roken/Makefile.in.orig	2017-01-03 13:45:03 UTC
++++ lib/roken/Makefile.in
+@@ -194,8 +194,7 @@ am__uninstall_files_from_dir = { \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \
 -	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" \
 -	"$(DESTDIR)$(rokenincludedir)"
 +	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
- libroken_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1)
-@@ -305,8 +304,7 @@
+ libroken_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1) \
+@@ -396,8 +395,7 @@ MANS = $(man_MANS)
  am__dist_include_HEADERS_DIST = base64.h getarg.h hex.h parse_bytes.h \
  	parse_time.h parse_units.h resolve.h roken-common.h rtbl.h \
  	xdbm.h socket_wrapper.h
 -HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS) \
 -	$(nodist_rokeninclude_HEADERS)
 +HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS)
- ETAGS = etags
- CTAGS = ctags
- am__tty_colors = \
-@@ -1721,7 +1719,7 @@
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates.  Input order is
+@@ -2274,7 +2272,7 @@ check: $(BUILT_SOURCES)
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
  		all-local
  installdirs:
@@ -29,7 +29,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -1777,8 +1775,7 @@
+@@ -2338,8 +2336,7 @@ info: info-am
  info-am:
  
  install-data-am: install-dist_includeHEADERS install-man \
diff --git a/security/heimdal/files/patch-lib__sl__slc-lex.l b/security/heimdal/files/patch-lib__sl__slc-lex.l
index e4a50fc16f0d..66cbe1001bfe 100644
--- a/security/heimdal/files/patch-lib__sl__slc-lex.l
+++ b/security/heimdal/files/patch-lib__sl__slc-lex.l
@@ -1,6 +1,6 @@
---- lib/sl/slc-lex.l.orig	2013-03-28 14:22:37.561924559 +1030
-+++ lib/sl/slc-lex.l	2013-03-28 14:23:21.647677881 +1030
-@@ -47,8 +47,6 @@
+--- lib/sl/slc-lex.l.orig	2016-11-29 01:35:27 UTC
++++ lib/sl/slc-lex.l
+@@ -47,8 +47,6 @@ unsigned lineno = 1;
  static void handle_comment(void);
  static char * handle_string(void);
  
diff --git a/security/heimdal/files/patch-lib_gssapi_krb5_prf.c b/security/heimdal/files/patch-lib_gssapi_krb5_prf.c
deleted file mode 100644
index 57ddf5cb7d50..000000000000
--- a/security/heimdal/files/patch-lib_gssapi_krb5_prf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/gssapi/krb5/prf.c.orig	2012-01-10 21:53:51.000000000 +0000
-+++ lib/gssapi/krb5/prf.c
-@@ -119,7 +119,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_
-     while(dol > 0) {
- 	size_t tsize;
- 
--	_gsskrb5_encode_om_uint32(num, input.data);
-+	_gsskrb5_encode_be_om_uint32(num, input.data);
- 
- 	ret = krb5_crypto_prf(context, crypto, &input, &output);
- 	if (ret) {
diff --git a/security/heimdal/files/patch-lib_hcrypto_rand-egd.c b/security/heimdal/files/patch-lib_hcrypto_rand-egd.c
deleted file mode 100644
index 96d8686a4b91..000000000000
--- a/security/heimdal/files/patch-lib_hcrypto_rand-egd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/hcrypto/rand-egd.c.orig	2012-12-09 22:06:44 UTC
-+++ lib/hcrypto/rand-egd.c
-@@ -54,6 +54,7 @@ static const char *egd_path = "/var/run/
- 
- #define MAX_EGD_DATA 255
- 
-+#ifndef OPENSSL_NO_EGD
- static int
- connect_egd(const char *path)
- {
-@@ -258,3 +259,5 @@ RAND_egd_bytes(const char *filename, int
- 
-     return 1;
- }
-+
-+#endif
diff --git a/security/heimdal/files/patch-lib_krb5_crypto-rand.c b/security/heimdal/files/patch-lib_krb5_crypto-rand.c
deleted file mode 100644
index 734b7af84d0b..000000000000
--- a/security/heimdal/files/patch-lib_krb5_crypto-rand.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/krb5/crypto-rand.c.orig	2012-12-09 22:06:44 UTC
-+++ lib/krb5/crypto-rand.c
-@@ -70,8 +70,10 @@ seed_something(void)
- 	if (!krb5_init_context(&context)) {
- 	    p = krb5_config_get_string(context, NULL, "libdefaults",
- 				       "egd_socket", NULL);
-+# ifndef OPENSSL_NO_EGD
- 	    if (p != NULL)
- 		RAND_egd_bytes(p, ENTROPY_NEEDED);
-+# endif
- 	    krb5_free_context(context);
- 	}
- #else
diff --git a/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
index 2ff15a024e71..a2e7ca28e2e5 100644
--- a/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
+++ b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
@@ -1,20 +1,10 @@
---- tools/heimdal-gssapi.pc.in.orig	2012-12-10 07:06:44.000000000 +0900
-+++ tools/heimdal-gssapi.pc.in	2014-11-24 09:40:30.000000000 +0900
-@@ -1,8 +1,8 @@
- # $Id$
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@libdir@
-+includedir=@includedir@
- 
- Name: @PACKAGE@
- Description: Heimdal is an implementation of Kerberos 5, freely available under a three clause BSD style license.
-@@ -10,5 +10,5 @@
+--- tools/heimdal-gssapi.pc.in.orig	2016-12-14 18:01:18 UTC
++++ tools/heimdal-gssapi.pc.in
+@@ -9,6 +9,6 @@ Description: Heimdal is an implementatio
+ Version: @VERSION@
  URL: http://www.pdc.kth.se/heimdal/
- #Requires: foo = 1.3.1
- #Conflicts: bar <= 4.5
--Libs: -L${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
-+Libs: -L${libdir} -Wl,-rpath=${libdir} -lgssapi -lheimntlm -lkrb5 @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lroken @LIB_crypt@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+ Requires.private: heimdal-krb5
+-Libs: -L${libdir} -lgssapi
++Libs: -L${libdir} -Wl,-rpath=${libdir} -lgssapi
+ Libs.private: -lheimntlm @LIB_crypt@
  Cflags: -I${includedir}
diff --git a/security/heimdal/files/patch-tools-krb5-config.in b/security/heimdal/files/patch-tools-krb5-config.in
deleted file mode 100644
index 4dd3ac27d7e1..000000000000
--- a/security/heimdal/files/patch-tools-krb5-config.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/krb5-config.in.orig	2012-12-10 07:06:44.000000000 +0900
-+++ tools/krb5-config.in	2014-11-25 04:01:22.000000000 +0900
-@@ -120,7 +120,7 @@
- fi
- 
- if test "$do_libs" = "yes"; then
--    lib_flags="-L${libdir}"
-+    lib_flags="-L${libdir} -Wl,-rpath=${libdir}"
-     case $library in
-     gssapi)
- 	lib_flags="$lib_flags -lgssapi -lheimntlm"
-@@ -137,7 +137,7 @@
-     esac
-     lib_flags="$lib_flags -lkrb5 @LIB_pkinit@ -lcom_err"
-     lib_flags="$lib_flags @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken"
--    lib_flags="$lib_flags @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@"
-+    lib_flags="$lib_flags @LIB_crypt@ @LIB_dlopen@"
-     lib_flags="$lib_flags @LIB_door_create@ @LIBS@"
-     echo $lib_flags
- fi
diff --git a/security/heimdal/pkg-message b/security/heimdal/pkg-message
index de3c99b01e07..b358931b2249 100644
--- a/security/heimdal/pkg-message
+++ b/security/heimdal/pkg-message
@@ -1,5 +1,5 @@
 ====
-heimdal-1.5.3_7 uses a new database format which is incompatible
+heimdal-7.1.0 uses a new database format which is incompatible
 with Heimdal in the base system and heimdal-1.5.3_6 or prior.
 
 Please read 20161112 in /usr/ports/UPDATING carefully to upgrade
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 17030aaaa9b1..029461217b35 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -1,9 +1,10 @@
 bin/afslog
-bin/ftp
+bin/bsearch
 bin/gsstool
+bin/heimtools
 bin/hxtool
 bin/idn-lookup
-bin/kcc
+bin/kadmin
 bin/kdestroy
 bin/kf
 bin/kgetcred
@@ -12,22 +13,13 @@ bin/klist
 bin/kpasswd
 bin/krb5-config
 bin/kswitch
-%%X11%%bin/kx
-bin/login
+bin/ktutil
 bin/otp
 bin/otpprint
 bin/pagsh
-bin/pfrom
-bin/rcp
-bin/rsh
-%%X11%%bin/rxtelnet
-%%X11%%bin/rxterm
 bin/string2key
 bin/su
-bin/telnet
-%%X11%%bin/tenletxr
 bin/verify_krb5_conf
-%%X11%%bin/xnlock
 include/heimdal/asn1-common.h
 include/heimdal/asn1_err.h
 include/heimdal/base64.h
@@ -47,6 +39,32 @@ include/heimdal/gssapi/gssapi_krb5.h
 include/heimdal/gssapi/gssapi_ntlm.h
 include/heimdal/gssapi/gssapi_oid.h
 include/heimdal/gssapi/gssapi_spnego.h
+include/heimdal/hcrypto/aes.h
+include/heimdal/hcrypto/bn.h
+include/heimdal/hcrypto/des.h
+include/heimdal/hcrypto/dh.h
+include/heimdal/hcrypto/dsa.h
+include/heimdal/hcrypto/ec.h
+include/heimdal/hcrypto/ecdh.h
+include/heimdal/hcrypto/ecdsa.h
+include/heimdal/hcrypto/engine.h
+include/heimdal/hcrypto/evp-cc.h
+include/heimdal/hcrypto/evp-hcrypto.h
+include/heimdal/hcrypto/evp-openssl.h
+include/heimdal/hcrypto/evp-pkcs11.h
+include/heimdal/hcrypto/evp.h
+include/heimdal/hcrypto/hmac.h
+include/heimdal/hcrypto/md2.h
+include/heimdal/hcrypto/md4.h
+include/heimdal/hcrypto/md5.h
+include/heimdal/hcrypto/pkcs12.h
+include/heimdal/hcrypto/rand.h
+include/heimdal/hcrypto/rc2.h
+include/heimdal/hcrypto/rc4.h
+include/heimdal/hcrypto/rsa.h
+include/heimdal/hcrypto/sha.h
+include/heimdal/hcrypto/ui.h
+include/heimdal/hcrypto/undef.h
 include/heimdal/hdb-protos.h
 include/heimdal/hdb.h
 include/heimdal/hdb_asn1.h
@@ -71,11 +89,12 @@ include/heimdal/kadm5/private.h
 include/heimdal/kafs.h
 include/heimdal/kdc-protos.h
 include/heimdal/kdc.h
-include/heimdal/krb5-private.h
 include/heimdal/krb5-protos.h
 include/heimdal/krb5-types.h
 include/heimdal/krb5.h
+include/heimdal/krb5/an2ln_plugin.h
 include/heimdal/krb5/ccache_plugin.h
+include/heimdal/krb5/db_plugin.h
 include/heimdal/krb5/locate_plugin.h
 include/heimdal/krb5/send_to_kdc_plugin.h
 include/heimdal/krb5/windc_plugin.h
@@ -116,6 +135,10 @@ lib/heimdal/libgssapi.a
 lib/heimdal/libgssapi.so
 lib/heimdal/libgssapi.so.3
 lib/heimdal/libgssapi.so.3.0.0
+lib/heimdal/libhcrypto.a
+lib/heimdal/libhcrypto.so
+lib/heimdal/libhcrypto.so.4
+lib/heimdal/libhcrypto.so.4.1.0
 lib/heimdal/libhdb.a
 lib/heimdal/libhdb.so
 lib/heimdal/libhdb.so.9
@@ -177,8 +200,15 @@ lib/heimdal/windc.so
 lib/heimdal/windc.so.0
 lib/heimdal/windc.so.0.0.0
 libdata/pkgconfig/heimdal-gssapi.pc
+libdata/pkgconfig/heimdal-kadm-client.pc
+libdata/pkgconfig/heimdal-kadm-server.pc
+libdata/pkgconfig/heimdal-krb5.pc
+libdata/pkgconfig/kadm-client.pc
+libdata/pkgconfig/kadm-server.pc
+libdata/pkgconfig/kafs.pc
+libdata/pkgconfig/krb5-gssapi.pc
+libdata/pkgconfig/krb5.pc
 libexec/digest-service
-libexec/ftpd
 libexec/heimdal/asn1_compile
 libexec/heimdal/asn1_print
 libexec/heimdal/slc
@@ -193,13 +223,9 @@ libexec/kdigest
 libexec/kfd
 libexec/kimpersonate
 libexec/kpasswdd
-%%X11%%libexec/kxd
-libexec/popper
-libexec/push
-libexec/rshd
-libexec/telnetd
 man/man1/afslog.1.gz
-man/man1/ftp.1.gz
+man/man1/bsearch.1.gz
+man/man1/kadmin.1.gz
 man/man1/kdestroy.1.gz
 man/man1/kf.1.gz
 man/man1/kgetcred.1.gz
@@ -208,27 +234,14 @@ man/man1/klist.1.gz
 man/man1/kpasswd.1.gz
 man/man1/krb5-config.1.gz
 man/man1/kswitch.1.gz
-man/man1/kx.1.gz
-man/man1/login.1.gz
+man/man1/ktutil.1.gz
 man/man1/otp.1.gz
 man/man1/otpprint.1.gz
 man/man1/pagsh.1.gz
-man/man1/pfrom.1.gz
-man/man1/rcp.1.gz
-man/man1/rsh.1.gz
-man/man1/rxtelnet.1.gz
-man/man1/rxterm.1.gz
 man/man1/su.1.gz
-man/man1/telnet.1.gz
-man/man1/tenletxr.1.gz
-man/man1/xnlock.1.gz
 man/man3/HDB.3.gz
-man/man3/__gss_c_attr_stream_sizes_oid_desc.3.gz
 man/man3/arg_printusage.3.gz
-man/man3/challenge.3.gz
-man/man3/context.3.gz
 man/man3/data.3.gz
-man/man3/domain.3.gz
 man/man3/ecalloc.3.gz
 man/man3/emalloc.3.gz
 man/man3/eread.3.gz
@@ -236,7 +249,6 @@ man/man3/erealloc.3.gz
 man/man3/esetenv.3.gz
 man/man3/estrdup.3.gz
 man/man3/ewrite.3.gz
-man/man3/flags.3.gz
 man/man3/getarg.3.gz
 man/man3/gss_accept_sec_context.3.gz
 man/man3/gss_acquire_cred.3.gz
@@ -336,7 +348,7 @@ man/man3/heim_ntlm_keyex_unwrap.3.gz
 man/man3/heim_ntlm_nt_key.3.gz
 man/man3/heim_ntlm_ntlmv2_key.3.gz
 man/man3/heim_ntlm_verify_ntlm2.3.gz
-man/man3/hostname.3.gz
+man/man3/heimbase.3.gz
 man/man3/hx509.3.gz
 man/man3/hx509_bitstring_print.3.gz
 man/man3/hx509_ca.3.gz
@@ -359,6 +371,7 @@ man/man3/hx509_ca_tbs_set_notAfter_lifetime.3.gz
 man/man3/hx509_ca_tbs_set_notBefore.3.gz
 man/man3/hx509_ca_tbs_set_proxy.3.gz
 man/man3/hx509_ca_tbs_set_serialnumber.3.gz
+man/man3/hx509_ca_tbs_set_signature_algorithm.3.gz
 man/man3/hx509_ca_tbs_set_spki.3.gz
 man/man3/hx509_ca_tbs_set_subject.3.gz
 man/man3/hx509_ca_tbs_set_template.3.gz
@@ -498,7 +511,7 @@ man/man3/hx509_verify_set_strict_rfc3280_verification.3.gz
 man/man3/hx509_verify_set_time.3.gz
 man/man3/hx509_verify_signature.3.gz
 man/man3/hx509_xfree.3.gz
-man/man3/internalvsmechname.3.gz
+man/man3/internal_v_smechname.3.gz
 man/man3/k_afs_cell_of_file.3.gz
 man/man3/k_hasafs.3.gz
 man/man3/k_hasafs_recheck.3.gz
@@ -520,6 +533,8 @@ man/man3/krb524_convert_creds_kdc_ccache.3.gz
 man/man3/krb5_425_conv_principal.3.gz
 man/man3/krb5_425_conv_principal_ext.3.gz
 man/man3/krb5_524_conv_principal.3.gz
+man/man3/krb5_abort.3.gz
+man/man3/krb5_abortx.3.gz
 man/man3/krb5_acc_ops.3.gz
 man/man3/krb5_acl_match_file.3.gz
 man/man3/krb5_acl_match_string.3.gz
@@ -719,6 +734,7 @@ man/man3/krb5_data_ct_cmp.3.gz
 man/man3/krb5_data_free.3.gz
 man/man3/krb5_data_realloc.3.gz
 man/man3/krb5_data_zero.3.gz
+man/man3/krb5_dcc_ops.3.gz
 man/man3/krb5_decrypt.3.gz
 man/man3/krb5_decrypt_EncryptedData.3.gz
 man/man3/krb5_decrypt_iov_ivec.3.gz
@@ -768,8 +784,10 @@ man/man3/krb5_enctype_keysize.3.gz
 man/man3/krb5_enctype_to_string.3.gz
 man/man3/krb5_enctype_valid.3.gz
 man/man3/krb5_enctypes_compatible_keys.3.gz
+man/man3/krb5_err.3.gz
 man/man3/krb5_error.3.gz
 man/man3/krb5_error_from_rd_error.3.gz
+man/man3/krb5_errx.3.gz
 man/man3/krb5_expand_hostname.3.gz
 man/man3/krb5_expand_hostname_realms.3.gz
 man/man3/krb5_fcc_ops.3.gz
@@ -790,6 +808,7 @@ man/man3/krb5_free_data.3.gz
 man/man3/krb5_free_data_contents.3.gz
 man/man3/krb5_free_error.3.gz
 man/man3/krb5_free_error_contents.3.gz
+man/man3/krb5_free_error_message.3.gz
 man/man3/krb5_free_error_string.3.gz
 man/man3/krb5_free_host_realm.3.gz
 man/man3/krb5_free_kdc_rep.3.gz
@@ -801,6 +820,7 @@ man/man3/krb5_free_salt.3.gz
 man/man3/krb5_free_ticket.3.gz
 man/man3/krb5_free_unparsed_name.3.gz
 man/man3/krb5_fwd_tgt_creds.3.gz
+man/man3/krb5_generate_random.3.gz
 man/man3/krb5_generate_random_block.3.gz
 man/man3/krb5_generate_subkey.3.gz
 man/man3/krb5_generate_subkey_extended.3.gz
@@ -825,6 +845,9 @@ man/man3/krb5_get_default_realm.3.gz
 man/man3/krb5_get_default_realms.3.gz
 man/man3/krb5_get_dns_canonicalize_hostname.3.gz
 man/man3/krb5_get_dns_canonize_hostname.3.gz
+man/man3/krb5_get_err_text.3.gz
+man/man3/krb5_get_error_message.3.gz
+man/man3/krb5_get_error_string.3.gz
 man/man3/krb5_get_extra_addresses.3.gz
 man/man3/krb5_get_fcache_version.3.gz
 man/man3/krb5_get_forwarded_creds.3.gz
@@ -871,6 +894,7 @@ man/man3/krb5_get_renewed_creds.3.gz
 man/man3/krb5_get_server_rcache.3.gz
 man/man3/krb5_get_use_admin_kdc.3.gz
 man/man3/krb5_get_validated_creds.3.gz
+man/man3/krb5_get_warn_dest.3.gz
 man/man3/krb5_get_wrapped_length.3.gz
 man/man3/krb5_getportbyname.3.gz
 man/man3/krb5_h_addr2addr.3.gz
@@ -891,6 +915,7 @@ man/man3/krb5_init_ets.3.gz
 man/man3/krb5_initlog.3.gz
 man/man3/krb5_introduction.3.gz
 man/man3/krb5_is_config_principal.3.gz
+man/man3/krb5_is_enctype_weak.3.gz
 man/man3/krb5_is_thread_safe.3.gz
 man/man3/krb5_kerberos_enctypes.3.gz
 man/man3/krb5_keyblock_get_enctype.3.gz
@@ -970,7 +995,12 @@ man/man3/krb5_principal_get_num_comp.3.gz
 man/man3/krb5_principal_get_realm.3.gz
 man/man3/krb5_principal_get_type.3.gz
 man/man3/krb5_principal_intro.3.gz
+man/man3/krb5_principal_is_gss_hostbased_service.3.gz
 man/man3/krb5_principal_is_krbtgt.3.gz
+man/man3/krb5_principal_is_lkdc.3.gz
+man/man3/krb5_principal_is_null.3.gz
+man/man3/krb5_principal_is_pku2u.3.gz
+man/man3/krb5_principal_is_root_krbtgt.3.gz
 man/man3/krb5_principal_match.3.gz
 man/man3/krb5_principal_set_realm.3.gz
 man/man3/krb5_principal_set_type.3.gz
@@ -1008,6 +1038,7 @@ man/man3/krb5_rd_req_out_get_server.3.gz
 man/man3/krb5_rd_req_with_keyblock.3.gz
 man/man3/krb5_rd_safe.3.gz
 man/man3/krb5_realm_compare.3.gz
+man/man3/krb5_realm_is_lkdc.3.gz
 man/man3/krb5_ret_address.3.gz
 man/man3/krb5_ret_addrs.3.gz
 man/man3/krb5_ret_authdata.3.gz
@@ -1016,6 +1047,7 @@ man/man3/krb5_ret_creds_tag.3.gz
 man/man3/krb5_ret_data.3.gz
 man/man3/krb5_ret_int16.3.gz
 man/man3/krb5_ret_int32.3.gz
+man/man3/krb5_ret_int64.3.gz
 man/man3/krb5_ret_int8.3.gz
 man/man3/krb5_ret_keyblock.3.gz
 man/man3/krb5_ret_principal.3.gz
@@ -1024,6 +1056,7 @@ man/man3/krb5_ret_stringz.3.gz
 man/man3/krb5_ret_times.3.gz
 man/man3/krb5_ret_uint16.3.gz
 man/man3/krb5_ret_uint32.3.gz
+man/man3/krb5_ret_uint64.3.gz
 man/man3/krb5_ret_uint8.3.gz
 man/man3/krb5_set_config_files.3.gz
 man/man3/krb5_set_default_in_tkt_etypes.3.gz
@@ -1042,6 +1075,7 @@ man/man3/krb5_set_password.3.gz
 man/man3/krb5_set_password_using_ccache.3.gz
 man/man3/krb5_set_real_time.3.gz
 man/man3/krb5_set_use_admin_kdc.3.gz
+man/man3/krb5_set_warn_dest.3.gz
 man/man3/krb5_sname_to_principal.3.gz
 man/man3/krb5_sock_to_principal.3.gz
 man/man3/krb5_sockaddr2address.3.gz
@@ -1055,6 +1089,8 @@ man/man3/krb5_storage_from_data.3.gz
 man/man3/krb5_storage_from_fd.3.gz
 man/man3/krb5_storage_from_mem.3.gz
 man/man3/krb5_storage_from_readonly_mem.3.gz
+man/man3/krb5_storage_from_socket.3.gz
+man/man3/krb5_storage_fsync.3.gz
 man/man3/krb5_storage_get_byteorder.3.gz
 man/man3/krb5_storage_get_eof_code.3.gz
 man/man3/krb5_storage_is_flags.3.gz
@@ -1075,6 +1111,7 @@ man/man3/krb5_store_creds_tag.3.gz
 man/man3/krb5_store_data.3.gz
 man/man3/krb5_store_int16.3.gz
 man/man3/krb5_store_int32.3.gz
+man/man3/krb5_store_int64.3.gz
 man/man3/krb5_store_int8.3.gz
 man/man3/krb5_store_keyblock.3.gz
 man/man3/krb5_store_principal.3.gz
@@ -1083,6 +1120,7 @@ man/man3/krb5_store_stringz.3.gz
 man/man3/krb5_store_times.3.gz
 man/man3/krb5_store_uint16.3.gz
 man/man3/krb5_store_uint32.3.gz
+man/man3/krb5_store_uint64.3.gz
 man/man3/krb5_store_uint8.3.gz
 man/man3/krb5_string_to_deltat.3.gz
 man/man3/krb5_string_to_enctype.3.gz
@@ -1109,6 +1147,7 @@ man/man3/krb5_unparse_name_flags.3.gz
 man/man3/krb5_unparse_name_short.3.gz
 man/man3/krb5_us_timeofday.3.gz
 man/man3/krb5_v4compat.3.gz
+man/man3/krb5_vabort.3.gz
 man/man3/krb5_verify_ap_req.3.gz
 man/man3/krb5_verify_checksum.3.gz
 man/man3/krb5_verify_checksum_iov.3.gz
@@ -1126,21 +1165,28 @@ man/man3/krb5_verify_opt_set_service.3.gz
 man/man3/krb5_verify_user.3.gz
 man/man3/krb5_verify_user_lrealm.3.gz
 man/man3/krb5_verify_user_opt.3.gz
+man/man3/krb5_verr.3.gz
+man/man3/krb5_verrx.3.gz
 man/man3/krb5_vlog.3.gz
 man/man3/krb5_vlog_msg.3.gz
+man/man3/krb5_vprepend_error_message.3.gz
+man/man3/krb5_vset_error_message.3.gz
 man/man3/krb5_vset_error_string.3.gz
 man/man3/krb5_vwarn.3.gz
+man/man3/krb5_vwarnx.3.gz
+man/man3/krb5_warn.3.gz
+man/man3/krb5_warnx.3.gz
+man/man3/krb5plugin_an2ln_ftable_desc.3.gz
+man/man3/krb5plugin_db_ftable_desc.3.gz
+man/man3/krb5plugin_kuserok_ftable_desc.3.gz
 man/man3/krb_afslog.3.gz
 man/man3/krb_afslog_uid.3.gz
 man/man3/length.3.gz
-man/man3/lm.3.gz
-man/man3/ntlm.3.gz
 man/man3/ntlm_buf.3.gz
 man/man3/ntlm_core.3.gz
 man/man3/ntlm_type1.3.gz
 man/man3/ntlm_type2.3.gz
 man/man3/ntlm_type3.3.gz
-man/man3/os.3.gz
 man/man3/page_ca.3.gz
 man/man3/page_cert.3.gz
 man/man3/page_cms.3.gz
@@ -1169,12 +1215,8 @@ man/man3/rtbl_set_column_prefix.3.gz
 man/man3/rtbl_set_flags.3.gz
 man/man3/rtbl_set_prefix.3.gz
 man/man3/rtbl_set_separator.3.gz
-man/man3/sessionkey.3.gz
-man/man3/targetinfo.3.gz
-man/man3/targetname.3.gz
 man/man3/unparse_time.3.gz
 man/man3/unparse_time_approx.3.gz
-man/man3/username.3.gz
 man/man3/wind.3.gz
 man/man3/wind_profile.3.gz
 man/man3/wind_punycode_label_toascii.3.gz
@@ -1189,20 +1231,16 @@ man/man3/wind_utf8ucs2.3.gz
 man/man3/wind_utf8ucs2_length.3.gz
 man/man3/wind_utf8ucs4.3.gz
 man/man3/wind_utf8ucs4_length.3.gz
-man/man3/ws.3.gz
-man/man5/ftpusers.5.gz
 man/man5/krb5.conf.5.gz
-man/man5/login.access.5.gz
 man/man5/mech.5.gz
 man/man5/qop.5.gz
-man/man8/ftpd.8.gz
+man/man7/krb5-plugin.7.gz
 man/man8/hprop.8.gz
 man/man8/hpropd.8.gz
 man/man8/iprop-log.8.gz
 man/man8/iprop.8.gz
 man/man8/ipropd-master.8.gz
 man/man8/ipropd-slave.8.gz
-man/man8/kadmin.8.gz
 man/man8/kadmind.8.gz
 man/man8/kcm.8.gz
 man/man8/kdc.8.gz
@@ -1212,15 +1250,7 @@ man/man8/kfd.8.gz
 man/man8/kimpersonate.8.gz
 man/man8/kpasswdd.8.gz
 man/man8/kstash.8.gz
-man/man8/ktutil.8.gz
-man/man8/kxd.8.gz
-man/man8/popper.8.gz
-man/man8/push.8.gz
-man/man8/rshd.8.gz
 man/man8/string2key.8.gz
-man/man8/telnetd.8.gz
 man/man8/verify_krb5_conf.8.gz
 sbin/iprop-log
-sbin/kadmin
 sbin/kstash
-sbin/ktutil