Date: Sun, 23 Feb 2020 14:57:33 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526922 - in head/security/heimdal: . files Message-ID: <202002231457.01NEvX5j093903@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Feb 23 14:57:33 2020 New Revision: 526922 URL: https://svnweb.freebsd.org/changeset/ports/526922 Log: - Fix build when !BDB. - Regenerate patches. PR: 244282 Added: head/security/heimdal/files/patch-cf-make-proto.pl (contents, props changed) head/security/heimdal/files/patch-lib-hdb-hdb-mitdb.c (contents, props changed) Modified: head/security/heimdal/Makefile head/security/heimdal/files/patch-appl-test-Makefile.in head/security/heimdal/files/patch-configure head/security/heimdal/files/patch-doc__Makefile.in head/security/heimdal/files/patch-kadmin-Makefile.in head/security/heimdal/files/patch-kdc-Makefile.in head/security/heimdal/files/patch-kpasswd-Makefile.in head/security/heimdal/files/patch-kuser-Makefile.in head/security/heimdal/files/patch-lib-base-Makefile.in head/security/heimdal/files/patch-lib-gssapi-Makefile.in head/security/heimdal/files/patch-lib-hdb-Makefile.in head/security/heimdal/files/patch-lib-hx509-Makefile.in head/security/heimdal/files/patch-lib-kadm5-Makefile.in head/security/heimdal/files/patch-lib-roken-Makefile.in Modified: head/security/heimdal/Makefile ============================================================================== --- head/security/heimdal/Makefile Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/Makefile Sun Feb 23 14:57:33 2020 (r526922) @@ -18,13 +18,14 @@ CONFLICTS= krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* s 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_header_db6_db_h=no \ ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et CONFIGURE_ARGS= --with-berkeley-db \ --with-libintl \ Modified: head/security/heimdal/files/patch-appl-test-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-appl-test-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-appl-test-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- appl/test/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- appl/test/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ appl/test/Makefile.in -@@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server +@@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server.$(OBJEXT) \ gss_common.$(OBJEXT) common.$(OBJEXT) gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS) gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \ @@ -16,7 +16,7 @@ $(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_ +@@ -187,26 +191,42 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) nt_gss_server_DEPENDENCIES = $(am__DEPENDENCIES_4) am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT) tcp_client_OBJECTS = $(am_tcp_client_OBJECTS) @@ -63,7 +63,7 @@ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \ $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) -@@ -546,9 +566,13 @@ http_client_SOURCES = http_client.c gss_ +@@ -545,9 +565,13 @@ http_client_SOURCES = http_client.c gss_common.c commo uu_server_SOURCES = uu_server.c common.c test_locl.h uu_client_SOURCES = uu_client.c common.c test_locl.h Added: head/security/heimdal/files/patch-cf-make-proto.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-cf-make-proto.pl Sun Feb 23 14:57:33 2020 (r526922) @@ -0,0 +1,11 @@ +--- cf/make-proto.pl.orig 2019-06-07 06:21:35 UTC ++++ cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++# use JSON; + + my $comment = 0; + my $doxygen = 0; Modified: head/security/heimdal/files/patch-configure ============================================================================== --- head/security/heimdal/files/patch-configure Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-configure Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-11 21:56:39 UTC +--- configure.orig 2019-06-07 06:23:13 UTC +++ configure -@@ -16128,7 +16128,7 @@ case "$host" in +@@ -16103,7 +16103,7 @@ case "$host" in ;; *-*-freebsd*) native_pthread_support=yes @@ -9,7 +9,7 @@ ;; *-*-openbsd*) native_pthread_support=yes -@@ -16364,7 +16364,7 @@ if ${ac_cv_funclib_db_create+:} false; t +@@ -16339,7 +16339,7 @@ if ${ac_cv_funclib_db_create+:} false; then : $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 -@@ -16937,6 +16937,9 @@ esac +@@ -16912,6 +16912,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 -@@ -28688,7 +28691,7 @@ fi +@@ -28663,7 +28666,7 @@ fi krb_cv_compile_et="no" krb_cv_com_err_need_r="" Modified: head/security/heimdal/files/patch-doc__Makefile.in ============================================================================== --- head/security/heimdal/files/patch-doc__Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-doc__Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- doc/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ doc/Makefile.in -@@ -502,7 +502,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc +@@ -501,7 +501,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' -e 's,[@]dbtype[@],$(db_type),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' @@ -9,7 +9,7 @@ heimdal_TEXINFOS = \ ack.texi \ apps.texi \ -@@ -525,7 +525,6 @@ EXTRA_DIST = \ +@@ -524,7 +524,6 @@ EXTRA_DIST = \ footer.html \ gssapi.din \ hdb.din \ @@ -17,7 +17,7 @@ header.html \ heimdal.css \ base.din \ -@@ -543,7 +542,6 @@ EXTRA_DIST = \ +@@ -542,7 +541,6 @@ EXTRA_DIST = \ vars.tin CLEANFILES = \ @@ -25,7 +25,7 @@ base.dxy* \ hx509.dxy* \ hdb.dxy* \ -@@ -1200,11 +1198,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEP +@@ -1199,11 +1197,6 @@ distdir-in-tree: $(DISTFILES) $(INFO_DEPS) fi ; \ done @@ -37,7 +37,7 @@ hdb.dxy: hdb.din Makefile $(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp chmod +x hdb.dxy.tmp -@@ -1245,7 +1238,7 @@ vars.texi: vars.tin Makefile +@@ -1244,7 +1237,7 @@ vars.texi: vars.tin Makefile chmod +x vars.texi.tmp mv vars.texi.tmp vars.texi Modified: head/security/heimdal/files/patch-kadmin-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-kadmin-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-kadmin-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- kadmin/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- kadmin/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ kadmin/Makefile.in -@@ -166,6 +166,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib +@@ -166,6 +166,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) add_random_users_DEPENDENCIES = \ $(top_builddir)/lib/kadm5/libkadm5clnt.la \ @@ -9,7 +9,7 @@ $(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_ +@@ -181,6 +183,8 @@ dist_kadmin_OBJECTS = ank.$(OBJEXT) add_enctype.$(OBJE nodist_kadmin_OBJECTS = kadmin-commands.$(OBJEXT) kadmin_OBJECTS = $(dist_kadmin_OBJECTS) $(nodist_kadmin_OBJECTS) kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \ @@ -18,7 +18,7 @@ $(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 +@@ -188,6 +192,8 @@ am_kadmind_OBJECTS = rpc.$(OBJEXT) server.$(OBJEXT) ka kadm_conn.$(OBJEXT) kadmind_OBJECTS = $(am_kadmind_OBJECTS) kadmind_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \ @@ -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) -@@ -771,6 +777,8 @@ LDADD_common = \ +@@ -770,6 +776,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) -@@ -778,6 +786,8 @@ kadmind_LDADD = $(top_builddir)/lib/kadm +@@ -777,6 +785,8 @@ kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv. 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) \ -@@ -786,6 +796,8 @@ kadmin_LDADD = \ +@@ -785,6 +795,8 @@ kadmin_LDADD = \ add_random_users_LDADD = \ $(top_builddir)/lib/kadm5/libkadm5clnt.la \ $(top_builddir)/lib/kadm5/libkadm5srv.la \ Modified: head/security/heimdal/files/patch-kdc-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-kdc-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-kdc-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- kdc/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- kdc/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ kdc/Makefile.in -@@ -213,6 +213,8 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO +@@ -213,6 +213,8 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noins am_digest_service_OBJECTS = digest-service.$(OBJEXT) digest_service_OBJECTS = $(am_digest_service_OBJECTS) am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la \ @@ -9,7 +9,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) \ -@@ -224,6 +226,8 @@ digest_service_DEPENDENCIES = libkdc.la +@@ -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 \ @@ -18,7 +18,7 @@ $(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 +@@ -232,6 +236,8 @@ hprop_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la am_hpropd_OBJECTS = hpropd.$(OBJEXT) hpropd_OBJECTS = $(am_hpropd_OBJECTS) hpropd_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \ @@ -27,7 +27,7 @@ $(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 +@@ -241,6 +247,8 @@ am_kdc_OBJECTS = kdc-connect.$(OBJEXT) kdc-config.$(OB kdc-announce.$(OBJEXT) kdc-main.$(OBJEXT) kdc_OBJECTS = $(am_kdc_OBJECTS) kdc_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \ @@ -36,7 +36,7 @@ $(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 +@@ -248,23 +256,35 @@ kdc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOL kdc_replay_SOURCES = kdc-replay.c kdc_replay_OBJECTS = kdc-replay.$(OBJEXT) kdc_replay_DEPENDENCIES = libkdc.la $(am__DEPENDENCIES_2) \ @@ -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) \ -@@ -637,6 +657,8 @@ libkdc_la_LDFLAGS = -version-info 2:0:0 +@@ -636,6 +656,8 @@ libkdc_la_LDFLAGS = -version-info 2:0:0 $(am__append_1 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 \ -@@ -646,6 +668,8 @@ hprop_LDADD = \ +@@ -645,6 +667,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 \ -@@ -672,17 +696,24 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.l +@@ -671,17 +695,24 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_roken) \ $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) Modified: head/security/heimdal/files/patch-kpasswd-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-kpasswd-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-kpasswd-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- kpasswd/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- kpasswd/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ kpasswd/Makefile.in -@@ -155,9 +155,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" +@@ -155,9 +155,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(l PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) am_kpasswd_OBJECTS = kpasswd.$(OBJEXT) kpasswd_OBJECTS = $(am_kpasswd_OBJECTS) @@ -29,7 +29,7 @@ $(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 +@@ -176,6 +184,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib/krb5/libkrb5. $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \ $(am__DEPENDENCIES_1) kpasswdd_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \ @@ -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) \ -@@ -533,6 +543,8 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_lo +@@ -532,6 +542,8 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_locl.h kpasswdd_LDADD = \ $(top_builddir)/lib/kadm5/libkadm5srv.la \ $(top_builddir)/lib/hdb/libhdb.la \ Modified: head/security/heimdal/files/patch-kuser-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-kuser-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-kuser-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- kuser/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- kuser/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ kuser/Makefile.in -@@ -157,9 +157,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" +@@ -157,9 +157,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(l PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) generate_requests_SOURCES = generate-requests.c generate_requests_OBJECTS = generate-requests.$(OBJEXT) @@ -15,7 +15,7 @@ $(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) +@@ -184,8 +188,12 @@ heimtools_DEPENDENCIES = $(top_builddir)/lib/sl/libsl. $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) kdecode_ticket_SOURCES = kdecode_ticket.c kdecode_ticket_OBJECTS = kdecode_ticket.$(OBJEXT) @@ -72,7 +72,7 @@ $(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \ $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) -@@ -584,6 +605,8 @@ man_MANS = \ +@@ -583,6 +604,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) \ -@@ -605,6 +628,8 @@ nodist_kdigest_SOURCES = kdigest-command +@@ -604,6 +627,8 @@ nodist_kdigest_SOURCES = kdigest-commands.c kdigest_LDADD = \ $(top_builddir)/lib/ntlm/libheimntlm.la \ $(top_builddir)/lib/krb5/libkrb5.la \ Modified: head/security/heimdal/files/patch-lib-base-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-base-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-base-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,4 +1,4 @@ ---- lib/base/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/base/Makefile.in.orig 2020-02-23 12:16:33 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 " $@; -@@ -706,7 +706,7 @@ heim_verbose_0 = @echo " GEN "$@; +@@ -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) Modified: head/security/heimdal/files/patch-lib-gssapi-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-gssapi-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-gssapi-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- lib/gssapi/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/gssapi/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ lib/gssapi/Makefile.in -@@ -304,8 +304,14 @@ test_acquire_cred_DEPENDENCIES = libgssa +@@ -304,8 +304,14 @@ test_acquire_cred_DEPENDENCIES = libgssapi.la \ $(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) @@ -58,7 +58,7 @@ $(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 +@@ -337,8 +363,10 @@ test_ntlm_OBJECTS = $(am_test_ntlm_OBJECTS) am__DEPENDENCIES_2 = libgssapi.la $(top_builddir)/lib/krb5/libkrb5.la \ $(am__DEPENDENCIES_1) test_ntlm_DEPENDENCIES = $(top_builddir)/lib/ntlm/libheimntlm.la \ @@ -70,7 +70,7 @@ test_oid_OBJECTS = test_oid.$(OBJEXT) test_oid_LDADD = $(LDADD) test_oid_DEPENDENCIES = libgssapi.la \ -@@ -1104,6 +1132,9 @@ test_acquire_cred_SOURCES = test_acquire +@@ -1103,6 +1131,9 @@ test_acquire_cred_SOURCES = test_acquire_cred.c test_c 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 \ -@@ -1117,6 +1148,9 @@ nodist_gsstool_SOURCES = gss-commands.c +@@ -1116,6 +1147,9 @@ nodist_gsstool_SOURCES = gss-commands.c gss-commands.h gsstool_LDADD = libgssapi.la \ $(top_builddir)/lib/sl/libsl.la \ $(top_builddir)/lib/krb5/libkrb5.la \ Modified: head/security/heimdal/files/patch-lib-hdb-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-hdb-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-hdb-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- lib/hdb/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/hdb/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ lib/hdb/Makefile.in -@@ -225,26 +225,46 @@ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) - +@@ -225,26 +225,46 @@ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_L PROGRAMS = $(noinst_PROGRAMS) test_dbinfo_SOURCES = test_dbinfo.c test_dbinfo_OBJECTS = test_dbinfo.$(OBJEXT) @@ -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@) -@@ -575,7 +595,8 @@ heim_verbose_0 = @echo " GEN "$@; +@@ -574,7 +594,8 @@ heim_verbose_0 = @echo " GEN "$@; BUILT_SOURCES = \ $(gen_files_hdb:.x=.c) \ hdb_err.c \ Added: head/security/heimdal/files/patch-lib-hdb-hdb-mitdb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/heimdal/files/patch-lib-hdb-hdb-mitdb.c Sun Feb 23 14:57:33 2020 (r526922) @@ -0,0 +1,11 @@ +--- lib/hdb/hdb-mitdb.c.orig 2019-06-07 06:21:39 UTC ++++ lib/hdb/hdb-mitdb.c +@@ -1116,7 +1116,7 @@ krb5_error_code + hdb_mitdb_create(krb5_context context, HDB **db, + const char *filename) + { +- MITDB **mdb (MITDB **)db; ++ MITDB **mdb = (MITDB **)db; + *mdb = calloc(1, sizeof(**mdb)); + if (*mdb == NULL) { + krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); Modified: head/security/heimdal/files/patch-lib-hx509-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-hx509-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-hx509-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- lib/hx509/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/hx509/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ lib/hx509/Makefile.in -@@ -860,7 +860,9 @@ hxtool_LDADD = \ +@@ -859,7 +859,9 @@ hxtool_LDADD = \ libhx509.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_hcrypto) \ Modified: head/security/heimdal/files/patch-lib-kadm5-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-kadm5-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-kadm5-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,6 +1,6 @@ ---- lib/kadm5/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/kadm5/Makefile.in.orig 2020-02-23 12:16:33 UTC +++ lib/kadm5/Makefile.in -@@ -253,6 +253,8 @@ iprop_log_OBJECTS = $(dist_iprop_log_OBJ +@@ -253,6 +253,8 @@ iprop_log_OBJECTS = $(dist_iprop_log_OBJECTS) \ iprop_log_DEPENDENCIES = libkadm5srv.la \ $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ @@ -9,7 +9,7 @@ $(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 +@@ -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) @@ -25,7 +25,7 @@ $(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 +@@ -274,10 +280,14 @@ ipropd_master_DEPENDENCIES = libkadm5srv.la \ am_ipropd_slave_OBJECTS = ipropd_slave.$(OBJEXT) \ ipropd_common.$(OBJEXT) ipropd_slave_OBJECTS = $(am_ipropd_slave_OBJECTS) @@ -41,7 +41,7 @@ $(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. +@@ -285,10 +295,14 @@ ipropd_slave_DEPENDENCIES = libkadm5srv.la \ $(am__DEPENDENCIES_1) test_pw_quality_SOURCES = test_pw_quality.c test_pw_quality_OBJECTS = test_pw_quality.$(OBJEXT) @@ -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) \ -@@ -731,6 +745,8 @@ LDADD = \ +@@ -730,6 +744,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 \ -@@ -1167,7 +1183,7 @@ libkadm5srv_la-get_princs_s.lo: get_prin +@@ -1166,7 +1182,7 @@ libkadm5srv_la-get_princs_s.lo: get_princs_s.c @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 Modified: head/security/heimdal/files/patch-lib-roken-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-lib-roken-Makefile.in Sun Feb 23 13:50:25 2020 (r526921) +++ head/security/heimdal/files/patch-lib-roken-Makefile.in Sun Feb 23 14:57:33 2020 (r526922) @@ -1,4 +1,4 @@ ---- lib/roken/Makefile.in.orig 2017-06-10 19:27:47 UTC +--- lib/roken/Makefile.in.orig 2020-02-23 12:16:33 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 -@@ -2275,7 +2273,7 @@ check: $(BUILT_SOURCES) +@@ -2274,7 +2272,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ all-local installdirs: @@ -29,7 +29,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -2339,8 +2337,7 @@ info: info-am +@@ -2338,8 +2336,7 @@ info: info-am info-am: install-data-am: install-dist_includeHEADERS install-man \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002231457.01NEvX5j093903>