Index: head/security/heimdal/Makefile =================================================================== --- head/security/heimdal/Makefile (revision 443114) +++ head/security/heimdal/Makefile (revision 443115) @@ -1,126 +1,120 @@ # Created by: nectar@FreeBSD.org # $FreeBSD$ PORTNAME= heimdal -PORTVERSION= 7.1.0 -PORTREVISION= 3 +PORTVERSION= 7.3.0 CATEGORIES= security ipv6 -MASTER_SITES= http://www.h5l.org/dist/src/ \ - http://ftp.pdc.kth.se/pub/heimdal/src/ \ - ftp://ftp.pdc.kth.se/pub/heimdal/src/ \ - ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/ +MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/ MAINTAINER= hrs@FreeBSD.org COMMENT= Popular BSD-licensed implementation of Kerberos 5 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON CONFLICTS= krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \ wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]* USES= gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ pkgconfig readline makeinfo ssl USE_LDCONFIG= ${GSSAPILIBDIR} 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_db5_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" # 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 INFO= heimdal hx509 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= IPV6 BDB LMDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB OPTIONS_DEFAULT= 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_USE= OPENLDAP=yes 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 .include .if ${PORT_OPTIONS:MLDAP} WANT_OPENLDAP_SASL?= yes .endif post-extract: @${MKDIR} ${WRKSRC}/kpasswdd-cracklib ${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \ ${WRKSRC}/kpasswdd-cracklib ${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \ ${WRKSRC}/kpasswdd-cracklib/Makefile 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 Index: head/security/heimdal/distinfo =================================================================== --- head/security/heimdal/distinfo (revision 443114) +++ head/security/heimdal/distinfo (revision 443115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483392507 -SHA256 (heimdal-7.1.0.tar.gz) = cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d -SIZE (heimdal-7.1.0.tar.gz) = 9925587 +TIMESTAMP = 1497116797 +SHA256 (heimdal-7.3.0.tar.gz) = 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 +SIZE (heimdal-7.3.0.tar.gz) = 9927966 Index: head/security/heimdal/files/patch-CVE-2017-6594 =================================================================== --- head/security/heimdal/files/patch-CVE-2017-6594 (revision 443114) +++ head/security/heimdal/files/patch-CVE-2017-6594 (nonexistent) @@ -1,168 +0,0 @@ -diff -ru NEWS NEWS ---- NEWS 2016-11-29 01:35:27.000000000 +0000 -+++ NEWS 2017-06-03 15:23:36.264325000 +0000 -@@ -1,4 +1,18 @@ --Release Notes - Heimdal - Version Heimdal 1.6 -+Release Notes - Heimdal - Version Heimdal 7.1.0,2 (FreeBSD port) -+ -+ Security -+ -+ - Fix transit path validation. Commit f469fc6 (2010-10-02) inadvertently -+ caused the previous hop realm to not be added to the transit path -+ of issued tickets. This may, in some cases, enable bypass of capath -+ policy in Heimdal versions 1.5 through 7.2. -+ -+ Note, this may break sites that rely on the bug. With the bug some -+ incomplete [capaths] worked, that should not have. These may now break -+ authentication in some cross-realm configurations. -+ (CVE-2017-6594) -+ -+Release Notes - Heimdal - Version Heimdal 7.1 - - Security - - ... -diff -ru kdc/krb5tgs.c kdc/krb5tgs.c ---- kdc/krb5tgs.c 2016-11-29 01:35:27.000000000 +0000 -+++ kdc/krb5tgs.c 2017-06-03 15:23:36.271738000 +0000 -@@ -655,8 +655,12 @@ - "Decoding transited encoding"); - return ret; - } -+ -+ /* -+ * If the realm of the presented tgt is neither the client nor the server -+ * realm, it is a transit realm and must be added to transited set. -+ */ - if(strcmp(client_realm, tgt_realm) && strcmp(server_realm, tgt_realm)) { -- /* not us, so add the previous realm to transited set */ - if (num_realms + 1 > UINT_MAX/sizeof(*realms)) { - ret = ERANGE; - goto free_realms; -@@ -737,6 +741,7 @@ - const char *server_name, - hdb_entry_ex *client, - krb5_principal client_principal, -+ const char *tgt_realm, - hdb_entry_ex *krbtgt, - krb5_enctype krbtgt_etype, - krb5_principals spp, -@@ -798,7 +803,7 @@ - &tgt->transited, &et, - krb5_principal_get_realm(context, client_principal), - krb5_principal_get_realm(context, server->entry.principal), -- krb5_principal_get_realm(context, krbtgt->entry.principal)); -+ tgt_realm); - if(ret) - goto out; - -@@ -1519,6 +1524,8 @@ - krb5_keyblock sessionkey; - krb5_kvno kvno; - krb5_data rspac; -+ const char *tgt_realm = /* Realm of TGT issuer */ -+ krb5_principal_get_realm(context, krbtgt->entry.principal); - const char *our_realm = /* Realm of this KDC */ - krb5_principal_get_comp_string(context, krbtgt->entry.principal, 1); - char **capath = NULL; -@@ -2324,6 +2331,7 @@ - spn, - client, - cp, -+ tgt_realm, - krbtgt_out, - tkey_sign->key.keytype, - spp, -diff -ru tests/kdc/check-kdc.in tests/kdc/check-kdc.in ---- tests/kdc/check-kdc.in 2016-12-14 18:01:18.000000000 +0000 -+++ tests/kdc/check-kdc.in 2017-06-03 15:23:36.276571000 +0000 -@@ -53,6 +53,7 @@ - R5=SOME-REALM5.FR - R6=SOME-REALM6.US - R7=SOME-REALM7.UK -+R8=SOME-REALM8.UK - - H1=H1.$R - H2=H2.$R -@@ -152,6 +153,12 @@ - init \ - --realm-max-ticket-life=1day \ - --realm-max-renewable-life=1month \ -+ ${R8} || exit 1 -+ -+${kadmin} \ -+ init \ -+ --realm-max-ticket-life=1day \ -+ --realm-max-renewable-life=1month \ - ${H1} || exit 1 - - ${kadmin} \ -@@ -191,6 +198,7 @@ - ${kadmin5} add -p foo --use-defaults foo@${R5} || exit 1 - ${kadmin} add -p foo --use-defaults foo@${R6} || exit 1 - ${kadmin} add -p foo --use-defaults foo@${R7} || exit 1 -+${kadmin} add -p foo --use-defaults foo@${R8} || exit 1 - ${kadmin} add -p foo --use-defaults foo@${H1} || exit 1 - ${kadmin} add -p foo --use-defaults foo/host.${h1}@${H1} || exit 1 - ${kadmin} add -p foo --use-defaults foo@${H2} || exit 1 -@@ -249,6 +257,9 @@ - ${kadmin} add -p cross1 --use-defaults krbtgt/${R7}@${R6} || exit 1 - ${kadmin} add -p cross2 --use-defaults krbtgt/${R6}@${R7} || exit 1 - -+${kadmin} add -p cross1 --use-defaults krbtgt/${R8}@${R6} || exit 1 -+${kadmin} add -p cross2 --use-defaults krbtgt/${R6}@${R8} || exit 1 -+ - ${kadmin} add -p cross1 --use-defaults krbtgt/${H1}@${R} || exit 1 - ${kadmin} add -p cross2 --use-defaults krbtgt/${R}@${H1} || exit 1 - -@@ -284,6 +295,7 @@ - ${kadmin5} check ${R5} || exit 1 - ${kadmin} check ${R6} || exit 1 - ${kadmin} check ${R7} || exit 1 -+${kadmin} check ${R8} || exit 1 - ${kadmin} check ${H1} || exit 1 - ${kadmin} check ${H2} || exit 1 - ${kadmin} check ${H3} || exit 1 -@@ -388,6 +400,8 @@ - ${kgetcred} foo@${R6} || { ec=1 ; eval "${testfailed}"; } - echo "Getting x-realm tickets with capaths for $R -> $R7" - ${kgetcred} foo@${R7} || { ec=1 ; eval "${testfailed}"; } -+echo "Should not get x-realm tickets with capaths for $R -> $R8" -+${kgetcred} foo@${R8} && { ec=1 ; eval "${testfailed}"; } - ${kdestroy} - - echo "Testing capaths logic (reverse order)" -@@ -418,10 +432,13 @@ - - echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $H1" - ${kgetcred} --hostbased --canonicalize foo host.${h1} || { ec=1 ; eval "${testfailed}"; } -+fgrep "cross-realm ${H3} -> ${H1} via [${H2}, ${R}]" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } - echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $R" - ${kgetcred} --hostbased --canonicalize foo host.${r} || { ec=1 ; eval "${testfailed}"; } -+fgrep "cross-realm ${H3} -> ${R} via [${H2}]" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } - echo "Getting x-realm tickets with hierarchical referrals for $H3 -> $H2" - ${kgetcred} --hostbased --canonicalize foo host.${h2} || { ec=1 ; eval "${testfailed}"; } -+fgrep "cross-realm ${H3} -> ${H2}" messages.log > /dev/null || { ec=1 ; eval "${testfailed}"; } - ${kdestroy} - - echo "Testing multi-hop [capaths] referral logic" -diff -ru tests/kdc/krb5.conf.in tests/kdc/krb5.conf.in ---- tests/kdc/krb5.conf.in 2016-11-29 01:35:28.000000000 +0000 -+++ tests/kdc/krb5.conf.in 2017-06-03 15:23:36.278848000 +0000 -@@ -40,6 +40,9 @@ - SOME-REALM7.UK = { - kdc = localhost:@port@ - } -+ SOME-REALM8.UK = { -+ kdc = localhost:@port@ -+ } - TEST-HTTP.H5L.SE = { - kdc = http/localhost:@port@ - } -@@ -147,6 +150,7 @@ - SOME-REALM6.US = SOME-REALM5.FR - SOME-REALM7.UK = SOME-REALM6.US - SOME-REALM7.UK = SOME-REALM5.FR -+ SOME-REALM8.UK = SOME-REALM6.US - } - H4.H2.TEST.H5L.SE = { - H1.TEST.H5L.SE = H3.H2.TEST.H5L.SE Property changes on: head/security/heimdal/files/patch-CVE-2017-6594 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/heimdal/files/patch-admin-Makefile.in =================================================================== --- head/security/heimdal/files/patch-admin-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-admin-Makefile.in (revision 443115) @@ -1,17 +1,17 @@ ---- admin/Makefile.in.orig 2017-01-03 19:44:18 UTC +--- admin/Makefile.in.orig 2017-06-10 19:27:47 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) \ Index: head/security/heimdal/files/patch-appl-afsutil-Makefile.in =================================================================== --- head/security/heimdal/files/patch-appl-afsutil-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-appl-afsutil-Makefile.in (revision 443115) @@ -1,36 +1,36 @@ ---- appl/afsutil/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- appl/afsutil/Makefile.in.orig 2017-06-10 19:27:47 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@) Index: head/security/heimdal/files/patch-appl-gssmask-Makefile.in =================================================================== --- head/security/heimdal/files/patch-appl-gssmask-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-appl-gssmask-Makefile.in (revision 443115) @@ -1,35 +1,35 @@ ---- appl/gssmask/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- appl/gssmask/Makefile.in.orig 2017-06-10 19:27:47 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@) Index: head/security/heimdal/files/patch-appl-kf-Makefile.in =================================================================== --- head/security/heimdal/files/patch-appl-kf-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-appl-kf-Makefile.in (revision 443115) @@ -1,31 +1,31 @@ ---- appl/kf/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- appl/kf/Makefile.in.orig 2017-06-10 19:27:47 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@) Index: head/security/heimdal/files/patch-appl-su-Makefile.in =================================================================== --- head/security/heimdal/files/patch-appl-su-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-appl-su-Makefile.in (revision 443115) @@ -1,20 +1,20 @@ ---- appl/su/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- appl/su/Makefile.in.orig 2017-06-10 19:27:47 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@) Index: head/security/heimdal/files/patch-appl-test-Makefile.in =================================================================== --- head/security/heimdal/files/patch-appl-test-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-appl-test-Makefile.in (revision 443115) @@ -1,81 +1,81 @@ ---- appl/test/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- appl/test/Makefile.in.orig 2017-06-10 19:27:47 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_ +@@ -546,9 +566,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) Index: head/security/heimdal/files/patch-configure =================================================================== --- head/security/heimdal/files/patch-configure (revision 443114) +++ head/security/heimdal/files/patch-configure (revision 443115) @@ -1,39 +1,39 @@ ---- configure.orig 2016-12-20 04:24:03 UTC +--- configure.orig 2017-04-11 21:56:39 UTC +++ configure -@@ -16126,7 +16126,7 @@ +@@ -16128,7 +16128,7 @@ case "$host" in ;; *-*-freebsd*) native_pthread_support=yes - PTHREAD_LIBADD="-pthread" + PTHREAD_LIBADD="-lpthread" ;; *-*-openbsd*) native_pthread_support=yes -@@ -16362,7 +16362,7 @@ +@@ -16364,7 +16364,7 @@ if ${ac_cv_funclib_db_create+:} false; t $as_echo_n "(cached) " >&6 else -if eval "test \"\$ac_cv_func_db_create\" != yes" ; then +if eval "test \"\$ac_cv_func_db_create\" = yes" ; then ac_save_LIBS="$LIBS" for ac_lib in "" $dbheader db-5 db5 db4 db3 db; do case "$ac_lib" in -@@ -16935,6 +16935,9 @@ +@@ -16937,6 +16937,9 @@ esac $as_echo "#define HAVE_NDBM 1" >>confdefs.h have_ndbm=yes + if test "$db_type" = "unknown"; then + db_type=ndbm + fi else $as_unset ac_cv_func_dbm_firstkey -@@ -28685,7 +28688,7 @@ +@@ -28688,7 +28691,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}" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5 Index: head/security/heimdal/files/patch-doc__Makefile.in =================================================================== --- head/security/heimdal/files/patch-doc__Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-doc__Makefile.in (revision 443115) @@ -1,48 +1,48 @@ ---- doc/Makefile.in.orig 2017-01-03 19:44:12 UTC +--- doc/Makefile.in.orig 2017-06-10 19:27:47 UTC +++ doc/Makefile.in -@@ -501,7 +501,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc +@@ -502,7 +502,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc -e 's,[@]dbtype[@],$(db_type),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' -PROJECTS = base hdb hx509 gssapi krb5 ntlm wind hcrypto +PROJECTS = base hdb hx509 gssapi krb5 ntlm wind heimdal_TEXINFOS = \ ack.texi \ apps.texi \ -@@ -524,7 +524,6 @@ EXTRA_DIST = \ +@@ -525,7 +525,6 @@ EXTRA_DIST = \ footer.html \ gssapi.din \ hdb.din \ - hcrypto.din \ header.html \ heimdal.css \ base.din \ -@@ -542,7 +541,6 @@ EXTRA_DIST = \ +@@ -543,7 +542,6 @@ EXTRA_DIST = \ vars.tin CLEANFILES = \ - hcrypto.dxy* \ base.dxy* \ hx509.dxy* \ hdb.dxy* \ -@@ -1199,11 +1197,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP +@@ -1200,11 +1198,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP fi ; \ done -hcrypto.dxy: hcrypto.din Makefile - $(dxy_subst) < $(srcdir)/hcrypto.din > hcrypto.dxy.tmp - chmod +x hcrypto.dxy.tmp - mv hcrypto.dxy.tmp hcrypto.dxy - hdb.dxy: hdb.din Makefile $(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp chmod +x hdb.dxy.tmp -@@ -1244,7 +1237,7 @@ vars.texi: vars.tin Makefile +@@ -1245,7 +1238,7 @@ vars.texi: vars.tin Makefile chmod +x vars.texi.tmp mv vars.texi.tmp vars.texi -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 {} ';' ; \ + @test -d $(srcdir)/doxyout && \ + find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \ rm -rf $(srcdir)/doxyout ; \ - mkdir $(srcdir)/doxyout ; \ Index: head/security/heimdal/files/patch-kadmin-Makefile.in =================================================================== --- head/security/heimdal/files/patch-kadmin-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-kadmin-Makefile.in (revision 443115) @@ -1,56 +1,56 @@ ---- kadmin/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- kadmin/Makefile.in.orig 2017-06-10 19:27:47 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 = \ +@@ -771,6 +777,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 +@@ -778,6 +786,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 = \ +@@ -786,6 +796,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) Index: head/security/heimdal/files/patch-kcm-Makefile.in =================================================================== --- head/security/heimdal/files/patch-kcm-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-kcm-Makefile.in (revision 443115) @@ -1,16 +1,16 @@ ---- kcm/Makefile.in.orig 2017-01-03 19:44:13 UTC +--- kcm/Makefile.in.orig 2017-06-10 19:27:47 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) \ Index: head/security/heimdal/files/patch-kdc-Makefile.in =================================================================== --- head/security/heimdal/files/patch-kdc-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-kdc-Makefile.in (revision 443115) @@ -1,122 +1,122 @@ ---- kdc/Makefile.in.orig 2017-01-03 19:44:12 UTC +--- kdc/Makefile.in.orig 2017-06-10 19:27:47 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 +@@ -637,6 +657,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 = \ +@@ -646,6 +668,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 +@@ -672,17 +696,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 Index: head/security/heimdal/files/patch-kpasswd-Makefile.in =================================================================== --- head/security/heimdal/files/patch-kpasswd-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-kpasswd-Makefile.in (revision 443115) @@ -1,49 +1,49 @@ ---- kpasswd/Makefile.in.orig 2017-01-03 19:44:14 UTC +--- kpasswd/Makefile.in.orig 2017-06-10 19:27:47 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 +@@ -533,6 +543,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) \ Index: head/security/heimdal/files/patch-kuser-Makefile.in =================================================================== --- head/security/heimdal/files/patch-kuser-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-kuser-Makefile.in (revision 443115) @@ -1,92 +1,92 @@ ---- kuser/Makefile.in.orig 2017-01-03 19:44:13 UTC +--- kuser/Makefile.in.orig 2017-06-10 19:27:47 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 = \ +@@ -584,6 +605,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 +@@ -605,6 +628,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 \ Index: head/security/heimdal/files/patch-lib-base-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-base-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-base-Makefile.in (revision 443115) @@ -1,25 +1,25 @@ ---- lib/base/Makefile.in.orig 2017-01-03 19:44:15 UTC +--- lib/base/Makefile.in.orig 2017-06-10 19:27:47 UTC +++ lib/base/Makefile.in @@ -222,11 +222,11 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDE_libintl) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) + $(AM_CFLAGS) $(CFLAGS) $(INCLUDE_libintl) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -@@ -705,7 +705,7 @@ heim_verbose_0 = @echo " GEN "$@; +@@ -706,7 +706,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 \ Index: head/security/heimdal/files/patch-lib-gssapi-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-gssapi-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-gssapi-Makefile.in (revision 443115) @@ -1,92 +1,92 @@ ---- lib/gssapi/Makefile.in.orig 2017-01-03 19:44:17 UTC +--- lib/gssapi/Makefile.in.orig 2017-06-10 19:27:47 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 +@@ -1104,6 +1132,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 +@@ -1117,6 +1148,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) Index: head/security/heimdal/files/patch-lib-hdb-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-hdb-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-hdb-Makefile.in (revision 443115) @@ -1,63 +1,63 @@ ---- lib/hdb/Makefile.in.orig 2017-01-03 19:44:16 UTC +--- lib/hdb/Makefile.in.orig 2017-06-10 19:27:47 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 "$@; +@@ -575,7 +595,8 @@ heim_verbose_0 = @echo " GEN "$@; BUILT_SOURCES = \ $(gen_files_hdb:.x=.c) \ hdb_err.c \ - hdb_err.h + hdb_err.h \ + hdb_asn1.h gen_files_hdb = \ asn1_Salt.x \ Index: head/security/heimdal/files/patch-lib-hx509-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-hx509-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-hx509-Makefile.in (revision 443115) @@ -1,13 +1,13 @@ ---- lib/hx509/Makefile.in.orig 2017-01-03 19:44:16 UTC +--- lib/hx509/Makefile.in.orig 2017-06-10 19:27:47 UTC +++ lib/hx509/Makefile.in -@@ -859,7 +859,9 @@ hxtool_LDADD = \ +@@ -860,7 +860,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 \ Index: head/security/heimdal/files/patch-lib-kadm5-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-kadm5-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-kadm5-Makefile.in (revision 443115) @@ -1,77 +1,77 @@ ---- lib/kadm5/Makefile.in.orig 2017-01-03 19:44:15 UTC +--- lib/kadm5/Makefile.in.orig 2017-06-10 19:27:47 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 = \ +@@ -731,6 +745,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 \ -@@ -1166,7 +1182,7 @@ libkadm5srv_la-get_princs_s.lo: get_prin +@@ -1167,7 +1183,7 @@ libkadm5srv_la-get_princs_s.lo: get_prin @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5srv_la-get_princs_s.lo `test -f 'get_princs_s.c' || echo '$(srcdir)/'`get_princs_s.c libkadm5srv_la-get_s.lo: get_s.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5srv_la-get_s.lo -MD -MP -MF $(DEPDIR)/libkadm5srv_la-get_s.Tpo -c -o libkadm5srv_la-get_s.lo `test -f 'get_s.c' || echo '$(srcdir)/'`get_s.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(INCLUDE_libintl) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5srv_la-get_s.lo -MD -MP -MF $(DEPDIR)/libkadm5srv_la-get_s.Tpo -c -o libkadm5srv_la-get_s.lo `test -f 'get_s.c' || echo '$(srcdir)/'`get_s.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5srv_la-get_s.Tpo $(DEPDIR)/libkadm5srv_la-get_s.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='get_s.c' object='libkadm5srv_la-get_s.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ Index: head/security/heimdal/files/patch-lib-krb5-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-krb5-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-krb5-Makefile.in (revision 443115) @@ -1,124 +1,124 @@ ---- lib/krb5/Makefile.in.orig 2017-01-03 19:44:17 UTC +--- lib/krb5/Makefile.in.orig 2017-06-10 19:27:47 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@) Index: head/security/heimdal/files/patch-lib-roken-Makefile.in =================================================================== --- head/security/heimdal/files/patch-lib-roken-Makefile.in (revision 443114) +++ head/security/heimdal/files/patch-lib-roken-Makefile.in (revision 443115) @@ -1,41 +1,41 @@ ---- lib/roken/Makefile.in.orig 2017-01-03 19:44:15 UTC +--- lib/roken/Makefile.in.orig 2017-06-10 19:27:47 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) \ @@ -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) 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) +@@ -2275,7 +2273,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ all-local installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(rokenincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -2338,8 +2336,7 @@ info: info-am +@@ -2339,8 +2337,7 @@ info: info-am info-am: install-data-am: install-dist_includeHEADERS install-man \ - install-nodist_includeHEADERS \ - install-nodist_rokenincludeHEADERS + install-nodist_includeHEADERS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am Index: head/security/heimdal/files/patch-lib__sl__slc-lex.l =================================================================== --- head/security/heimdal/files/patch-lib__sl__slc-lex.l (revision 443114) +++ head/security/heimdal/files/patch-lib__sl__slc-lex.l (revision 443115) @@ -1,11 +1,11 @@ ---- lib/sl/slc-lex.l.orig 2016-11-29 01:35:27 UTC +--- 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 %} Index: head/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in =================================================================== --- head/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in (revision 443114) +++ head/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in (revision 443115) @@ -1,10 +1,10 @@ ---- tools/heimdal-gssapi.pc.in.orig 2016-12-14 18:01:18 UTC +--- 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} Index: head/security/heimdal/files/patch-tools-krb5-config.in =================================================================== --- head/security/heimdal/files/patch-tools-krb5-config.in (revision 443114) +++ head/security/heimdal/files/patch-tools-krb5-config.in (revision 443115) @@ -1,10 +1,10 @@ ---- tools/krb5-config.in.orig 2017-01-04 10:37:40.213263000 +0900 -+++ tools/krb5-config.in 2017-01-04 10:37:56.622658000 +0900 -@@ -82,6 +82,7 @@ +--- 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