git: 2a1ea69ad622 - main - security/heimdal-devel: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 31 Mar 2025 15:59:14 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2a1ea69ad6229fdb86daf1f09fe5071ab3352087
commit 2a1ea69ad6229fdb86daf1f09fe5071ab3352087
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2025-03-31 15:59:09 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2025-03-31 15:59:09 +0000
security/heimdal-devel: Remove expired port
2025-03-31 security/heimdal-devel: Upstream commits are incompatible
---
MOVED | 1 +
security/Makefile | 1 -
security/heimdal-devel/Makefile | 142 ----
security/heimdal-devel/distinfo | 3 -
security/heimdal-devel/files/ipropd_master.in | 45 --
security/heimdal-devel/files/ipropd_slave.in | 37 -
security/heimdal-devel/files/kpasswdd-Makefile | 15 -
security/heimdal-devel/files/kpasswdd-cracklib.c | 22 -
.../heimdal-devel/files/patch-cf-make-proto.pl | 11 -
.../files/patch-cf_check-compile-et.m4 | 11 -
security/heimdal-devel/files/patch-cf_pthreads.m4 | 11 -
security/heimdal-devel/files/patch-configure.ac | 10 -
.../heimdal-devel/files/patch-lib-krb5-krb5_locl.h | 20 -
.../heimdal-devel/files/patch-lib__sl__slc-lex.l | 11 -
.../heimdal-devel/files/patch-lib_kadm5_marshall.c | 44 --
.../heimdal-devel/files/patch-lib_krb5_recvauth.c | 42 --
.../files/patch-tools-heimdal-gssapi.pc.in | 10 -
.../heimdal-devel/files/patch-tools-krb5-config.in | 10 -
security/heimdal-devel/pkg-descr | 3 -
security/heimdal-devel/pkg-message | 11 -
security/heimdal-devel/pkg-plist | 763 ---------------------
21 files changed, 1 insertion(+), 1222 deletions(-)
diff --git a/MOVED b/MOVED
index 9a61f28e3923..42f42861a6c3 100644
--- a/MOVED
+++ b/MOVED
@@ -4281,3 +4281,4 @@ japanese/esecanna-module-vje30||2025-03-31|Has expired: Upstream disapeared and
chinese/muni||2025-03-31|Has expired: Upstream disapeared and distfile is no more available
devel/buildstream||2025-03-31|Has expired: Depends on expired devel/py-pytest-runner
www/py-django-hijack||2025-03-31|Has expired: Depends on expired devel/py-pytest-runner
+security/heimdal-devel||2025-03-31|Has expired: Upstream commits are incompatible
diff --git a/security/Makefile b/security/Makefile
index 3a80de4948c8..0dd1a07dc699 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -214,7 +214,6 @@
SUBDIR += heaan
SUBDIR += headscale
SUBDIR += heimdal
- SUBDIR += heimdal-devel
SUBDIR += helib
SUBDIR += hexl
SUBDIR += hidden-lake
diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile
deleted file mode 100644
index 538fc2cdbd4a..000000000000
--- a/security/heimdal-devel/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-PORTNAME= heimdal
-PORTVERSION= ${HEIMDAL_COMMIT_DATE}
-PORTREVISION= 1
-CATEGORIES= security
-PKGNAMESUFFIX= -devel
-HASH= 3253c4954
-HEIMDAL_COMMIT_DATE= 2023.11.29
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Popular BSD-licensed implementation of Kerberos 5
-WWW= https://www.h5l.org/
-
-DEPRECATED= Upstream commits are incompatible
-EXPIRATION_DATE=2025-03-31
-
-LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-USE_GITHUB= yes
-GH_TAGNAME= ${HASH}
-
-CONFLICTS= krb5 krb5-*
-
-USES= autoreconf:build cpe gettext-runtime gssapi:bootstrap,heimdal \
- libtool pathfix pkgconfig python:build readline makeinfo ssl
-CPE_VENDOR= ${PORTNAME}_project
-USE_LDCONFIG= ${GSSAPILIBDIR}
-
-# Needs clang-format which is only provided by the port.
-# Else asm1_fails resulting in a command not found error.
-USES+= llvm
-BUILD_DEPENDS= p5-JSON>0:converters/p5-JSON
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= ac_cv_header_fnmatch_h=yes \
- ac_cv_header_db_h=no \
- ac_cv_header_db3_db_h=no \
- ac_cv_header_db4_db_h=no \
- ac_cv_header_db5_db_h=no \
- ac_cv_header_db6_db_h=no \
- ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et
-CONFIGURE_ARGS= --with-berkeley-db \
- --with-libintl \
- --with-libintl-include="${LOCALBASE}/include" \
- --with-libintl-lib="${LOCALBASE}/lib" \
- --libdir="${GSSAPILIBDIR}" \
- --includedir="${GSSAPIINCDIR}" \
- --with-kcm \
- --with-openssl \
- --with-openssl-include="${OPENSSLINC}" \
- --with-openssl-lib="${OPENSSLLIB}" \
- --enable-otp \
- --enable-pthread-support \
- --with-readline="${LOCALBASE}" \
- --with-hdbdir="/var/${PORTNAME}" \
- --sysconfdir="${PREFIX}/etc" \
- CLANG_FORMAT="${LOCALBASE}/bin/clang-format${LLVM_DEFAULT}" \
- --enable-kx509 \
- --without-microhttpd
-# XXX --with-readline picks up libreadline even if found in /usr/lib.
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-MAKE_ENV= INSTALL_CATPAGES=no
-CFLAGS+= -Wno-implicit-function-declaration
-LDFLAGS+= -Wl,--undefined-version
-INSTALL_TARGET= install-strip
-.if !exists(/etc/rc.d/ipropd_master)
-USE_RC_SUBR= ipropd_master ipropd_slave
-.endif
-INFO= heimdal hx509
-
-MAKE_JOBS_UNSAFE= yes
-
-OPTIONS_DEFINE= IPV6 BDB LMDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB MICROHTTPD
-OPTIONS_DEFAULT=IPV6 BDB PKINIT DIGEST KX509
-OPTIONS_SUB= yes
-
-IPV6_CONFIGURE_WITH= ipv6
-
-BDB_DESC= Enable BerkeleyDB KDC backend support
-BDB_USES= bdb:5 localbase
-BDB_CONFIGURE_ENV= ac_cv_header_db${BDB_VER}_db_h=yes \
- ac_cv_func_db_create=yes \
- ac_cv_funclib_db_create="-l${BDB_LIB_NAME}"
-BDB_CONFIGURE_ON= --disable-ndbm-db
-BDB_CONFIGURE_ENV_OFF= ac_cv_header_db_h=yes \
- ac_cv_func_db_create=no \
- ac_cv_funclib_db_create=no
-BDB_CONFIGURE_OFF= --enable-ndbm-db
-
-LMDB_DESC= Enable LMDB KDC backend support
-LMDB_CONFIGURE_ENABLE= mdb_db
-LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
-
-SQLITE_DESC= Enable SQLite KDC backend support
-SQLITE_USES= sqlite
-SQLITE_CONFIGURE_ON= --with-sqlite3-include="${LOCALBASE}/include" \
- --with-sqlite3-lib="${LOCALBASE}/lib"
-SQLITE_CONFIGURE_WITH= sqlite3
-
-LDAP_DESC= Enable OpenLDAP KDC backend support
-LDAP_USES= ldap
-LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \
- --with-openldap-lib="${LOCALBASE}/lib"
-LDAP_CONFIGURE_WITH= openldap
-
-PKINIT_DESC= Enable PK-INIT support
-PKINIT_CONFIGURE_ENABLE=pk-init
-
-DIGEST_DESC= Enable DIGEST support
-DIGEST_CONFIGURE_ENABLE=digest
-
-KX509_DESC= Enable kx509 support
-KX509_CONFIGURE_ENABLE= kx509
-
-CRACKLIB_DESC= Use CrackLib for password quality checking
-CRACKLIB_LIB_DEPENDS= libcrack.so:security/cracklib
-
-MICROHTTPD_CONFIGURE_WITH= microhttpd
-MICROHTTPD_DESC= Add microhttpd support
-MICROHTTPD_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd
-
-.include <bsd.port.options.mk>
-
-post-extract:
- @${MKDIR} ${WRKSRC}/kpasswdd-cracklib
- ${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \
- ${WRKSRC}/kpasswdd-cracklib
- ${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
- ${WRKSRC}/kpasswdd-cracklib/Makefile
-
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
-
-post-build-CRACKLIB-on:
- cd ${WRKSRC}/kpasswdd-cracklib && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET}
-
-post-install-CRACKLIB-on:
- cd ${WRKSRC}/kpasswdd-cracklib && \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
-
-.include <bsd.port.mk>
diff --git a/security/heimdal-devel/distinfo b/security/heimdal-devel/distinfo
deleted file mode 100644
index aebe833ff039..000000000000
--- a/security/heimdal-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1701838158
-SHA256 (heimdal-heimdal-2023.11.29-3253c4954_GH0.tar.gz) = 9b688cf7130e30b18f1bd4b7e21c9bdb61d721b4927f12e729509a760a3ae7db
-SIZE (heimdal-heimdal-2023.11.29-3253c4954_GH0.tar.gz) = 13098199
diff --git a/security/heimdal-devel/files/ipropd_master.in b/security/heimdal-devel/files/ipropd_master.in
deleted file mode 100644
index 274d6e01303f..000000000000
--- a/security/heimdal-devel/files/ipropd_master.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: ipropd_master
-# REQUIRE: kerberos
-# KEYWORD: shutdown
-
-# ipropd_master_keytab:
-# Keytab file for iprop service.
-# ipropd_master_slaves:
-# A list of slave nodes (hostname).
-
-. /etc/rc.subr
-
-name=ipropd_master
-rcvar=${name}_enable
-: ${ipropd_master_enable:=NO}
-: ${ipropd_master_program:=%%PREFIX%%/libexec/ipropd-master}
-: ${ipropd_master_keytab:="/etc/krb5.keytab"}
-required_files="$ipropd_master_keytab"
-start_precmd=${name}_start_precmd
-start_postcmd=${name}_start_postcmd
-
-ipropd_master_start_precmd()
-{
-
- if [ -z "$ipropd_master_slaves" ]; then
- warn "\$ipropd_master_slaves is empty."
- return 1
- fi
- for _slave in $ipropd_master_slaves; do
- echo $_slave
- done > /var/heimdal/slaves || return 1
- command_args="$command_args \
- --keytab=\"$ipropd_master_keytab\" \
- --detach \
- "
-}
-ipropd_master_start_postcmd()
-{
-
- echo "${name}: slave nodes: $ipropd_master_slaves"
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/security/heimdal-devel/files/ipropd_slave.in b/security/heimdal-devel/files/ipropd_slave.in
deleted file mode 100644
index 482409573aca..000000000000
--- a/security/heimdal-devel/files/ipropd_slave.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: ipropd_slave
-# REQUIRE: kerberos
-# KEYWORD: shutdown
-
-# ipropd_slave_keytab:
-# Keytab file for iprop service.
-# ipropd_slave_master:
-# Hostname of the master node.
-
-. /etc/rc.subr
-
-name=ipropd_slave
-rcvar=${name}_enable
-: ${ipropd_slave_enable:=NO}
-: ${ipropd_slave_program:=%%PREFIX%%/libexec/ipropd-slave}
-: ${ipropd_slave_keytab:="/etc/krb5.keytab"}
-required_files="$ipropd_slave_keytab"
-start_precmd=${name}_start_precmd
-
-ipropd_slave_start_precmd()
-{
-
- if [ -z "$ipropd_slave_master" ]; then
- warn "\$ipropd_slave_master is empty."
- return 1
- fi
- command_args=" \
- $command_args \
- --keytab=\"$ipropd_slave_keytab\" \
- --detach \
- $ipropd_slave_master"
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/security/heimdal-devel/files/kpasswdd-Makefile b/security/heimdal-devel/files/kpasswdd-Makefile
deleted file mode 100644
index 2ef50e5253f8..000000000000
--- a/security/heimdal-devel/files/kpasswdd-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all: kpasswdd-cracklib.so
-
-kpasswdd-cracklib.so: kpasswdd-cracklib.c
- ${CC} ${CFLAGS} -fPIC -shared \
- -DLOCALBASE=\"${LOCALBASE}\" \
- -I${LOCALBASE}/include -I./include \
- -o ${.TARGET} ${.ALLSRC} \
- -lcrack -L${LOCALBASE}/lib
-
-install-strip: install
-
-install: ${DESTDIR}${PREFIX}/lib/heimdal/kpasswdd-cracklib.so
-
-${DESTDIR}${PREFIX}/lib/heimdal/kpasswdd-cracklib.so: kpasswdd-cracklib.so
- ${BSD_INSTALL_LIB} ${.ALLSRC} ${.TARGET}
diff --git a/security/heimdal-devel/files/kpasswdd-cracklib.c b/security/heimdal-devel/files/kpasswdd-cracklib.c
deleted file mode 100644
index 83be6904ebb3..000000000000
--- a/security/heimdal-devel/files/kpasswdd-cracklib.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <krb5.h>
-#include <packer.h>
-
-int version = 0;
-
-const char *
-passwd_check(krb5_context context, krb5_principal principal,
- krb5_data *password)
-{
- char *p, *result;
-
- p = malloc(password->length + 1);
- if (p == NULL)
- return "out of memory";
- memcpy(p, password->data, password->length);
- p[password->length] = '\0';
- result = FascistCheck(p, LOCALBASE "/libdata/cracklib/cracklib-words");
- free(p);
- return result;
-}
diff --git a/security/heimdal-devel/files/patch-cf-make-proto.pl b/security/heimdal-devel/files/patch-cf-make-proto.pl
deleted file mode 100644
index d1fbc4c48dba..000000000000
--- a/security/heimdal-devel/files/patch-cf-make-proto.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/make-proto.pl.orig 2023-06-24 12:54:02.000000000 -0700
-+++ cf/make-proto.pl 2023-06-26 21:14:16.008839000 -0700
-@@ -4,7 +4,7 @@
- use Getopt::Std;
- use File::Compare;
-
--use JSON::PP
-+# use JSON::PP
-
- my $comment = 0;
- my $doxygen = 0;
diff --git a/security/heimdal-devel/files/patch-cf_check-compile-et.m4 b/security/heimdal-devel/files/patch-cf_check-compile-et.m4
deleted file mode 100644
index 49dd2ffeaacc..000000000000
--- a/security/heimdal-devel/files/patch-cf_check-compile-et.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/check-compile-et.m4.orig 2022-11-17 06:42:48.000000000 -0800
-+++ cf/check-compile-et.m4 2022-11-17 15:10:14.877952000 -0800
-@@ -7,7 +7,7 @@
-
- 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}" != "no"; then
-
- dnl We have compile_et. Now let's see if it supports `prefix' and `index'.
diff --git a/security/heimdal-devel/files/patch-cf_pthreads.m4 b/security/heimdal-devel/files/patch-cf_pthreads.m4
deleted file mode 100644
index 60ada3bc55ac..000000000000
--- a/security/heimdal-devel/files/patch-cf_pthreads.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/pthreads.m4.orig 2022-11-17 06:42:48.000000000 -0800
-+++ cf/pthreads.m4 2022-11-17 15:04:24.219994000 -0800
-@@ -34,7 +34,7 @@
- ;;
- *-*-freebsd*)
- native_pthread_support=yes
-- PTHREAD_LIBADD="-pthread"
-+ PTHREAD_LIBADD="-lpthread"
- ;;
- *-*-openbsd*)
- native_pthread_support=yes
diff --git a/security/heimdal-devel/files/patch-configure.ac b/security/heimdal-devel/files/patch-configure.ac
deleted file mode 100644
index 048b6c83b622..000000000000
--- a/security/heimdal-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig 2019-06-07 06:21:39 UTC
-+++ configure.ac
-@@ -153,6 +153,7 @@ AC_ARG_ENABLE(kx509,
- if test "$enable_kx509" != no ;then
- AC_DEFINE([KX509], 1, [Define to enable kx509.])
- fi
-+AM_CONDITIONAL(KX509, test "$enable_kx509" != no)
-
- dnl Need to test if pkg-config exists
- PKG_PROG_PKG_CONFIG
diff --git a/security/heimdal-devel/files/patch-lib-krb5-krb5_locl.h b/security/heimdal-devel/files/patch-lib-krb5-krb5_locl.h
deleted file mode 100644
index 7c1d29183477..000000000000
--- a/security/heimdal-devel/files/patch-lib-krb5-krb5_locl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/krb5/krb5_locl.h.orig 2019-06-07 06:21:39 UTC
-+++ lib/krb5/krb5_locl.h
-@@ -143,7 +143,7 @@ struct _krb5_krb_auth_data;
- #include <krb5.h>
- #include <krb5_err.h>
- #include <asn1_err.h>
--#ifdef PKINIT
-+#if defined(PKINIT) || defined(KX509)
- #include <hx509.h>
- #endif
-
-@@ -271,7 +271,7 @@ typedef struct krb5_context_data {
- #define KRB5_CTX_F_RD_REQ_IGNORE 16
- #define KRB5_CTX_F_FCACHE_STRICT_CHECKING 32
- struct send_to_kdc *send_to_kdc;
--#ifdef PKINIT
-+#if defined(PKINIT) || defined(KX509)
- hx509_context hx509ctx;
- #endif
- unsigned int num_kdc_requests;
diff --git a/security/heimdal-devel/files/patch-lib__sl__slc-lex.l b/security/heimdal-devel/files/patch-lib__sl__slc-lex.l
deleted file mode 100644
index c9d450472321..000000000000
--- a/security/heimdal-devel/files/patch-lib__sl__slc-lex.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/sl/slc-lex.l.orig 2017-04-11 21:38:21 UTC
-+++ lib/sl/slc-lex.l
-@@ -47,8 +47,6 @@ unsigned lineno = 1;
- static void handle_comment(void);
- static char * handle_string(void);
-
--#define YY_NO_UNPUT
--
- #undef ECHO
-
- %}
diff --git a/security/heimdal-devel/files/patch-lib_kadm5_marshall.c b/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
deleted file mode 100644
index 8bc63095693f..000000000000
--- a/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- lib/kadm5/marshall.c.orig 2022-11-17 16:55:32.000000000 -0800
-+++ lib/kadm5/marshall.c 2022-11-24 08:47:49.092069000 -0800
-@@ -463,10 +463,40 @@
- ret = krb5_ret_int32(sp, &mask);
- if (ret)
- goto out;
-+ if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME
-+ & KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) {
-+ ret = EINVAL;
-+ goto out;
-+ }
- params->mask = mask;
-
-- if(params->mask & KADM5_CONFIG_REALM)
-+ if (params->mask & KADM5_CONFIG_REALM) {
- ret = krb5_ret_string(sp, ¶ms->realm);
-+ if (params->realm == NULL) {
-+ ret = EINVAL;
-+ goto out;
-+ }
-+ }
-+ if (params->mask & KADM5_CONFIG_DBNAME) {
-+ ret = krb5_ret_string(sp, ¶ms->dbname);
-+ if (params->dbname == NULL) {
-+ ret = EINVAL;
-+ goto out;
-+ }
-+ }
-+ if (params->mask & KADM5_CONFIG_ACL_FILE) {
-+ ret = krb5_ret_string(sp, ¶ms->acl_file);
-+ if (params->acl_file == NULL) {
-+ ret = EINVAL;
-+ goto out;
-+ }
-+ }
-+ if (params->mask & KADM5_CONFIG_STASH_FILE) {
-+ ret = krb5_ret_string(sp, ¶ms->stash_file);
-+ if (params->stash_file == NULL) {
-+ ret = EINVAL;
-+ }
-+ }
- out:
- krb5_storage_free(sp);
-
diff --git a/security/heimdal-devel/files/patch-lib_krb5_recvauth.c b/security/heimdal-devel/files/patch-lib_krb5_recvauth.c
deleted file mode 100644
index 95d8acf15baf..000000000000
--- a/security/heimdal-devel/files/patch-lib_krb5_recvauth.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- lib/krb5/recvauth.c.orig 2022-09-15 16:54:19.000000000 -0700
-+++ lib/krb5/recvauth.c 2022-11-21 14:37:31.130429000 -0800
-@@ -98,7 +98,7 @@
- const char *version = KRB5_SENDAUTH_VERSION;
- char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
- char *her_appl_version;
-- uint32_t len;
-+ uint32_t len, bytes;
- u_char repl;
- krb5_data data;
- krb5_flags ap_options;
-@@ -166,15 +166,21 @@
- krb5_net_write (context, p_fd, &repl, 1);
- return krb5_enomem(context);
- }
-- if (krb5_net_read (context, p_fd, her_appl_version, len) != len
-- || !(*match_appl_version)(match_data, her_appl_version)) {
-- repl = 2;
-- krb5_net_write (context, p_fd, &repl, 1);
-- krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
-- N_("wrong sendauth application version (%s)", ""),
-- her_appl_version);
-- free (her_appl_version);
-- return KRB5_SENDAUTH_BADAPPLVERS;
-+ if ((bytes = krb5_net_read (context, p_fd, her_appl_version, len))) {
-+ /* PR/267884: String read must always conatain a terminating NUL */
-+ if (strnlen(her_appl_version, len) == len)
-+ her_appl_version[len-1] = '\0';
-+
-+ if (bytes != len ||
-+ !(*match_appl_version)(match_data, her_appl_version)) {
-+ repl = 2;
-+ krb5_net_write (context, p_fd, &repl, 1);
-+ krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS,
-+ N_("wrong sendauth application version (%s)", ""),
-+ her_appl_version);
-+ free (her_appl_version);
-+ return KRB5_SENDAUTH_BADAPPLVERS;
-+ }
- }
- free (her_appl_version);
-
diff --git a/security/heimdal-devel/files/patch-tools-heimdal-gssapi.pc.in b/security/heimdal-devel/files/patch-tools-heimdal-gssapi.pc.in
deleted file mode 100644
index 8e133986b39d..000000000000
--- a/security/heimdal-devel/files/patch-tools-heimdal-gssapi.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/heimdal-gssapi.pc.in.orig 2017-04-11 21:38:21 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.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-devel/files/patch-tools-krb5-config.in b/security/heimdal-devel/files/patch-tools-krb5-config.in
deleted file mode 100644
index 30d434611fe3..000000000000
--- a/security/heimdal-devel/files/patch-tools-krb5-config.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/krb5-config.in.orig 2017-04-11 21:38:21 UTC
-+++ tools/krb5-config.in
-@@ -85,6 +85,7 @@ for i in $*; do
- ;;
- --libs)
- do_libs=yes
-+ do_lib_deps=yes
- ;;
- --deps)
- do_lib_deps=yes
diff --git a/security/heimdal-devel/pkg-descr b/security/heimdal-devel/pkg-descr
deleted file mode 100644
index 5f407e6fc487..000000000000
--- a/security/heimdal-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Heimdal is an implementation of Kerberos 5, largely written in Sweden
-(due to crypto export legal issues in the US at the time). It is freely
-available under a three clause BSD style license.
diff --git a/security/heimdal-devel/pkg-message b/security/heimdal-devel/pkg-message
deleted file mode 100644
index e9c263eac41b..000000000000
--- a/security/heimdal-devel/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-{ type: install
- message: <<EOM
-heimdal-7.1.0_1 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
-your database.
-EOM
-}
-]
diff --git a/security/heimdal-devel/pkg-plist b/security/heimdal-devel/pkg-plist
deleted file mode 100644
index 4dfa99ea6d98..000000000000
--- a/security/heimdal-devel/pkg-plist
+++ /dev/null
@@ -1,763 +0,0 @@
-bin/afslog
-bin/asn1_compile
-bin/asn1_print
-bin/bsearch
-bin/gss-token
-bin/gsstool
-bin/heimtools
-bin/hxtool
-bin/idn-lookup
-bin/kadmin
-bin/kdestroy
-bin/kf
-bin/kgetcred
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb5-config
-bin/kswitch
-bin/ktutil
-bin/kx509
-bin/otp
-bin/otpprint
-bin/pagsh
-bin/rkbase32
-bin/rkbase64
-bin/rkvis
-bin/string2key
-bin/verify_krb5_conf
-include/heimdal/asn1-common.h
-include/heimdal/asn1_err.h
-include/heimdal/base32.h
-include/heimdal/base64.h
-include/heimdal/cms_asn1.h
-include/heimdal/cms_template_asn1.h
-include/heimdal/com_err.h
-include/heimdal/com_right.h
-include/heimdal/common_plugin.h
-include/heimdal/crmf_asn1.h
-include/heimdal/crmf_template_asn1.h
-include/heimdal/der-private.h
-include/heimdal/der-protos.h
-include/heimdal/der.h
-include/heimdal/digest_asn1.h
-include/heimdal/digest_template_asn1.h
-include/heimdal/getarg.h
-include/heimdal/gss-preauth-private.h
-include/heimdal/gss-preauth-protos.h
-include/heimdal/gssapi.h
-include/heimdal/gssapi/gkrb5_err.h
-include/heimdal/gssapi/gssapi.h
-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/gssapi/negoex_err.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/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
-include/heimdal/hdb_err.h
-include/heimdal/heim-ipc.h
-include/heimdal/heim_asn1.h
-include/heimdal/heim_err.h
-include/heimdal/heimbase-atomics.h
-include/heimdal/heimbase-protos.h
-include/heimdal/heimbase-svc.h
-include/heimdal/heimbase.h
-include/heimdal/heimntlm-protos.h
-include/heimdal/heimntlm.h
-include/heimdal/hex.h
-include/heimdal/hx509-protos.h
-include/heimdal/hx509.h
-include/heimdal/hx509_err.h
-include/heimdal/k524_err.h
-include/heimdal/k5e1_err.h
-include/heimdal/kadm5/admin.h
-include/heimdal/kadm5/kadm5-hook.h
-include/heimdal/kadm5/kadm5-private.h
-include/heimdal/kadm5/kadm5-protos.h
-include/heimdal/kadm5/kadm5-pwcheck.h
-include/heimdal/kadm5/kadm5_err.h
-include/heimdal/kadm5/private.h
-include/heimdal/kafs.h
-include/heimdal/kdc-protos.h
-include/heimdal/kdc.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/csr_authorizer_plugin.h
-include/heimdal/krb5/db_plugin.h
-include/heimdal/krb5/gss_preauth_authorizer_plugin.h
-include/heimdal/krb5/kdc-accessors.h
-include/heimdal/krb5/kdc-audit.h
-include/heimdal/krb5/kdc-plugin.h
-include/heimdal/krb5/kuserok_plugin.h
-include/heimdal/krb5/locate_plugin.h
-include/heimdal/krb5/send_to_kdc_plugin.h
-include/heimdal/krb5/token_validator_plugin.h
-include/heimdal/krb5_asn1.h
-include/heimdal/krb5_ccapi.h
-include/heimdal/krb5_err.h
-include/heimdal/krb5_template_asn1.h
-include/heimdal/kx509_asn1.h
-include/heimdal/kx509_err.h
-include/heimdal/kx509_template_asn1.h
-include/heimdal/ntlm_err.h
-include/heimdal/ocsp_asn1.h
-include/heimdal/ocsp_template_asn1.h
-include/heimdal/otp.h
-include/heimdal/parse_bytes.h
-include/heimdal/parse_time.h
-include/heimdal/parse_units.h
-include/heimdal/pkcs10_asn1.h
-include/heimdal/pkcs10_template_asn1.h
-include/heimdal/pkcs12_asn1.h
-include/heimdal/pkcs12_template_asn1.h
-include/heimdal/pkcs8_asn1.h
-include/heimdal/pkcs8_template_asn1.h
-include/heimdal/pkcs9_asn1.h
-include/heimdal/pkcs9_template_asn1.h
-include/heimdal/pkinit_asn1.h
-include/heimdal/pkinit_template_asn1.h
-include/heimdal/resolve.h
-include/heimdal/rfc2459_asn1.h
-include/heimdal/rfc2459_template_asn1.h
-include/heimdal/rfc4108_asn1.h
-include/heimdal/rfc4108_template_asn1.h
-include/heimdal/roken-common.h
-include/heimdal/roken.h
-include/heimdal/rtbl.h
-include/heimdal/sl.h
-include/heimdal/wind.h
-include/heimdal/wind_err.h
-include/heimdal/x690sample_asn1.h
-include/heimdal/x690sample_template_asn1.h
-include/heimdal/xdbm.h
-%%CRACKLIB%%lib/heimdal/kpasswdd-cracklib.so
-lib/heimdal/ipc_csr_authorizer.a
-lib/heimdal/ipc_csr_authorizer.so
-lib/heimdal/ipc_csr_authorizer.so.0
-lib/heimdal/ipc_csr_authorizer.so.0.0.0
-lib/heimdal/kdc_test_plugin.a
-lib/heimdal/kdc_test_plugin.so
-lib/heimdal/kdc_test_plugin.so.0
-lib/heimdal/kdc_test_plugin.so.0.0.0
-lib/heimdal/libasn1.a
-lib/heimdal/libasn1.so
-lib/heimdal/libasn1.so.8
-lib/heimdal/libasn1.so.8.0.0
-lib/heimdal/libasn1template.a
-lib/heimdal/libasn1template.so
-lib/heimdal/libasn1template.so.8
-lib/heimdal/libasn1template.so.8.0.0
-lib/heimdal/libcom_err.a
-lib/heimdal/libcom_err.so
-lib/heimdal/libcom_err.so.1
-lib/heimdal/libcom_err.so.1.1.3
-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.5
-lib/heimdal/libhcrypto.so.5.0.0
-lib/heimdal/libhdb.a
-lib/heimdal/libhdb.so
-lib/heimdal/libhdb.so.9
-lib/heimdal/libhdb.so.9.2.0
-lib/heimdal/libheimbase.a
-lib/heimdal/libheimbase.so
-lib/heimdal/libheimbase.so.1
-lib/heimdal/libheimbase.so.1.0.0
-lib/heimdal/libheimntlm.a
-lib/heimdal/libheimntlm.so
-lib/heimdal/libheimntlm.so.0
-lib/heimdal/libheimntlm.so.0.1.0
-%%NO_SQLITE%%lib/heimdal/libheimsqlite.a
-%%NO_SQLITE%%lib/heimdal/libheimsqlite.so
-%%NO_SQLITE%%lib/heimdal/libheimsqlite.so.0
-%%NO_SQLITE%%lib/heimdal/libheimsqlite.so.0.0.0
-lib/heimdal/libhx509.a
-lib/heimdal/libhx509.so
-lib/heimdal/libhx509.so.5
-lib/heimdal/libhx509.so.5.0.0
-lib/heimdal/libhx509template.a
-lib/heimdal/libhx509template.so
-lib/heimdal/libhx509template.so.5
-lib/heimdal/libhx509template.so.5.0.0
-lib/heimdal/libkadm5clnt.a
-lib/heimdal/libkadm5clnt.so
-lib/heimdal/libkadm5clnt.so.7
-lib/heimdal/libkadm5clnt.so.7.0.1
-lib/heimdal/libkadm5srv.a
-lib/heimdal/libkadm5srv.so
-lib/heimdal/libkadm5srv.so.8
-lib/heimdal/libkadm5srv.so.8.0.1
-lib/heimdal/libkafs.a
-lib/heimdal/libkafs.so
-lib/heimdal/libkafs.so.0
-lib/heimdal/libkafs.so.0.5.1
-lib/heimdal/libkdc.a
-lib/heimdal/libkdc.so
-lib/heimdal/libkdc.so.2
-lib/heimdal/libkdc.so.2.0.0
-lib/heimdal/libkrb5.a
-lib/heimdal/libkrb5.so
-lib/heimdal/libkrb5.so.26
-lib/heimdal/libkrb5.so.26.0.0
-lib/heimdal/libotp.a
-lib/heimdal/libotp.so
-lib/heimdal/libotp.so.0
-lib/heimdal/libotp.so.0.1.5
-lib/heimdal/libroken.a
-lib/heimdal/libroken.so
-lib/heimdal/libroken.so.19
-lib/heimdal/libroken.so.19.1.0
-lib/heimdal/libsl.a
-lib/heimdal/libsl.so
-lib/heimdal/libsl.so.0
-lib/heimdal/libsl.so.0.2.1
-lib/heimdal/libwind.a
-lib/heimdal/libwind.so
-lib/heimdal/libwind.so.0
-lib/heimdal/libwind.so.0.0.0
-lib/heimdal/negotiate_token_validator.a
-lib/heimdal/negotiate_token_validator.so
-lib/heimdal/negotiate_token_validator.so.0
-lib/heimdal/negotiate_token_validator.so.0.0.0
-lib/heimdal/test_negoex_mech.a
-lib/heimdal/test_negoex_mech.so
-lib/heimdal/test_negoex_mech.so.0
-lib/heimdal/test_negoex_mech.so.0.0.0
-%%MICROHTTPD%%libexec/bx509d
-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/heimdal/slc
-libexec/hprop
-libexec/hpropd
-%%MICROHTTPD%%libexec/httpkadmind
-libexec/ipropd-master
-libexec/ipropd-slave
-libexec/kadmind
-libexec/kcm
-libexec/kdc
-libexec/kdigest
-libexec/kfd
-libexec/kimpersonate
-libexec/kpasswdd
-libexec/test_csr_authorizer
-libexec/test_kdc_ca
-libexec/test_token_validator
-share/man/man1/afslog.1.gz
-share/man/man1/asn1_compile.1.gz
-share/man/man1/asn1_print.1.gz
-share/man/man1/bsearch.1.gz
-share/man/man1/gss-token.1.gz
-share/man/man1/kadmin.1.gz
-share/man/man1/kdestroy.1.gz
-share/man/man1/kf.1.gz
-share/man/man1/kgetcred.1.gz
-share/man/man1/kinit.1.gz
-share/man/man1/klist.1.gz
-share/man/man1/kpasswd.1.gz
-share/man/man1/krb5-config.1.gz
-share/man/man1/kswitch.1.gz
-share/man/man1/ktutil.1.gz
-share/man/man1/kx509.1.gz
-share/man/man1/otp.1.gz
-share/man/man1/otpprint.1.gz
-share/man/man1/pagsh.1.gz
-share/man/man3/arg_printusage.3.gz
-share/man/man3/ecalloc.3.gz
-share/man/man3/emalloc.3.gz
-share/man/man3/eread.3.gz
-share/man/man3/erealloc.3.gz
-share/man/man3/esetenv.3.gz
-share/man/man3/estrdup.3.gz
-share/man/man3/ewrite.3.gz
-share/man/man3/getarg.3.gz
-share/man/man3/gss_accept_sec_context.3.gz
-share/man/man3/gss_acquire_cred.3.gz
-share/man/man3/gss_add_cred.3.gz
-share/man/man3/gss_add_oid_set_member.3.gz
-share/man/man3/gss_canonicalize_name.3.gz
-share/man/man3/gss_compare_name.3.gz
-share/man/man3/gss_context_time.3.gz
-share/man/man3/gss_create_empty_oid_set.3.gz
-share/man/man3/gss_delete_sec_context.3.gz
-share/man/man3/gss_display_name.3.gz
-share/man/man3/gss_display_status.3.gz
-share/man/man3/gss_duplicate_name.3.gz
-share/man/man3/gss_export_name.3.gz
-share/man/man3/gss_export_sec_context.3.gz
-share/man/man3/gss_get_mic.3.gz
-share/man/man3/gss_import_name.3.gz
-share/man/man3/gss_import_sec_context.3.gz
-share/man/man3/gss_indicate_mechs.3.gz
-share/man/man3/gss_init_sec_context.3.gz
-share/man/man3/gss_inquire_context.3.gz
-share/man/man3/gss_inquire_cred.3.gz
-share/man/man3/gss_inquire_cred_by_mech.3.gz
-share/man/man3/gss_inquire_mechs_for_name.3.gz
-share/man/man3/gss_inquire_names_for_mech.3.gz
-share/man/man3/gss_krb5_ccache_name.3.gz
-share/man/man3/gss_krb5_compat_des3_mic.3.gz
-share/man/man3/gss_krb5_copy_ccache.3.gz
-share/man/man3/gss_krb5_get_tkt_flags.3.gz
-share/man/man3/gss_krb5_import_ccache.3.gz
-share/man/man3/gss_krb5_import_cred.3.gz
-share/man/man3/gss_process_context_token.3.gz
-share/man/man3/gss_release_buffer.3.gz
-share/man/man3/gss_release_cred.3.gz
-share/man/man3/gss_release_name.3.gz
-share/man/man3/gss_release_oid_set.3.gz
-share/man/man3/gss_seal.3.gz
-share/man/man3/gss_sign.3.gz
-share/man/man3/gss_test_oid_set_member.3.gz
-share/man/man3/gss_unseal.3.gz
-share/man/man3/gss_unwrap.3.gz
-share/man/man3/gss_verify.3.gz
-share/man/man3/gss_verify_mic.3.gz
*** 407 LINES SKIPPED ***