svn commit: r430468 - in head/security/heimdal: . files
Hiroki Sato
hrs at FreeBSD.org
Tue Jan 3 13:52:09 UTC 2017
Author: hrs
Date: Tue Jan 3 13:52:06 2017
New Revision: 430468
URL: https://svnweb.freebsd.org/changeset/ports/430468
Log:
Update to 7.1.0. Changes include:
- hcrypto is now thread safe on all platforms and as much as possible
hcrypto now uses the operating system's preferred crypto
implementation ensuring that optimized hardware assisted
implementations of AES-NI are used.
- RFC 6113 Generalized Framework for Kerberos Pre-Authentication
(FAST).
- Hierarchical capath support
- iprop has been revamped to fix a number of race conditions that
could lead to inconsistent replication.
- The KDC process now uses a multi-process model improving resiliency
and performance.
- AES Encryption with HMAC-SHA2 for Kerberos 5
draft-ietf-kitten-aes-cts-hmac-sha2-11
- Moved kadmin and ktutil to /usr/bin
- Stricter fcache checks (see fcache_strict_checking krb5.conf setting)
- Removed legacy applications: ftp, kx, login, popper, push, rcp, rsh,
telnet, xnlock
Added:
head/security/heimdal/files/patch-admin-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-appl-afsutil-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-appl-gssmask-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-appl-kf-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-appl-su-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-appl-test-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-kadmin-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-kcm-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-kdc-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-kpasswd-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-kuser-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-lib-base-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-lib-gssapi-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-lib-hx509-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-lib-kadm5-Makefile.in (contents, props changed)
head/security/heimdal/files/patch-lib-krb5-Makefile.in (contents, props changed)
Deleted:
head/security/heimdal/files/patch-doc-hx509.texi
head/security/heimdal/files/patch-doc-whatis.texi
head/security/heimdal/files/patch-kcm__cache.c
head/security/heimdal/files/patch-lib-com_err-Makefile.in
head/security/heimdal/files/patch-lib_gssapi_krb5_prf.c
head/security/heimdal/files/patch-lib_hcrypto_rand-egd.c
head/security/heimdal/files/patch-lib_krb5_crypto-rand.c
head/security/heimdal/files/patch-tools-krb5-config.in
Modified:
head/security/heimdal/Makefile
head/security/heimdal/distinfo
head/security/heimdal/files/patch-configure
head/security/heimdal/files/patch-doc__Makefile.in
head/security/heimdal/files/patch-lib-hdb-Makefile.in
head/security/heimdal/files/patch-lib-roken-Makefile.in
head/security/heimdal/files/patch-lib__sl__slc-lex.l
head/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
head/security/heimdal/pkg-message
head/security/heimdal/pkg-plist
Modified: head/security/heimdal/Makefile
==============================================================================
--- head/security/heimdal/Makefile Tue Jan 3 13:50:15 2017 (r430467)
+++ head/security/heimdal/Makefile Tue Jan 3 13:52:06 2017 (r430468)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= heimdal
-PORTVERSION= 1.5.3
-PORTREVISION= 7
+PORTVERSION= 7.1.0
CATEGORIES= security ipv6
MASTER_SITES= http://www.h5l.org/dist/src/ \
http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -23,7 +22,6 @@ USES= gettext gssapi:bootstrap,heimdal
readline makeinfo ssl
USE_LDCONFIG= ${GSSAPILIBDIR}
GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
CONFIGURE_ENV= ac_cv_header_fnmatch_h=yes \
ac_cv_header_db_h=no \
ac_cv_header_db3_db_h=no \
@@ -47,6 +45,7 @@ CONFIGURE_ARGS= --with-libintl \
--sysconfdir="${PREFIX}/etc"
# XXX --with-readline picks up libreadline even if found in /usr/lib.
MAKE_ENV= INSTALL_CATPAGES=no
+INSTALL_TARGET= install-strip
.if !exists(/etc/rc.d/ipropd_master)
USE_RC_SUBR= ipropd_master ipropd_slave
.endif
@@ -54,7 +53,7 @@ INFO= heimdal hx509
MAKE_JOBS_UNSAFE= yes
-OPTIONS_DEFINE= IPV6 BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB X11
+OPTIONS_DEFINE= IPV6 BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
OPTIONS_DEFAULT= BDB PKINIT DIGEST KX509
OPTIONS_SUB= yes
@@ -90,11 +89,7 @@ KX509_DESC= Enable kx509 support
KX509_CONFIGURE_ENABLE= kx509
CRACKLIB_DESC= Use CrackLib for password quality checking
-CRACKLIB_BUILD_DEPENDS= ${LOCALBASE}/lib/libcrack.a:security/cracklib
-
-X11_DESC= Build X11 utilies
-X11_USE= XORG=x11,xt
-X11_CONFIGURE_WITH= x
+CRACKLIB_LIB_DEPENDS= libcrack.so:security/cracklib
.include <bsd.port.options.mk>
@@ -109,14 +104,12 @@ post-extract:
${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
${WRKSRC}/kpasswdd-cracklib/Makefile
-.if ${PORT_OPTIONS:MCRACKLIB}
-post-build:
+post-build-CRACKLIB-on:
cd ${WRKSRC}/kpasswdd-cracklib && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET}
-post-install:
+post-install-CRACKLIB-on:
cd ${WRKSRC}/kpasswdd-cracklib && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
-.endif
.include <bsd.port.mk>
Modified: head/security/heimdal/distinfo
==============================================================================
--- head/security/heimdal/distinfo Tue Jan 3 13:50:15 2017 (r430467)
+++ head/security/heimdal/distinfo Tue Jan 3 13:52:06 2017 (r430468)
@@ -1,2 +1,3 @@
-SHA256 (heimdal-1.5.3.tar.gz) = aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5
-SIZE (heimdal-1.5.3.tar.gz) = 6798305
+TIMESTAMP = 1483392507
+SHA256 (heimdal-7.1.0.tar.gz) = cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d
+SIZE (heimdal-7.1.0.tar.gz) = 9925587
Added: head/security/heimdal/files/patch-admin-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-admin-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,17 @@
+--- admin/Makefile.in.orig 2017-01-03 13:45:05 UTC
++++ admin/Makefile.in
+@@ -156,9 +156,13 @@ dist_ktutil_OBJECTS = add.$(OBJEXT) chan
+ rename.$(OBJEXT)
+ nodist_ktutil_OBJECTS = ktutil-commands.$(OBJEXT)
+ ktutil_OBJECTS = $(dist_ktutil_OBJECTS) $(nodist_ktutil_OBJECTS)
+-ktutil_LDADD = $(LDADD)
++ktutil_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ ktutil_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(top_builddir)/lib/asn1/libasn1.la \
+ $(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
Added: head/security/heimdal/files/patch-appl-afsutil-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-appl-afsutil-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,36 @@
+--- appl/afsutil/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ appl/afsutil/Makefile.in
+@@ -152,13 +152,17 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am_afslog_OBJECTS = afslog.$(OBJEXT)
+ afslog_OBJECTS = $(am_afslog_OBJECTS)
+-afslog_LDADD = $(LDADD)
++afslog_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ @NO_AFS_FALSE at 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_ at 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_ at AM_V@)
Added: head/security/heimdal/files/patch-appl-gssmask-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-appl-gssmask-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,35 @@
+--- appl/gssmask/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ appl/gssmask/Makefile.in
+@@ -151,9 +151,15 @@ CONFIG_CLEAN_VPATH_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_gssmaestro_OBJECTS = gssmaestro.$(OBJEXT) common.$(OBJEXT)
+ gssmaestro_OBJECTS = $(am_gssmaestro_OBJECTS)
+-gssmaestro_LDADD = $(LDADD)
++gssmaestro_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(top_builddir)/lib/asn1/libasn1.la
+ am__DEPENDENCIES_1 =
+ gssmaestro_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at 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_ at AM_V@)
+ am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
Added: head/security/heimdal/files/patch-appl-kf-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-appl-kf-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,31 @@
+--- appl/kf/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ appl/kf/Makefile.in
+@@ -154,9 +154,13 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+ am_kf_OBJECTS = kf.$(OBJEXT)
+ kf_OBJECTS = $(am_kf_OBJECTS)
+-kf_LDADD = $(LDADD)
++kf_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kf_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_ at 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_ at AM_V@)
Added: head/security/heimdal/files/patch-appl-su-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-appl-su-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,20 @@
+--- appl/su/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ appl/su/Makefile.in
+@@ -152,12 +152,16 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am_su_OBJECTS = su.$(OBJEXT)
+ su_OBJECTS = $(am_su_OBJECTS)
+-su_LDADD = $(LDADD)
++su_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ @NO_AFS_FALSE at 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_ at AM_V@)
Added: head/security/heimdal/files/patch-appl-test-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-appl-test-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,81 @@
+--- appl/test/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ appl/test/Makefile.in
+@@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server
+ gss_common.$(OBJEXT) common.$(OBJEXT)
+ gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS)
+ gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_2)
+ am_http_client_OBJECTS = http_client.$(OBJEXT) gss_common.$(OBJEXT) \
+ common.$(OBJEXT)
+ http_client_OBJECTS = $(am_http_client_OBJECTS)
+ http_client_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_2)
+ am_nt_gss_client_OBJECTS = nt_gss_client.$(OBJEXT) \
+ nt_gss_common.$(OBJEXT) common.$(OBJEXT)
+@@ -187,26 +191,42 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_
+ nt_gss_server_DEPENDENCIES = $(am__DEPENDENCIES_4)
+ am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT)
+ tcp_client_OBJECTS = $(am_tcp_client_OBJECTS)
+-tcp_client_LDADD = $(LDADD)
++tcp_client_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ tcp_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ am_tcp_server_OBJECTS = tcp_server.$(OBJEXT) common.$(OBJEXT)
+ tcp_server_OBJECTS = $(am_tcp_server_OBJECTS)
+-tcp_server_LDADD = $(LDADD)
++tcp_server_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ tcp_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ am_uu_client_OBJECTS = uu_client.$(OBJEXT) common.$(OBJEXT)
+ uu_client_OBJECTS = $(am_uu_client_OBJECTS)
+-uu_client_LDADD = $(LDADD)
++uu_client_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ uu_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ am_uu_server_OBJECTS = uu_server.$(OBJEXT) common.$(OBJEXT)
+ uu_server_OBJECTS = $(am_uu_server_OBJECTS)
+-uu_server_LDADD = $(LDADD)
++uu_server_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ uu_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ AM_V_P = $(am__v_P_ at AM_V@)
+@@ -545,9 +565,13 @@ http_client_SOURCES = http_client.c gss_
+
+ uu_server_SOURCES = uu_server.c common.c test_locl.h
+ uu_client_SOURCES = uu_client.c common.c test_locl.h
+-gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
++gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ gssapi_client_LDADD = $(gssapi_server_LDADD)
+-http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
++http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ nt_gss_client_SOURCES = nt_gss_client.c nt_gss_common.c nt_gss_common.h common.c
+ nt_gss_server_SOURCES = nt_gss_server.c nt_gss_common.c nt_gss_common.h
+ nt_gss_client_LDADD = $(gssapi_server_LDADD)
Modified: head/security/heimdal/files/patch-configure
==============================================================================
--- head/security/heimdal/files/patch-configure Tue Jan 3 13:50:15 2017 (r430467)
+++ head/security/heimdal/files/patch-configure Tue Jan 3 13:52:06 2017 (r430468)
@@ -1,6 +1,6 @@
---- configure.orig 2012-12-10 07:09:32.000000000 +0900
-+++ configure 2016-11-13 03:23:46.814899000 +0900
-@@ -8869,7 +8869,7 @@
+--- configure.orig 2016-12-20 04:24:03 UTC
++++ configure
+@@ -9588,7 +9588,7 @@ $as_echo_n "checking whether the $compil
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
inherit_rpath=no
@@ -9,110 +9,21 @@
module_cmds=
module_expsym_cmds=
old_archive_from_new_cmds=
-@@ -9567,29 +9567,6 @@
- hardcode_shlibpath_var=no
- ;;
-
-- freebsd1*)
-- ld_shlibs=no
-- ;;
--
-- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-- # support. Future versions do this automatically, but an explicit c++rt0.o
-- # does not break anything, and helps significantly (at the cost of a little
-- # extra space).
-- freebsd2.2*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- ;;
--
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct=yes
-- hardcode_minus_L=yes
-- hardcode_shlibpath_var=no
-- ;;
--
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10561,10 +10538,6 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -10572,7 +10545,6 @@
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
-- freebsd[123]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
-@@ -10590,18 +10562,6 @@
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
-- freebsd2*)
-- shlibpath_overrides_runpath=yes
-- ;;
-- freebsd3.[01]* | freebsdelf3.[01]*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
-- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-@@ -11661,7 +11621,7 @@
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -14227,9 +14187,9 @@
- native_pthread_support="netbsd 3 uses explict pthread"
- PTHREAD_LIBADD="-lpthread"
- ;;
--*-*-freebsd[56789]*)
-+*-*-freebsd*)
+@@ -16126,7 +16126,7 @@ case "$host" in
+ ;;
+ *-*-freebsd*)
native_pthread_support=yes
- PTHREAD_LIBADD="-pthread"
+ PTHREAD_LIBADD="-lpthread"
;;
*-*-openbsd*)
native_pthread_support=yes
-@@ -14488,7 +14448,7 @@
- fi
- # db_create
- eval "ac_tr_func=HAVE_`echo db_create | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
--eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//;s/[-.]/_/g' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
- eval "LIB_db_create=$ac_res"
-
- case "$ac_res" in
-@@ -28245,7 +28205,7 @@
+@@ -28685,7 +28685,7 @@ fi
krb_cv_compile_et="no"
krb_cv_com_err_need_r=""
-krb_cv_compile_et_cross=no
+krb_cv_compile_et_cross=yes
- if test "${COMPILE_ET}" = "compile_et"; then
+ if test "${COMPILE_ET}" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5
Modified: head/security/heimdal/files/patch-doc__Makefile.in
==============================================================================
--- head/security/heimdal/files/patch-doc__Makefile.in Tue Jan 3 13:50:15 2017 (r430467)
+++ head/security/heimdal/files/patch-doc__Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -1,31 +1,31 @@
---- doc/Makefile.in.orig 2013-03-26 23:18:01.813922381 +1030
-+++ doc/Makefile.in 2013-03-26 23:19:41.535922356 +1030
-@@ -386,7 +380,7 @@
- texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \
+--- doc/Makefile.in.orig 2017-01-03 13:44:59 UTC
++++ doc/Makefile.in
+@@ -501,7 +501,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc
+ -e 's,[@]dbtype[@],$(db_type),g' \
-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
--PROJECTS = hcrypto hdb hx509 gssapi krb5 ntlm wind
-+PROJECTS = hdb hx509 gssapi krb5 ntlm wind
+-PROJECTS = base hdb hx509 gssapi krb5 ntlm wind hcrypto
++PROJECTS = base hdb hx509 gssapi krb5 ntlm wind
heimdal_TEXINFOS = \
ack.texi \
apps.texi \
-@@ -409,7 +403,6 @@
+@@ -524,7 +524,6 @@ EXTRA_DIST = \
footer.html \
gssapi.din \
hdb.din \
- hcrypto.din \
header.html \
heimdal.css \
- hx509.din \
-@@ -423,7 +416,6 @@
+ base.din \
+@@ -542,7 +541,6 @@ EXTRA_DIST = \
vars.tin
CLEANFILES = \
- hcrypto.dxy* \
+ base.dxy* \
hx509.dxy* \
hdb.dxy* \
- gssapi.dxy* \
-@@ -1040,11 +1032,6 @@
+@@ -1199,11 +1197,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP
fi ; \
done
@@ -37,12 +37,12 @@
hdb.dxy: hdb.din Makefile
$(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp
chmod +x hdb.dxy.tmp
-@@ -1080,7 +1067,7 @@
+@@ -1244,7 +1237,7 @@ vars.texi: vars.tin Makefile
chmod +x vars.texi.tmp
mv vars.texi.tmp vars.texi
--doxyout doxygen: hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
-+doxyout doxygen: hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
+-doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
++doxyout doxygen: base.dxy hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
@find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \
rm -rf $(srcdir)/doxyout ; \
mkdir $(srcdir)/doxyout ; \
Added: head/security/heimdal/files/patch-kadmin-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-kadmin-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,56 @@
+--- kadmin/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ kadmin/Makefile.in
+@@ -166,6 +166,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ add_random_users_DEPENDENCIES = \
+ $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+@@ -181,6 +183,8 @@ dist_kadmin_OBJECTS = ank.$(OBJEXT) add_
+ nodist_kadmin_OBJECTS = kadmin-commands.$(OBJEXT)
+ kadmin_OBJECTS = $(dist_kadmin_OBJECTS) $(nodist_kadmin_OBJECTS)
+ kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ $(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+@@ -188,6 +192,8 @@ am_kadmind_OBJECTS = rpc.$(OBJEXT) serve
+ kadm_conn.$(OBJEXT)
+ kadmind_OBJECTS = $(am_kadmind_OBJECTS)
+ kadmind_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ ../lib/gssapi/libgssapi.la $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_test_util_OBJECTS = test_util.$(OBJEXT) util.$(OBJEXT)
+@@ -770,6 +776,8 @@ LDADD_common = \
+
+ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ ../lib/gssapi/libgssapi.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LDADD_common) \
+ $(LIB_pidfile) \
+ $(LIB_dlopen)
+@@ -777,6 +785,8 @@ kadmind_LDADD = $(top_builddir)/lib/kadm
+ kadmin_LDADD = \
+ $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/sl/libsl.la \
+ $(LIB_readline) \
+ $(LDADD_common) \
+@@ -785,6 +795,8 @@ kadmin_LDADD = \
+ add_random_users_LDADD = \
+ $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LDADD_common) \
+ $(LIB_dlopen)
+
Added: head/security/heimdal/files/patch-kcm-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-kcm-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,16 @@
+--- kcm/Makefile.in.orig 2017-01-03 13:45:00 UTC
++++ kcm/Makefile.in
+@@ -157,10 +157,12 @@ am_kcm_OBJECTS = acl.$(OBJEXT) acquire.$
+ events.$(OBJEXT) glue.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
+ protocol.$(OBJEXT) sessions.$(OBJEXT) renew.$(OBJEXT)
+ kcm_OBJECTS = $(am_kcm_OBJECTS)
+-kcm_LDADD = $(LDADD)
++kcm_LDADD = $(LDADD) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kcm_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/asn1/libasn1.la \
+ $(top_builddir)/lib/ntlm/libheimntlm.la \
+ $(top_builddir)/lib/ipc/libheim-ipcs.la $(am__DEPENDENCIES_1) \
Added: head/security/heimdal/files/patch-kdc-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-kdc-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,122 @@
+--- kdc/Makefile.in.orig 2017-01-03 13:45:00 UTC
++++ kdc/Makefile.in
+@@ -213,6 +213,8 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO
+ am_digest_service_OBJECTS = digest-service.$(OBJEXT)
+ digest_service_OBJECTS = $(am_digest_service_OBJECTS)
+ am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -224,6 +226,8 @@ digest_service_DEPENDENCIES = libkdc.la
+ am_hprop_OBJECTS = hprop.$(OBJEXT) mit_dump.$(OBJEXT)
+ hprop_OBJECTS = $(am_hprop_OBJECTS)
+ hprop_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -232,6 +236,8 @@ hprop_DEPENDENCIES = $(top_builddir)/lib
+ am_hpropd_OBJECTS = hpropd.$(OBJEXT)
+ hpropd_OBJECTS = $(am_hpropd_OBJECTS)
+ hpropd_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -241,6 +247,8 @@ am_kdc_OBJECTS = kdc-connect.$(OBJEXT) k
+ kdc-announce.$(OBJEXT) kdc-main.$(OBJEXT)
+ kdc_OBJECTS = $(am_kdc_OBJECTS)
+ kdc_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ kdc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(kdc_CFLAGS) $(CFLAGS) \
+@@ -248,23 +256,35 @@ kdc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=C
+ kdc_replay_SOURCES = kdc-replay.c
+ kdc_replay_OBJECTS = kdc-replay.$(OBJEXT)
+ kdc_replay_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1)
+ am_kdc_tester_OBJECTS = config.$(OBJEXT) kdc-tester.$(OBJEXT)
+ kdc_tester_OBJECTS = $(am_kdc_tester_OBJECTS)
+ kdc_tester_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(LIB_heimbase)
+ am_kstash_OBJECTS = kstash.$(OBJEXT)
+ kstash_OBJECTS = $(am_kstash_OBJECTS)
+-kstash_LDADD = $(LDADD)
++kstash_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ kstash_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_string2key_OBJECTS = string2key.$(OBJEXT)
+ string2key_OBJECTS = $(am_string2key_OBJECTS)
+-string2key_LDADD = $(LDADD)
++string2key_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ string2key_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+ $(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -636,6 +656,8 @@ libkdc_la_LDFLAGS = -version-info 2:0:0
+ hprop_LDADD = \
+ $(top_builddir)/lib/hdb/libhdb.la \
+ $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LIB_kdb) \
+ $(LIB_hcrypto) \
+ $(top_builddir)/lib/asn1/libasn1.la \
+@@ -645,6 +667,8 @@ hprop_LDADD = \
+ hpropd_LDADD = \
+ $(top_builddir)/lib/hdb/libhdb.la \
+ $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LIB_kdb) \
+ $(LIB_hcrypto) \
+ $(top_builddir)/lib/asn1/libasn1.la \
+@@ -671,17 +695,24 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.l
+ $(LIB_roken) \
+ $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB)
+
+-kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS)
++kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ @FRAMEWORK_SECURITY_TRUE at 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
Added: head/security/heimdal/files/patch-kpasswd-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-kpasswd-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,49 @@
+--- kpasswd/Makefile.in.orig 2017-01-03 13:45:01 UTC
++++ kpasswd/Makefile.in
+@@ -155,9 +155,13 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ am_kpasswd_OBJECTS = kpasswd.$(OBJEXT)
+ kpasswd_OBJECTS = $(am_kpasswd_OBJECTS)
+-kpasswd_LDADD = $(LDADD)
++kpasswd_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ kpasswd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+@@ -166,8 +170,12 @@ am__v_lt_0 = --silent
+ am__v_lt_1 =
+ kpasswd_generator_SOURCES = kpasswd-generator.c
+ kpasswd_generator_OBJECTS = kpasswd-generator.$(OBJEXT)
+-kpasswd_generator_LDADD = $(LDADD)
++kpasswd_generator_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ kpasswd_generator_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ am_kpasswdd_OBJECTS = kpasswdd.$(OBJEXT)
+@@ -176,6 +184,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ kpasswdd_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -532,6 +542,8 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_lo
+ kpasswdd_LDADD = \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ $(top_builddir)/lib/hdb/libhdb.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LDADD) \
+ $(LIB_pidfile) \
+ $(LIB_dlopen) \
Added: head/security/heimdal/files/patch-kuser-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-kuser-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,92 @@
+--- kuser/Makefile.in.orig 2017-01-03 13:45:00 UTC
++++ kuser/Makefile.in
+@@ -157,9 +157,13 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ generate_requests_SOURCES = generate-requests.c
+ generate_requests_OBJECTS = generate-requests.$(OBJEXT)
+-generate_requests_LDADD = $(LDADD)
++generate_requests_LDADD = $(LDADD) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la
+ am__DEPENDENCIES_1 =
+ generate_requests_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_ at 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_ at AM_V@)
+@@ -583,6 +604,8 @@ man_MANS = \
+
+ kinit_LDADD = \
+ $(afs_lib) \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(top_builddir)/lib/krb5/libkrb5.la \
+ $(top_builddir)/lib/ntlm/libheimntlm.la \
+ $(LIB_hcrypto) \
+@@ -604,6 +627,8 @@ nodist_kdigest_SOURCES = kdigest-command
+ kdigest_LDADD = \
+ $(top_builddir)/lib/ntlm/libheimntlm.la \
+ $(top_builddir)/lib/krb5/libkrb5.la \
++ $(LIB_heimbase) \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ $(LIB_hcrypto) \
+ $(top_builddir)/lib/asn1/libasn1.la \
+ $(top_builddir)/lib/sl/libsl.la \
Added: head/security/heimdal/files/patch-lib-base-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-lib-base-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,11 @@
+--- lib/base/Makefile.in.orig 2017-01-03 13:45:02 UTC
++++ lib/base/Makefile.in
+@@ -705,7 +705,7 @@ heim_verbose_0 = @echo " GEN "$@;
+ IMPLEMENT_TLS = $(am__append_1)
+ lib_LTLIBRARIES = libheimbase.la
+ libheimbase_la_LDFLAGS = -version-info 1:0:0 $(am__append_3)
+-libheimbase_la_LIBADD = $(PTHREAD_LIBADD)
++libheimbase_la_LIBADD = $(PTHREAD_LIBADD) $(LIB_libintl)
+ include_HEADERS = heimbase.h
+ dist_libheimbase_la_SOURCES = \
+ array.c \
Added: head/security/heimdal/files/patch-lib-gssapi-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/heimdal/files/patch-lib-gssapi-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -0,0 +1,92 @@
+--- lib/gssapi/Makefile.in.orig 2017-01-03 13:45:04 UTC
++++ lib/gssapi/Makefile.in
+@@ -304,8 +304,14 @@ test_acquire_cred_DEPENDENCIES = libgssa
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_add_store_cred_OBJECTS = test_add_store_cred.$(OBJEXT)
+ test_add_store_cred_OBJECTS = $(am_test_add_store_cred_OBJECTS)
+-test_add_store_cred_LDADD = $(LDADD)
++test_add_store_cred_LDADD = $(LDADD) \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase)
+ test_add_store_cred_DEPENDENCIES = libgssapi.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_cfx_OBJECTS = krb5/test_cfx.$(OBJEXT)
+ test_cfx_OBJECTS = $(am_test_cfx_OBJECTS)
+@@ -314,18 +320,38 @@ test_cfx_DEPENDENCIES = libgssapi.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ am_test_context_OBJECTS = test_context.$(OBJEXT) test_common.$(OBJEXT)
+ test_context_OBJECTS = $(am_test_context_OBJECTS)
+-test_context_LDADD = $(LDADD)
++test_context_LDADD = $(LDADD) \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase)
++test_cred_DEPENDENCIES = libgssapi.la \
+ test_context_DEPENDENCIES = libgssapi.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase)
++test_cred_DEPENDENCIES = libgssapi.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_cred_SOURCES = test_cred.c
+ test_cred_OBJECTS = test_cred.$(OBJEXT)
+-test_cred_LDADD = $(LDADD)
++test_cred_LDADD = $(LDADD) \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase)
+ test_cred_DEPENDENCIES = libgssapi.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_kcred_SOURCES = test_kcred.c
+ test_kcred_OBJECTS = test_kcred.$(OBJEXT)
+-test_kcred_LDADD = $(LDADD)
++test_kcred_LDADD = $(LDADD) \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase)
+ test_kcred_DEPENDENCIES = libgssapi.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
+ test_names_SOURCES = test_names.c
+ test_names_OBJECTS = test_names.$(OBJEXT)
+@@ -337,8 +363,10 @@ test_ntlm_OBJECTS = $(am_test_ntlm_OBJEC
+ am__DEPENDENCIES_2 = libgssapi.la $(top_builddir)/lib/krb5/libkrb5.la \
+ $(am__DEPENDENCIES_1)
+ test_ntlm_DEPENDENCIES = $(top_builddir)/lib/ntlm/libheimntlm.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(am__DEPENDENCIES_2)
+-test_oid_SOURCES = test_oid.c
+ test_oid_OBJECTS = test_oid.$(OBJEXT)
+ test_oid_LDADD = $(LDADD)
+ test_oid_DEPENDENCIES = libgssapi.la \
+@@ -1103,6 +1131,9 @@ test_acquire_cred_SOURCES = test_acquire
+ test_add_store_cred_SOURCES = test_add_store_cred.c
+ test_ntlm_LDADD = \
+ $(top_builddir)/lib/ntlm/libheimntlm.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(LDADD)
+
+ LDADD = libgssapi.la \
+@@ -1116,6 +1147,9 @@ nodist_gsstool_SOURCES = gss-commands.c
+ gsstool_LDADD = libgssapi.la \
+ $(top_builddir)/lib/sl/libsl.la \
+ $(top_builddir)/lib/krb5/libkrb5.la \
++ $(top_builddir)/lib/asn1/libasn1.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
++ $(LIB_heimbase) \
+ $(LIB_readline) \
+ $(LIB_roken)
+
Modified: head/security/heimdal/files/patch-lib-hdb-Makefile.in
==============================================================================
--- head/security/heimdal/files/patch-lib-hdb-Makefile.in Tue Jan 3 13:50:15 2017 (r430467)
+++ head/security/heimdal/files/patch-lib-hdb-Makefile.in Tue Jan 3 13:52:06 2017 (r430468)
@@ -1,6 +1,57 @@
---- lib/hdb/Makefile.in.orig 2014-08-31 01:38:01.000000000 +0900
-+++ lib/hdb/Makefile.in 2014-08-31 01:44:03.000000000 +0900
-@@ -451,7 +451,8 @@
+--- lib/hdb/Makefile.in.orig 2017-01-03 13:45:03 UTC
++++ lib/hdb/Makefile.in
+@@ -225,26 +225,46 @@ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) -
+ PROGRAMS = $(noinst_PROGRAMS)
+ test_dbinfo_SOURCES = test_dbinfo.c
+ test_dbinfo_OBJECTS = test_dbinfo.$(OBJEXT)
+-test_dbinfo_LDADD = $(LDADD)
++test_dbinfo_LDADD = $(LDADD) \
++ ../asn1/libasn1.la \
++ $(top_builddir)/lib/base/libheimbase.la \
++ $(top_builddir)/lib/hx509/libhx509.la
+ test_dbinfo_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++ $(top_builddir)/lib/base/libheimbase.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ ../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ test_hdbkeys_SOURCES = test_hdbkeys.c
+ test_hdbkeys_OBJECTS = test_hdbkeys.$(OBJEXT)
+-test_hdbkeys_LDADD = $(LDADD)
++test_hdbkeys_LDADD = $(LDADD) \
++ ../asn1/libasn1.la \
++ $(top_builddir)/lib/base/libheimbase.la \
++ $(top_builddir)/lib/hx509/libhx509.la
+ test_hdbkeys_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++ $(top_builddir)/lib/base/libheimbase.la \
++ $(top_builddir)/lib/hx509/libhx509.la \
+ ../asn1/libasn1.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ test_hdbplugin_SOURCES = test_hdbplugin.c
+ test_hdbplugin_OBJECTS = test_hdbplugin.$(OBJEXT)
+-test_hdbplugin_LDADD = $(LDADD)
++test_hdbplugin_LDADD = $(LDADD) \
++ ../asn1/libasn1.la \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list