diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2017-06-10 19:32:46 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2017-06-10 19:32:46 +0000 |
commit | 60e50d5d8fccd6143174c58065ec4ba270a67073 (patch) | |
tree | a45e7125f5e76fe8916e2f869d8032cdaa9d61b2 /security/heimdal | |
parent | adc495297b72d52daf46fb435cb35cd60fc68b29 (diff) | |
download | ports-60e50d5d8fccd6143174c58065ec4ba270a67073.tar.gz ports-60e50d5d8fccd6143174c58065ec4ba270a67073.zip |
Notes
Diffstat (limited to 'security/heimdal')
26 files changed, 60 insertions, 234 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 6b2c0bdc42d6..d68541314910 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -2,13 +2,9 @@ # $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 @@ -16,8 +12,6 @@ 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]* diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index 93eac224405c..f6a20f3ee5eb 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -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 diff --git a/security/heimdal/files/patch-CVE-2017-6594 b/security/heimdal/files/patch-CVE-2017-6594 deleted file mode 100644 index 0a44a32b648d..000000000000 --- a/security/heimdal/files/patch-CVE-2017-6594 +++ /dev/null @@ -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 diff --git a/security/heimdal/files/patch-admin-Makefile.in b/security/heimdal/files/patch-admin-Makefile.in index bfc511d04b04..f537d71ac5c5 100644 --- a/security/heimdal/files/patch-admin-Makefile.in +++ b/security/heimdal/files/patch-admin-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-appl-afsutil-Makefile.in b/security/heimdal/files/patch-appl-afsutil-Makefile.in index 2d463d6d2d1d..6581db759712 100644 --- a/security/heimdal/files/patch-appl-afsutil-Makefile.in +++ b/security/heimdal/files/patch-appl-afsutil-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-appl-gssmask-Makefile.in b/security/heimdal/files/patch-appl-gssmask-Makefile.in index 481eb252361e..ecd21f3566d6 100644 --- a/security/heimdal/files/patch-appl-gssmask-Makefile.in +++ b/security/heimdal/files/patch-appl-gssmask-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-appl-kf-Makefile.in b/security/heimdal/files/patch-appl-kf-Makefile.in index c9f064961c3b..be9cca3788bc 100644 --- a/security/heimdal/files/patch-appl-kf-Makefile.in +++ b/security/heimdal/files/patch-appl-kf-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-appl-su-Makefile.in b/security/heimdal/files/patch-appl-su-Makefile.in index d378ea93226b..cbfd59a0b369 100644 --- a/security/heimdal/files/patch-appl-su-Makefile.in +++ b/security/heimdal/files/patch-appl-su-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-appl-test-Makefile.in b/security/heimdal/files/patch-appl-test-Makefile.in index 619d0025905c..957346602a32 100644 --- a/security/heimdal/files/patch-appl-test-Makefile.in +++ b/security/heimdal/files/patch-appl-test-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -63,7 +63,7 @@ $(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 diff --git a/security/heimdal/files/patch-configure b/security/heimdal/files/patch-configure index 7644e01c779c..d9ee7d0437e2 100644 --- a/security/heimdal/files/patch-configure +++ b/security/heimdal/files/patch-configure @@ -1,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ ;; *-*-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 @@ -18,7 +18,7 @@ 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 @@ -28,7 +28,7 @@ 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="" diff --git a/security/heimdal/files/patch-doc__Makefile.in b/security/heimdal/files/patch-doc__Makefile.in index 29b24841673f..02aed85bc416 100644 --- a/security/heimdal/files/patch-doc__Makefile.in +++ b/security/heimdal/files/patch-doc__Makefile.in @@ -1,6 +1,6 @@ ---- 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' @@ -9,7 +9,7 @@ heimdal_TEXINFOS = \ ack.texi \ apps.texi \ -@@ -524,7 +524,6 @@ EXTRA_DIST = \ +@@ -525,7 +525,6 @@ EXTRA_DIST = \ footer.html \ gssapi.din \ hdb.din \ @@ -17,7 +17,7 @@ header.html \ heimdal.css \ base.din \ -@@ -542,7 +541,6 @@ EXTRA_DIST = \ +@@ -543,7 +542,6 @@ EXTRA_DIST = \ vars.tin CLEANFILES = \ @@ -25,7 +25,7 @@ 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 @@ -37,12 +37,12 @@ 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 ; \ diff --git a/security/heimdal/files/patch-kadmin-Makefile.in b/security/heimdal/files/patch-kadmin-Makefile.in index c6db200d36d6..7cc60a6a8868 100644 --- a/security/heimdal/files/patch-kadmin-Makefile.in +++ b/security/heimdal/files/patch-kadmin-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -27,7 +27,7 @@ ../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 \ @@ -36,7 +36,7 @@ $(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 \ @@ -45,7 +45,7 @@ $(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 \ diff --git a/security/heimdal/files/patch-kcm-Makefile.in b/security/heimdal/files/patch-kcm-Makefile.in index 43d53ac2ec74..7655f9ec2585 100644 --- a/security/heimdal/files/patch-kcm-Makefile.in +++ b/security/heimdal/files/patch-kcm-Makefile.in @@ -1,4 +1,4 @@ ---- 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) \ diff --git a/security/heimdal/files/patch-kdc-Makefile.in b/security/heimdal/files/patch-kdc-Makefile.in index d8689840d282..8ce138115063 100644 --- a/security/heimdal/files/patch-kdc-Makefile.in +++ b/security/heimdal/files/patch-kdc-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -74,7 +74,7 @@ $(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 \ @@ -83,7 +83,7 @@ $(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 \ @@ -92,7 +92,7 @@ $(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) diff --git a/security/heimdal/files/patch-kpasswd-Makefile.in b/security/heimdal/files/patch-kpasswd-Makefile.in index 84283115317d..f12778e5c193 100644 --- a/security/heimdal/files/patch-kpasswd-Makefile.in +++ b/security/heimdal/files/patch-kpasswd-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -38,7 +38,7 @@ $(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 \ diff --git a/security/heimdal/files/patch-kuser-Makefile.in b/security/heimdal/files/patch-kuser-Makefile.in index ee0820a00c1f..4b6fb795548b 100644 --- a/security/heimdal/files/patch-kuser-Makefile.in +++ b/security/heimdal/files/patch-kuser-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -72,7 +72,7 @@ $(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) \ @@ -81,7 +81,7 @@ $(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 \ diff --git a/security/heimdal/files/patch-lib-base-Makefile.in b/security/heimdal/files/patch-lib-base-Makefile.in index a207fdd0f4de..ed5554e33505 100644 --- a/security/heimdal/files/patch-lib-base-Makefile.in +++ b/security/heimdal/files/patch-lib-base-Makefile.in @@ -1,4 +1,4 @@ ---- 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 @@ -14,7 +14,7 @@ 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) diff --git a/security/heimdal/files/patch-lib-gssapi-Makefile.in b/security/heimdal/files/patch-lib-gssapi-Makefile.in index 291274eb232c..876a1e24f902 100644 --- a/security/heimdal/files/patch-lib-gssapi-Makefile.in +++ b/security/heimdal/files/patch-lib-gssapi-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -70,7 +70,7 @@ 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 \ @@ -80,7 +80,7 @@ $(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 \ diff --git a/security/heimdal/files/patch-lib-hdb-Makefile.in b/security/heimdal/files/patch-lib-hdb-Makefile.in index 4f75e6894351..2d9d3440ca38 100644 --- a/security/heimdal/files/patch-lib-hdb-Makefile.in +++ b/security/heimdal/files/patch-lib-hdb-Makefile.in @@ -1,4 +1,4 @@ ---- 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) @@ -51,7 +51,7 @@ ../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 \ diff --git a/security/heimdal/files/patch-lib-hx509-Makefile.in b/security/heimdal/files/patch-lib-hx509-Makefile.in index b9451bbe7407..7ed77c1130f2 100644 --- a/security/heimdal/files/patch-lib-hx509-Makefile.in +++ b/security/heimdal/files/patch-lib-hx509-Makefile.in @@ -1,6 +1,6 @@ ---- 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) \ diff --git a/security/heimdal/files/patch-lib-kadm5-Makefile.in b/security/heimdal/files/patch-lib-kadm5-Makefile.in index be5b92a247cd..04a627fa705e 100644 --- a/security/heimdal/files/patch-lib-kadm5-Makefile.in +++ b/security/heimdal/files/patch-lib-kadm5-Makefile.in @@ -1,4 +1,4 @@ ---- 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 \ @@ -57,7 +57,7 @@ $(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 \ @@ -66,7 +66,7 @@ $(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 diff --git a/security/heimdal/files/patch-lib-krb5-Makefile.in b/security/heimdal/files/patch-lib-krb5-Makefile.in index bd94b9eee182..2325bfd846c3 100644 --- a/security/heimdal/files/patch-lib-krb5-Makefile.in +++ b/security/heimdal/files/patch-lib-krb5-Makefile.in @@ -1,4 +1,4 @@ ---- 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) diff --git a/security/heimdal/files/patch-lib-roken-Makefile.in b/security/heimdal/files/patch-lib-roken-Makefile.in index e6f839eac50a..80eb4c156cff 100644 --- a/security/heimdal/files/patch-lib-roken-Makefile.in +++ b/security/heimdal/files/patch-lib-roken-Makefile.in @@ -1,4 +1,4 @@ ---- 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; }; \ @@ -20,7 +20,7 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is -@@ -2274,7 +2272,7 @@ check: $(BUILT_SOURCES) +@@ -2275,7 +2273,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ all-local installdirs: @@ -29,7 +29,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -2338,8 +2336,7 @@ info: info-am +@@ -2339,8 +2337,7 @@ info: info-am info-am: install-data-am: install-dist_includeHEADERS install-man \ diff --git a/security/heimdal/files/patch-lib__sl__slc-lex.l b/security/heimdal/files/patch-lib__sl__slc-lex.l index 66cbe1001bfe..c9d450472321 100644 --- a/security/heimdal/files/patch-lib__sl__slc-lex.l +++ b/security/heimdal/files/patch-lib__sl__slc-lex.l @@ -1,4 +1,4 @@ ---- 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); diff --git a/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in index a2e7ca28e2e5..8e133986b39d 100644 --- a/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in +++ b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in @@ -1,4 +1,4 @@ ---- 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@ diff --git a/security/heimdal/files/patch-tools-krb5-config.in b/security/heimdal/files/patch-tools-krb5-config.in index 2cc93d3e971e..30d434611fe3 100644 --- a/security/heimdal/files/patch-tools-krb5-config.in +++ b/security/heimdal/files/patch-tools-krb5-config.in @@ -1,6 +1,6 @@ ---- 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 |