Date: Fri, 13 Mar 2020 17:18:41 +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: r528366 - head/security/heimdal/files Message-ID: <202003131718.02DHIfA7039511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Mar 13 17:18:40 2020 New Revision: 528366 URL: https://svnweb.freebsd.org/changeset/ports/528366 Log: Regen patches. Modified: head/security/heimdal/files/patch-configure head/security/heimdal/files/patch-configure.ac head/security/heimdal/files/patch-kdc-Makefile.am head/security/heimdal/files/patch-kdc-Makefile.in head/security/heimdal/files/patch-lib-krb5-krb5_locl.h Modified: head/security/heimdal/files/patch-configure ============================================================================== --- head/security/heimdal/files/patch-configure Fri Mar 13 17:12:29 2020 (r528365) +++ head/security/heimdal/files/patch-configure Fri Mar 13 17:18:40 2020 (r528366) @@ -1,6 +1,6 @@ ---- configure.orig 2019-06-07 15:23:13.000000000 +0900 -+++ configure 2020-03-13 05:46:04.140343000 +0900 -@@ -792,6 +792,8 @@ +--- configure.orig 2019-06-07 06:23:13 UTC ++++ configure +@@ -792,6 +792,8 @@ CAPNG_CFLAGS PKG_CONFIG PKINIT_FALSE PKINIT_TRUE @@ -9,7 +9,7 @@ OPENLDAP_MODULE_FALSE OPENLDAP_MODULE_TRUE LIB_openldap -@@ -15041,9 +15043,15 @@ +@@ -15041,9 +15043,15 @@ if test "$enable_kx509" != no ;then $as_echo "#define KX509 1" >>confdefs.h fi @@ -26,7 +26,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -@@ -16103,7 +16111,7 @@ +@@ -16103,7 +16111,7 @@ case "$host" in ;; *-*-freebsd*) native_pthread_support=yes @@ -35,7 +35,7 @@ ;; *-*-openbsd*) native_pthread_support=yes -@@ -16339,7 +16347,7 @@ +@@ -16339,7 +16347,7 @@ if ${ac_cv_funclib_db_create+:} false; then : $as_echo_n "(cached) " >&6 else @@ -44,7 +44,7 @@ ac_save_LIBS="$LIBS" for ac_lib in "" $dbheader db-5 db5 db4 db3 db; do case "$ac_lib" in -@@ -16912,6 +16920,9 @@ +@@ -16912,6 +16920,9 @@ esac $as_echo "#define HAVE_NDBM 1" >>confdefs.h have_ndbm=yes @@ -54,7 +54,7 @@ else $as_unset ac_cv_func_dbm_firstkey -@@ -28663,7 +28674,7 @@ +@@ -28663,7 +28674,7 @@ fi krb_cv_compile_et="no" krb_cv_com_err_need_r="" @@ -63,7 +63,7 @@ if test "${COMPILE_ET}" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5 -@@ -29176,6 +29187,10 @@ +@@ -29176,6 +29187,10 @@ Usually this means the macro was only invoked conditio fi if test -z "${PKINIT_TRUE}" && test -z "${PKINIT_FALSE}"; then as_fn_error $? "conditional \"PKINIT\" was never defined. Modified: head/security/heimdal/files/patch-configure.ac ============================================================================== --- head/security/heimdal/files/patch-configure.ac Fri Mar 13 17:12:29 2020 (r528365) +++ head/security/heimdal/files/patch-configure.ac Fri Mar 13 17:18:40 2020 (r528366) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2020-03-13 05:39:55.805336000 +0900 -+++ configure.ac 2020-03-13 05:40:40.329535000 +0900 -@@ -153,6 +153,7 @@ +--- configure.ac.orig 2019-06-07 06:21:39 UTC ++++ configure.ac +@@ -153,6 +153,7 @@ AC_ARG_ENABLE(kx509, if test "$enable_kx509" != no ;then AC_DEFINE([KX509], 1, [Define to enable kx509.]) fi Modified: head/security/heimdal/files/patch-kdc-Makefile.am ============================================================================== --- head/security/heimdal/files/patch-kdc-Makefile.am Fri Mar 13 17:12:29 2020 (r528365) +++ head/security/heimdal/files/patch-kdc-Makefile.am Fri Mar 13 17:18:40 2020 (r528366) @@ -1,6 +1,6 @@ ---- kdc/Makefile.am.orig 2016-12-20 23:23:06.000000000 +0900 -+++ kdc/Makefile.am 2020-03-13 04:31:52.289449000 +0900 -@@ -47,10 +47,13 @@ +--- kdc/Makefile.am.orig 2016-12-20 14:23:06 UTC ++++ kdc/Makefile.am +@@ -47,10 +47,13 @@ libkdc_la_SOURCES = \ pkinit-ec.c \ log.c \ misc.c \ Modified: head/security/heimdal/files/patch-kdc-Makefile.in ============================================================================== --- head/security/heimdal/files/patch-kdc-Makefile.in Fri Mar 13 17:12:29 2020 (r528365) +++ head/security/heimdal/files/patch-kdc-Makefile.in Fri Mar 13 17:18:40 2020 (r528366) @@ -1,6 +1,6 @@ ---- kdc/Makefile.in.orig 2020-03-13 04:21:16.723517000 +0900 -+++ kdc/Makefile.in 2020-03-13 04:31:33.004672000 +0900 -@@ -199,7 +199,8 @@ +--- kdc/Makefile.in.orig 2020-03-13 17:12:43 UTC ++++ kdc/Makefile.in +@@ -199,7 +199,8 @@ libkdc_la_DEPENDENCIES = $(LIB_pkinit) \ $(am__DEPENDENCIES_1) am_libkdc_la_OBJECTS = default_config.lo set_dbinfo.lo digest.lo \ fast.lo kerberos5.lo krb5tgs.lo pkinit.lo pkinit-ec.lo log.lo \ @@ -10,7 +10,7 @@ libkdc_la_OBJECTS = $(am_libkdc_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -213,6 +214,8 @@ +@@ -213,6 +214,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 \ @@ -19,7 +19,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 +227,8 @@ +@@ -224,6 +227,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 \ @@ -28,7 +28,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 +237,8 @@ +@@ -232,6 +237,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 \ @@ -37,7 +37,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 +248,8 @@ +@@ -241,6 +248,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) \ @@ -46,7 +46,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 +257,35 @@ +@@ -248,23 +257,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) \ @@ -84,7 +84,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) \ -@@ -622,11 +643,13 @@ +@@ -622,11 +643,13 @@ libkdc_la_SOURCES = \ pkinit-ec.c \ log.c \ misc.c \ @@ -99,7 +99,7 @@ KDC_PROTOS = $(srcdir)/kdc-protos.h $(srcdir)/kdc-private.h ALL_OBJECTS = $(kdc_OBJECTS) $(kdc_replay_OBJECTS) \ $(kdc_tester_OBJECTS) $(libkdc_la_OBJECTS) \ -@@ -636,6 +659,8 @@ +@@ -636,6 +659,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 \ @@ -108,7 +108,7 @@ $(LIB_kdb) \ $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ -@@ -645,6 +670,8 @@ +@@ -645,6 +670,8 @@ hprop_LDADD = \ hpropd_LDADD = \ $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ @@ -117,7 +117,7 @@ $(LIB_kdb) \ $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ -@@ -671,17 +698,24 @@ +@@ -671,17 +698,24 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_roken) \ $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) Modified: head/security/heimdal/files/patch-lib-krb5-krb5_locl.h ============================================================================== --- head/security/heimdal/files/patch-lib-krb5-krb5_locl.h Fri Mar 13 17:12:29 2020 (r528365) +++ head/security/heimdal/files/patch-lib-krb5-krb5_locl.h Fri Mar 13 17:18:40 2020 (r528366) @@ -1,6 +1,6 @@ ---- lib/krb5/krb5_locl.h.orig 2020-03-13 06:00:08.405783000 +0900 -+++ lib/krb5/krb5_locl.h 2020-03-13 13:19:46.263840000 +0900 -@@ -143,7 +143,7 @@ +--- lib/krb5/krb5_locl.h.orig 2019-06-07 06:21:39 UTC ++++ lib/krb5/krb5_locl.h +@@ -143,7 +143,7 @@ struct _krb5_krb_auth_data; #include <krb5.h> #include <krb5_err.h> #include <asn1_err.h> @@ -9,7 +9,7 @@ #include <hx509.h> #endif -@@ -271,7 +271,7 @@ +@@ -271,7 +271,7 @@ typedef struct krb5_context_data { #define KRB5_CTX_F_RD_REQ_IGNORE 16 #define KRB5_CTX_F_FCACHE_STRICT_CHECKING 32 struct send_to_kdc *send_to_kdc;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003131718.02DHIfA7039511>