pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mit-krb5-32: compat32 package for mit-krb5
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Sun Jun 30 18:23:26 2019 +0200
Changeset: 478effda86eddc9ef281bade368d4a0bc8b6582f
Added Files:
mit-krb5-32/DESCR
mit-krb5-32/MESSAGE
mit-krb5-32/Makefile
mit-krb5-32/PLIST
mit-krb5-32/buildlink3.mk
mit-krb5-32/distinfo
mit-krb5-32/files/kadmind.sh
mit-krb5-32/files/kdc.sh
mit-krb5-32/files/krb5-config-wrapper.sh
mit-krb5-32/patches/patch-Makefile.in
mit-krb5-32/patches/patch-aclocal.m4
mit-krb5-32/patches/patch-build-tools_krb5-config.in
mit-krb5-32/patches/patch-config_lib.in
mit-krb5-32/patches/patch-config_libnover.in
mit-krb5-32/patches/patch-config_libobj.in
mit-krb5-32/patches/patch-config_libpriv.in
mit-krb5-32/patches/patch-config_pre.in
mit-krb5-32/patches/patch-config_shlib.conf
mit-krb5-32/patches/patch-configure.in
mit-krb5-32/patches/patch-include_osconf.hin
mit-krb5-32/patches/patch-kadmin_cli_ss_wrapper.c
mit-krb5-32/patches/patch-lib_apputils_Makefile.in
mit-krb5-32/patches/patch-lib_apputils_udppktinfo.c
mit-krb5-32/patches/patch-lib_crypto_builtin_pbkdf2.c
mit-krb5-32/patches/patch-lib_gssapi_Makefile.in
mit-krb5-32/patches/patch-lib_gssapi_krb5_import__name.c
mit-krb5-32/patches/patch-lib_kdb_Makefile.in
mit-krb5-32/patches/patch-lib_kdb_kdb__log.c
mit-krb5-32/patches/patch-lib_krb5_asn.1_asn1buf.h
mit-krb5-32/patches/patch-lib_krb5_ccache_Makefile.in
mit-krb5-32/patches/patch-plugins_kdb_db2_Makefile.in
mit-krb5-32/patches/patch-plugins_kdb_db2_libdb2_Makefile.in
mit-krb5-32/patches/patch-plugins_preauth_otp_Makefile.in
mit-krb5-32/patches/patch-plugins_preauth_pkinit_Makefile.in
mit-krb5-32/patches/patch-slave_kproplog.c
mit-krb5-32/patches/patch-util_k5ev_verto-k5ev.c
mit-krb5-32/patches/patch-util_ss_Makefile.in
Log Message:
mit-krb5-32: compat32 package for mit-krb5
Kerberos V5 is an authentication system developed at MIT. It is a network
authentication protocol designed to provide strong authentication for
client/server applications by using secret-key cryptography. (Kerberos
5 is discussed in RFC 1510.)
This package is intended to crosscompile mit-krb5 for i386.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=478effda86eddc9ef281bade368d4a0bc8b6582f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mit-krb5-32/DESCR | 13 ++
mit-krb5-32/MESSAGE | 12 +
mit-krb5-32/Makefile | 98 +++++++++
mit-krb5-32/PLIST | 42 ++++
mit-krb5-32/buildlink3.mk | 12 +
mit-krb5-32/distinfo | 34 +++
mit-krb5-32/files/kadmind.sh | 17 ++
mit-krb5-32/files/kdc.sh | 17 ++
mit-krb5-32/files/krb5-config-wrapper.sh | 19 ++
mit-krb5-32/patches/patch-Makefile.in | 49 +++++
mit-krb5-32/patches/patch-aclocal.m4 | 78 +++++++
.../patches/patch-build-tools_krb5-config.in | 14 ++
mit-krb5-32/patches/patch-config_lib.in | 66 ++++++
mit-krb5-32/patches/patch-config_libnover.in | 63 ++++++
mit-krb5-32/patches/patch-config_libobj.in | 36 +++
mit-krb5-32/patches/patch-config_libpriv.in | 19 ++
mit-krb5-32/patches/patch-config_pre.in | 98 +++++++++
mit-krb5-32/patches/patch-config_shlib.conf | 241 +++++++++++++++++++++
mit-krb5-32/patches/patch-configure.in | 21 ++
mit-krb5-32/patches/patch-include_osconf.hin | 24 ++
mit-krb5-32/patches/patch-kadmin_cli_ss_wrapper.c | 15 ++
mit-krb5-32/patches/patch-lib_apputils_Makefile.in | 17 ++
.../patches/patch-lib_apputils_udppktinfo.c | 16 ++
.../patches/patch-lib_crypto_builtin_pbkdf2.c | 34 +++
mit-krb5-32/patches/patch-lib_gssapi_Makefile.in | 15 ++
.../patches/patch-lib_gssapi_krb5_import__name.c | 22 ++
mit-krb5-32/patches/patch-lib_kdb_Makefile.in | 15 ++
mit-krb5-32/patches/patch-lib_kdb_kdb__log.c | 27 +++
mit-krb5-32/patches/patch-lib_krb5_asn.1_asn1buf.h | 15 ++
.../patches/patch-lib_krb5_ccache_Makefile.in | 16 ++
.../patches/patch-plugins_kdb_db2_Makefile.in | 36 +++
.../patch-plugins_kdb_db2_libdb2_Makefile.in | 22 ++
.../patches/patch-plugins_preauth_otp_Makefile.in | 13 ++
.../patch-plugins_preauth_pkinit_Makefile.in | 15 ++
mit-krb5-32/patches/patch-slave_kproplog.c | 15 ++
mit-krb5-32/patches/patch-util_k5ev_verto-k5ev.c | 15 ++
mit-krb5-32/patches/patch-util_ss_Makefile.in | 15 ++
37 files changed, 1296 insertions(+)
diffs:
diff --git a/mit-krb5-32/DESCR b/mit-krb5-32/DESCR
new file mode 100644
index 0000000000..8cd709377b
--- /dev/null
+++ b/mit-krb5-32/DESCR
@@ -0,0 +1,13 @@
+Kerberos V5 is an authentication system developed at MIT. It is a network
+authentication protocol designed to provide strong authentication for
+client/server applications by using secret-key cryptography. (Kerberos
+5 is discussed in RFC 1510.)
+
+This package provides Kerberos and GSSAPI (Generic Security Services
+Application Programming Interface) development headers and libraries.
+It also includes Kerberos ticket and principal tools.
+
+N.B. Kerberized r-services, telnet and ftp services are now found in
+ the security/mit-krb5-appl package.
+
+This package is intended to crosscompile mit-krb5 for i386.
diff --git a/mit-krb5-32/MESSAGE b/mit-krb5-32/MESSAGE
new file mode 100644
index 0000000000..8729782cff
--- /dev/null
+++ b/mit-krb5-32/MESSAGE
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Please beware that the Kerberized r-services, telnetd and ftpd services and
+the related client applications are no longer included in this package.
+They are now found in security/mit-krb5-appl.
+
+Also to interoperate with older kerberos realms, you may need to set
+ allow_weak_crypto = true
+in the [libdefaults] section of your krb5.conf file
+
+===========================================================================
diff --git a/mit-krb5-32/Makefile b/mit-krb5-32/Makefile
new file mode 100644
index 0000000000..aa4cf4ca94
--- /dev/null
+++ b/mit-krb5-32/Makefile
@@ -0,0 +1,98 @@
+# $NetBSD: Makefile,v 1.100 2019/05/06 08:20:32 wiz Exp $
+
+DISTNAME= krb5-1.16.2
+ABI?= 32
+PKGNAME= compat${ABI}_mit-${DISTNAME}
+PKGREVISION= 1
+CATEGORIES= security
+MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
+
+MAINTAINER= tez%NetBSD.org@localhost
+HOMEPAGE= http://web.mit.edu/kerberos/
+COMMENT= MIT Kerberos 5 authentication system
+
+MAKE_JOBS_SAFE= no
+LIBABISUFFIX?= /32
+CONFIGURE_ARGS+= --libdir=${PREFIX}/lib${LIBABISUFFIX}
+#CONFIGURE_ARGS+= --bindir=${PREFIX}/lib${LIBABISUFFIX}
+#CONFIGURE_ARGS+= --includedir=${PREFIX}/lib${LIBABISUFFIX}
+CFLAGS+= -m32
+
+WRKSRC= ${WRKDIR}/${DISTNAME}/src
+
+BUILD_TARGET= generate-files-mac all
+
+.include "../../mk/bsd.prefs.mk"
+
+CONFLICTS+= heimdal-[0-9]*
+CONFLICTS+= kth-krb4-[0-9]*
+
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+USE_TOOLS+= autoconf gzip m4 msgfmt perl
+.if ${OPSYS} == "SunOS"
+USE_TOOLS+= bison
+.else
+USE_TOOLS+= yacc
+.endif
+
+# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc.
+MIT_KRB5_STATEDIR?= ${VARBASE}
+FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR}
+
+BUILD_DEFS+= VARBASE
+
+CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-dns-for-realm
+CONFIGURE_ARGS+= --disable-kdc-lookaside-cache
+CONFIGURE_ARGS+= --disable-thread-support
+CONFIGURE_ARGS+= --without-tcl
+CONFIGURE_ARGS+= --enable-pkgsrc-libtool
+CONFIGURE_ARGS+= --without-system-verto
+CONFIGURE_ARGS+= --disable-aesni
+CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ENV+= DEFKTNAME=FILE:${PKG_SYSCONFDIR}/krb5.keytab
+MAKE_ENV+= ROOT_USER=${ROOT_USER}
+LIBS.SunOS= -lrt
+
+PATCH_DIST_ARGS= -d ${WRKSRC} -p2
+
+INFO_FILES= YES
+
+OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+#RCD_SCRIPTS= kadmind kdc
+
+INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \
+ ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
+ ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 \
+ sbin share/examples/krb5 share/et \
+ share/examples/rc.d share/gnats \
+ lib/32/krb5/plugins/kdb lib/32/krb5/plugins/preauth \
+ lib/32/krb5/plugins/tls include/krb5 include/kadm5 \
+ lib/32/pkgconfig
+
+pre-configure:
+ cd ${WRKSRC} && autoconf -I ${WRKSRC} -f
+
+# pre-install:
+# find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} \
+# -prune -o -type f -exec ${RM} {} +
+
+remove-non-libs:
+ echo "Removing non-compat lib package content"
+ find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -or -type f -exec ${RM} {} +
+
+post-install: remove-non-libs
+ # cd ${WRKDIR}/${DISTNAME}/doc; \
+ # for f in *.info *.info-[0-9]*; do \
+ # ${TEST} ! -f "$$f" || \
+ # ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \
+ # done
+
+BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.1
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mit-krb5-32/PLIST b/mit-krb5-32/PLIST
new file mode 100644
index 0000000000..209790571e
--- /dev/null
+++ b/mit-krb5-32/PLIST
@@ -0,0 +1,42 @@
+@comment $NetBSD$
+lib/32/krb5/plugins/kdb/libdb2.la
+lib/32/krb5/plugins/preauth/libotp.la
+lib/32/krb5/plugins/preauth/libpkinit.la
+lib/32/krb5/plugins/tls/libk5tls.la
+lib/32/libcom_err.la
+lib/32/libgssapi_krb5.la
+lib/32/libgssrpc.la
+lib/32/libk5crypto.la
+lib/32/libkadm5clnt.la
+lib/32/libkadm5clnt_mit.la
+lib/32/libkadm5srv.la
+lib/32/libkadm5srv_mit.la
+lib/32/libkdb5.la
+lib/32/libkrad.la
+lib/32/libkrb5.la
+lib/32/libkrb5support.la
+lib/32/libverto.la
+lib/32/pkgconfig/gssrpc.pc
+lib/32/pkgconfig/kadm-client.pc
+lib/32/pkgconfig/kadm-server.pc
+lib/32/pkgconfig/kdb.pc
+lib/32/pkgconfig/krb5-gssapi.pc
+lib/32/pkgconfig/krb5.pc
+lib/32/pkgconfig/mit-krb5-gssapi.pc
+lib/32/pkgconfig/mit-krb5.pc
+@pkgdir share/locale/en_US/LC_MESSAGES
+@pkgdir share/locale/de/LC_MESSAGES
+@pkgdir share/gnats
+@pkgdir share/examples/rc.d
+@pkgdir share/examples/krb5
+@pkgdir share/et
+@pkgdir sbin
+@pkgdir man/man8
+@pkgdir man/man7
+@pkgdir man/man5
+@pkgdir man/man1
+@pkgdir include/krb5
+@pkgdir include/kadm5
+@pkgdir include/gssrpc
+@pkgdir include/gssapi
+@pkgdir bin
diff --git a/mit-krb5-32/buildlink3.mk b/mit-krb5-32/buildlink3.mk
new file mode 100644
index 0000000000..18945cf7a6
--- /dev/null
+++ b/mit-krb5-32/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.15 2018/06/15 20:46:01 tez Exp $
+
+BUILDLINK_TREE+= mit-krb5
+
+.if !defined(MIT_KRB5_BUILDLINK3_MK)
+MIT_KRB5_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4
+BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5
+.endif # MIT_KRB5_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -mit-krb5
diff --git a/mit-krb5-32/distinfo b/mit-krb5-32/distinfo
new file mode 100644
index 0000000000..295157afe2
--- /dev/null
+++ b/mit-krb5-32/distinfo
@@ -0,0 +1,34 @@
+$NetBSD: distinfo,v 1.68 2019/05/06 14:06:05 wiz Exp $
+
+SHA1 (krb5-1.16.2.tar.gz) = 6d6ef205194be386fb5f4e6bef32cb9fc79e853b
+RMD160 (krb5-1.16.2.tar.gz) = 76188113d13eb9667d6057fe23d653a3d09d4817
+SHA512 (krb5-1.16.2.tar.gz) = 738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9
+Size (krb5-1.16.2.tar.gz) = 9652415 bytes
+SHA1 (patch-Makefile.in) = adacbcb9d569107e6b7af9b0e7ee177f79a9103c
+SHA1 (patch-aclocal.m4) = f94e587c4b3e15bcf7dde215cf146ba077202218
+SHA1 (patch-build-tools_krb5-config.in) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a
+SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007
+SHA1 (patch-config_libnover.in) = 53f539cf98a961483e2b4ccf278c7376dbcf52d9
+SHA1 (patch-config_libobj.in) = c7395b9de5baf6612b8787fad55dbc051a680bfd
+SHA1 (patch-config_libpriv.in) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
+SHA1 (patch-config_pre.in) = 255973132db9327190211214c3e33b4551bd283b
+SHA1 (patch-config_shlib.conf) = c47a647307e7d883e7c22528b7b0f5ad038cbcb3
+SHA1 (patch-configure.in) = 2b7de47c4da223670566c70ce1a9eaa27d49a984
+SHA1 (patch-include_osconf.hin) = d31a8164f417bc31a787c8e16d1bd24f27b7140d
+SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d
+SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7
+SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c
+SHA1 (patch-lib_crypto_builtin_pbkdf2.c) = 5d67d5435cc4e14e9ba2e548101b272918616f1c
+SHA1 (patch-lib_gssapi_Makefile.in) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
+SHA1 (patch-lib_gssapi_krb5_import__name.c) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
+SHA1 (patch-lib_kdb_Makefile.in) = 0c45e34ea8b5d0270c386d430b0d37469e8440ea
+SHA1 (patch-lib_kdb_kdb__log.c) = 87052d7940db0f5a41ffce250c19c0b338b37d60
+SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = 74d7d172ec4c8d7f68a093befc6b40c99b119e37
+SHA1 (patch-lib_krb5_ccache_Makefile.in) = 330ae21ec3b290ae16478c2c49a138acac5bf2fd
+SHA1 (patch-plugins_kdb_db2_Makefile.in) = f374fc5915b735075fbb751ef736f4ce54abc289
+SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9
+SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8
+SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = c778366d5bd1cae85424643a582013101fc9632d
+SHA1 (patch-slave_kproplog.c) = a238c8740aeb5e4068775148f03a8692bd514423
+SHA1 (patch-util_k5ev_verto-k5ev.c) = 8f074ddccbaaa03576f0302437aed3aaad1b738d
+SHA1 (patch-util_ss_Makefile.in) = 5ca0bf7295a8f4c1d8e59097863940f88d224ee7
diff --git a/mit-krb5-32/files/kadmind.sh b/mit-krb5-32/files/kadmind.sh
new file mode 100644
index 0000000000..40acc6bf77
--- /dev/null
+++ b/mit-krb5-32/files/kadmind.sh
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: kadmind.sh,v 1.3 2018/06/15 20:46:01 tez Exp $
+#
+# PROVIDE: kadmind
+# REQUIRE: kdc
+# BEFORE: SERVERS
+
+. /etc/rc.subr
+
+name="kadmind"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+required_files="@PKG_SYSCONFDIR@/krb5.conf @MIT_KRB5_STATEDIR@/krb5kdc/kdc.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mit-krb5-32/files/kdc.sh b/mit-krb5-32/files/kdc.sh
new file mode 100644
index 0000000000..3ffc746ad0
--- /dev/null
+++ b/mit-krb5-32/files/kdc.sh
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: kdc.sh,v 1.3 2018/06/15 20:46:01 tez Exp $
+#
+# PROVIDE: kdc
+# REQUIRE: NETWORKING
+# BEFORE: SERVERS
+
+. /etc/rc.subr
+
+name="kdc"
+rcvar=$name
+command="@PREFIX@/sbin/krb5kdc"
+required_files="@PKG_SYSCONFDIR@/krb5.conf @MIT_KRB5_STATEDIR@/krb5kdc/kdc.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mit-krb5-32/files/krb5-config-wrapper.sh b/mit-krb5-32/files/krb5-config-wrapper.sh
new file mode 100644
index 0000000000..c339210d62
--- /dev/null
+++ b/mit-krb5-32/files/krb5-config-wrapper.sh
@@ -0,0 +1,19 @@
+#
+# Wrapper for the SunOS builtin krb5-config, which does not accept all of the
+# 'libraries' arguments that the standard MIT krb5-config does.
+#
+
+args=
+for arg; do
+ case "${arg}" in
+ # Unsupported arguments
+ gssapi|kadm-client|kadm-server|kdb)
+ continue
+ ;;
+ *)
+ args="${args} ${arg}"
+ ;;
+ esac
+done
+
+@KRB5_CONFIG@ ${args}
diff --git a/mit-krb5-32/patches/patch-Makefile.in b/mit-krb5-32/patches/patch-Makefile.in
new file mode 100644
index 0000000000..216dccda98
--- /dev/null
+++ b/mit-krb5-32/patches/patch-Makefile.in
@@ -0,0 +1,49 @@
+$NetBSD: patch-Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Don't build plugin examples & tests and avoid libtool problem.
+No idea why... copied from previous instance of this package.
+
+--- Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ Makefile.in
+@@ -9,23 +9,11 @@ mydir=.
+ SUBDIRS=util include lib \
+ @sam2_plugin@ \
+ plugins/audit \
+- plugins/audit/test \
+ @audit_plugin@ \
+- plugins/kadm5_hook/test \
+- plugins/kadm5_auth/test \
+- plugins/hostrealm/test \
+- plugins/localauth/test \
+- plugins/pwqual/test \
+- plugins/authdata/greet_server \
+- plugins/authdata/greet_client \
+- plugins/certauth/test \
+ plugins/kdb/db2 \
+ @ldap_plugin_dir@ \
+- plugins/kdb/test \
+- plugins/kdcpolicy/test \
+ plugins/preauth/otp \
+ plugins/preauth/pkinit \
+- plugins/preauth/test \
+ plugins/tls/k5tls \
+ kdc kadmin slave clients appl tests \
+ config-files build-tools man doc @po@
+@@ -76,7 +64,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROO
+ install-strip:
+ $(MAKE) install INSTALL_STRIP=-s
+
+-install-recurse: install-mkdirs
++install-recurse:
+
+ install-mkdirs:
+ @for i in $(INSTALLMKDIRS); do \
+@@ -87,7 +75,7 @@ install-headers-mkdirs:
+ $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)
+ $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi
+ $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc
+-install-headers-prerecurse: install-headers-mkdirs
++install-headers-prerecurse:
+
+ clean-:: clean-windows
+ clean-unix::
diff --git a/mit-krb5-32/patches/patch-aclocal.m4 b/mit-krb5-32/patches/patch-aclocal.m4
new file mode 100644
index 0000000000..ceec2f986f
--- /dev/null
+++ b/mit-krb5-32/patches/patch-aclocal.m4
@@ -0,0 +1,78 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Don't make sunpro warnings into errors (warnings are seen in gcc too)
+Add --enable-pkgsrc-libtool option
+
+--- aclocal.m4.orig 2018-05-03 14:34:47.000000000 +0000
++++ aclocal.m4
+@@ -633,7 +633,7 @@ else
+ if test "x$krb5_ac_warn_cflags_set" = xset ; then
+ AC_MSG_NOTICE(not adding extra warning flags because WARN_CFLAGS was set)
+ else
+- WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION,E_BAD_PTR_INT_COMB_ARG,E_PTR_TO_VOID_IN_ARITHMETIC,E_NO_IMPLICIT_DECL_ALLOWED,E_ATTRIBUTE_PARAM_UNDEFINED"
++ WARN_CFLAGS="-errtags=yes"
+ fi
+ if test "x$krb5_ac_warn_cxxflags_set" = xset ; then
+ AC_MSG_NOTICE(not adding extra warning flags because WARN_CXXFLAGS was set)
+@@ -1068,6 +1068,9 @@ AC_SUBST(SHLIBVEXT)
+ AC_SUBST(SHLIBSEXT)
+ AC_SUBST(DEPLIBEXT)
+ AC_SUBST(PFLIBEXT)
++AC_SUBST(LALIBEXT)
++AC_SUBST(LALIB_EXPFLAGS)
++AC_SUBST(LIBTOOL_TAIL)
+ AC_SUBST(LIBINSTLIST)
+ AC_SUBST(DYNOBJEXT)
+ AC_SUBST(MAKE_DYNOBJ_COMMAND)
+@@ -1085,6 +1088,7 @@ AC_SUBST(OBJLISTS)
+ AC_SUBST(STOBJEXT)
+ AC_SUBST(SHOBJEXT)
+ AC_SUBST(PFOBJEXT)
++AC_SUBST(LAOBJEXT)
+ AC_SUBST(PICFLAGS)
+ AC_SUBST(PROFFLAGS)])
+
+@@ -1199,11 +1203,42 @@ else
+ KDB5_PLUGIN_DEPLIBS=
+ KDB5_PLUGIN_LIBS=
+ fi
++DEPSTLIBEXT=$STLIBEXT
++AC_SUBST(DEPSTLIBEXT)
+ CC_LINK="$CC_LINK_SHARED"
+ CXX_LINK="$CXX_LINK_SHARED"
+
++# Check whether to build libtool archives.
++AC_ARG_ENABLE([pkgsrc-libtool],
++[ --enable-pkgsrc-libtool build libtool archives],
++[
++ case $enableval in
++ /*) LIBTOOL=$enableval ;;
++ *) LIBTOOL=libtool ;;
++ esac
++ AC_MSG_RESULT([Enabling libtool archives.])
++ LIBLIST='lib$(LIBBASE)$(LALIBEXT)'
++ LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT)'
++ OBJLISTS=OBJS.LA
++ LIBINSTLIST=install-libtool
++ DEPLIBEXT=$LALIBEXT
++ DEPSTLIBEXT=$LALIBEXT
++ PLUGIN='lib$(LIBBASE)$(LALIBEXT)'
++ PLUGININST=install-libtool
++ CC_LINK="$CC_LINK_LIBTOOL"
++ INSTALL_LIBTOOL='$(LIBTOOL) --mode=install'
++ if test "$krb5_force_static" = yes; then
++ LIBTOOL_TAIL=
++ fi
++], [
++ LIBTOOL=:
++ INSTALL_LIBTOOL=
++])
++AC_SUBST(LIBTOOL)
++AC_SUBST(INSTALL_LIBTOOL)
++
+ if test -z "$LIBLIST"; then
+- AC_MSG_ERROR([must enable one of shared or static libraries])
++ AC_MSG_ERROR([must enable one of shared, libtool or static libraries])
+ fi
+
+ # Check whether to build profiled libraries.
diff --git a/mit-krb5-32/patches/patch-build-tools_krb5-config.in b/mit-krb5-32/patches/patch-build-tools_krb5-config.in
new file mode 100644
index 0000000000..22a75e86fe
--- /dev/null
+++ b/mit-krb5-32/patches/patch-build-tools_krb5-config.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-build-tools_krb5-config.in,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add --enable-pkgsrc-libtool option
+
+--- build-tools/krb5-config.in.orig 2010-12-12 17:46:49.027864000 -0600
++++ build-tools/krb5-config.in 2010-12-12 17:48:58.611160100 -0600
+@@ -180,6 +180,7 @@
+ # Ugly gross hack for our build tree
+ lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
+ -e 's/\$(PURE)//' \
++ -e 's/\$(LIBTOOL) --mode=link//' \
+ -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \
+ -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
diff --git a/mit-krb5-32/patches/patch-config_lib.in b/mit-krb5-32/patches/patch-config_lib.in
new file mode 100644
index 0000000000..5095d6df59
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_lib.in
@@ -0,0 +1,66 @@
+$NetBSD: patch-config_lib.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+(was patch-ad)
+
+--- config/lib.in.orig 2016-02-29 19:50:13.000000000 +0000
++++ config/lib.in
+@@ -21,8 +21,9 @@ LIBPREFIX=lib
+
+ SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
+ PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
++LAOBJLISTS=$(STOBJLISTS:.ST=.LA)
+
+-dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse
++dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF) $(SUBDIROBJLISTS:.ST=.LA): all-recurse
+
+ # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files
+ PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;'
+@@ -93,6 +94,21 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS)
+ set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist
+ $(RANLIB) $@
+
++lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
++ $(RM) $@
++ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@
++
++${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS)
++ $(RM) $@
++ @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))"
++ @dirs=`echo $(LAOBJLISTS) | \
++ sed -e 's%/OBJS.LA%%g' -e 's%OBJS.LA%.%'`; \
++ $(LIBTOOL) --mode=link $(CC) -o $@ `for d in $$dirs; do \
++ sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \
++ $$d/OBJS.LA; done` \
++ $(LALIB_EXPFLAGS) \
++ $(LIBTOOL_TAIL)
++
+ $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT)
+ $(RM) $@
+ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .)
+@@ -120,6 +136,7 @@ clean-libs:
+ $(RM) lib$(LIBBASE)$(SHLIBSEXT)
+ $(RM) lib$(LIBBASE)$(SHLIBEXT)
+ $(RM) lib$(LIBBASE)$(PFLIBEXT)
++ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
+ $(RM) binutils.versions osf1.exports darwin.exports hpux.exports
+
+ clean-liblinks:
+@@ -128,6 +145,7 @@ clean-liblinks:
+ $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)
+ $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT)
+ $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT)
++ $(RM) lib$(LIBBASE)$(LALIBEXT)
+
+ install-libs: $(LIBINSTLIST)
+ install-static:
+@@ -148,6 +166,9 @@ install-profiled:
+ $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT)
+ $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR)
+ $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT)
++install-libtool:
++ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(LALIBEXT)
++ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR)
+
+ Makefile: $(top_srcdir)/config/lib.in
+ $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf
diff --git a/mit-krb5-32/patches/patch-config_libnover.in b/mit-krb5-32/patches/patch-config_libnover.in
new file mode 100644
index 0000000000..92805ecea8
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_libnover.in
@@ -0,0 +1,63 @@
+$NetBSD: patch-config_libnover.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+(was patch-ci)
+
+--- config/libnover.in.orig 2016-02-29 19:50:13.000000000 +0000
++++ config/libnover.in
+@@ -20,8 +20,10 @@ LIBPREFIX=
+
+ SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
+ PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
++LAOBJLISTS=$(STOBJLISTS:.ST=.LA)
++LIBTOOL_TAIL=-rpath $(MODULE_INSTALL_DIR) -shared -module -avoid-version
+
+-dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse
++dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF) $(SUBDIROBJLISTS:.ST=.LA): all-recurse
+
+ # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files
+ PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;'
+@@ -83,6 +85,25 @@ libkrb5_$(LIBBASE)$(PFLIBEXT): $(PFOBJLI
+ set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist
+ $(RANLIB) $@
+
++lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
++ $(RM) $@
++ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@
++
++../lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
++ $(RM) $@
++ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@
++
++${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS)
++ $(RM) $@
++ @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))"
++ @dirs=`echo $(LAOBJLISTS) | \
++ sed -e 's%/OBJS.LA%%g' -e 's%OBJS.LA%.%'`; \
++ $(LIBTOOL) --mode=link $(CC) -o $@ `for d in $$dirs; do \
++ sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \
++ $$d/OBJS.LA; done` \
++ $(LALIB_EXPFLAGS) \
++ $(LIBTOOL_TAIL)
++
+ # For static builds, we make a symlink in the main library directory,
+ # allowing the plugin library to be a dependency of the core libraries
+ # which use it.
+@@ -101,6 +122,7 @@ all-libs: $(PLUGIN)
+
+ clean-libs:
+ $(RM) $(LIBBASE)$(DYNOBJEXT)
++ $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT)
+ $(RM) binutils.versions osf1.exports darwin.exports hpux.exports
+
+ clean-liblinks:
+@@ -114,6 +136,9 @@ install-static:
+ install-plugin:
+ $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/$(LIBBASE)$(DYNOBJEXT)
+ $(INSTALL_SHLIB) $(LIBBASE)$(DYNOBJEXT) $(DESTDIR)$(MODULE_INSTALL_DIR)
++install-libtool:
++ $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/lib$(LIBBASE)$(LALIBEXT)
++ $(LIBTOOL) --mode=install $(INSTALL_SHLIB) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(MODULE_INSTALL_DIR)/lib$(LIBBASE)$(LALIBEXT)
+
+ Makefile: $(top_srcdir)/config/libnover.in
+ $(BUILDTOP)/config.status: $(top_srcdir)/config/shlib.conf
diff --git a/mit-krb5-32/patches/patch-config_libobj.in b/mit-krb5-32/patches/patch-config_libobj.in
new file mode 100644
index 0000000000..db10400a56
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_libobj.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-config_libobj.in,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add --enable-pkgsrc-libtool option
+
+--- config/libobj.in.orig 2010-12-12 17:25:51.187240600 -0600
++++ config/libobj.in 2010-12-12 17:27:15.877207200 -0600
+@@ -7,11 +7,13 @@
+ # STLIBOBJS list of .o objects; this must not contain variable
+ # references.
+
+-.SUFFIXES: .c .so .po
++.SUFFIXES: .c .so .po .lo
+ .c.so:
+ $(CC) $(PICFLAGS) -DSHARED $(ALL_CFLAGS) -c $< -o $*.so.o && $(MV) $*.so.o $*.so
+ .c.po:
+ $(CC) $(PROFFLAGS) $(ALL_CFLAGS) -c $< -o $*.po.o && $(MV) $*.po.o $*.po
++.c.lo:
++ $(LIBTOOL) --mode=compile $(CC) $(ALL_CFLAGS) -c $<
+
+ # rules to generate object file lists
+
+@@ -27,10 +29,13 @@
+ @echo $(PFLIBOBJS) > $@
+ : updated $@
+
++OBJS.LA: $(LALIBOBJS) Makefile
++ @echo $(LALIBOBJS) > $@
++
+ all-libobjs: $(OBJLISTS)
+
+ clean-libobjs:
+- $(RM) OBJS.ST OBJS.SH OBJS.PF $(STLIBOBJS) $(SHLIBOBJS) $(PFLIBOBJS)
++ $(RM) OBJS.ST OBJS.SH OBJS.PF OBJS.LA $(STLIBOBJS) $(SHLIBOBJS) $(PFLIBOBJS) $(LALIBOBJS)
+
+ Makefile: $(top_srcdir)/config/libobj.in
+ config.status: $(top_srcdir)/config/shlib.conf
diff --git a/mit-krb5-32/patches/patch-config_libpriv.in b/mit-krb5-32/patches/patch-config_libpriv.in
new file mode 100644
index 0000000000..7f34157b3d
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_libpriv.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-config_libpriv.in,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add --enable-pkgsrc-libtool option
+
+--- config/libpriv.in.orig Wed Jan 5 12:25:20 2011
++++ config/libpriv.in Wed Jan 5 12:26:34 2011
+@@ -3,9 +3,9 @@
+ #
+ # The defaults (for installed shared libraries) are in pre.in. We
+ # override them here, before lib.in uses them.
+-LIBLIST=lib$(LIBBASE)$(STLIBEXT)
+-LIBLINKS=$(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT)
+-OBJLISTS=OBJS.ST
++LIBLIST=lib$(LIBBASE)$(LALIBEXT)
++LIBLINKS=$(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT)
++OBJLISTS=OBJS.LA
+ LIBINSTLIST=
+ SHLIBEXT=.so-nobuild
+ SHLIBVEXT=.so.v-nobuild
diff --git a/mit-krb5-32/patches/patch-config_pre.in b/mit-krb5-32/patches/patch-config_pre.in
new file mode 100644
index 0000000000..b2375b511e
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_pre.in
@@ -0,0 +1,98 @@
+$NetBSD: patch-config_pre.in,v 1.3 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+Use $(ROOT_USER) in place of root
+Make sure LDFLAGS are not ignored
+
+--- config/pre.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ config/pre.in
+@@ -171,6 +171,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
++LIBTOOL = @LIBTOOL@
+ CC = @CC@
+ CXX = @CXX@
+ LD = $(PURE) @LD@
+@@ -180,11 +181,12 @@ LIBS = @LIBS@
+
+ INSTALL=@INSTALL@
+ INSTALL_STRIP=
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
+-INSTALL_SCRIPT=@INSTALL_PROGRAM@
++INSTALL_LIBTOOL=@INSTALL_LIBTOOL@
++INSTALL_PROGRAM=$(INSTALL_LIBTOOL) @INSTALL_PROGRAM@ $(INSTALL_STRIP)
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ INSTALL_DATA=@INSTALL_DATA@
+ INSTALL_SHLIB=@INSTALL_SHLIB@
+-INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
++INSTALL_SETUID=$(INSTALL_LIBTOOL) $(INSTALL) $(INSTALL_STRIP) -m 4555 -o $(ROOT_USER)
+ ## This is needed because autoconf will sometimes define @exec_prefix@ to be
+ ## ${prefix}.
+ prefix=@prefix@
+@@ -315,6 +317,10 @@ PROG_RPATH_FLAGS=@PROG_RPATH_FLAGS@
+ # depending on whether we're building with shared libraries.
+ DEPLIBEXT=@DEPLIBEXT@
+
++# this gets set by configure to either $(STLIBEXT) or $(LALIBEXT),
++# depending on whether we're building libtool archives.
++DEPSTLIBEXT=@DEPSTLIBEXT@
++
+ KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@
+ KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@
+
+@@ -332,12 +338,12 @@ COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_er
+ SUPPORT_LIBNAME=krb5support
+ SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT)
+
+-# These are forced to use ".a" as an extension because they're never
++# These are forced to use "@DEPSTLIBEXT" as an extension because they're never
+ # built shared.
+ SS_DEPLIB = $(SS_DEPLIB-@SS_VERSION@)
+-SS_DEPLIB-k5 = $(TOPLIBD)/libss.a
++SS_DEPLIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT)
+ SS_DEPLIB-sys =
+-APPUTILS_DEPLIB = $(TOPLIBD)/libapputils.a
++APPUTILS_DEPLIB = $(TOPLIBD)/libapputils$(DEPSTLIBEXT)
+
+ KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
+ KDB5_DEPLIBS = $(KDB5_DEPLIB) $(KDB5_PLUGIN_DEPLIBS)
+@@ -376,7 +382,7 @@ RL_LIBS = @RL_LIBS@
+
+ SS_LIB = $(SS_LIB-@SS_VERSION@)
+ SS_LIB-sys = @SS_LIB@
+-SS_LIB-k5 = $(TOPLIBD)/libss.a $(RL_LIBS)
++SS_LIB-k5 = $(TOPLIBD)/libss$(DEPSTLIBEXT) $(RL_LIBS)
+ KDB5_LIB = -lkdb5 $(KDB5_PLUGIN_LIBS)
+
+ VERTO_DEPLIB = $(VERTO_DEPLIB-@VERTO_VERSION@)
+@@ -556,6 +562,9 @@ MAKE_DYNOBJ_COMMAND=@MAKE_DYNOBJ_COMMAND
+ DYNOBJ_EXPDEPS=@DYNOBJ_EXPDEPS@
+ DYNOBJ_EXPFLAGS=@DYNOBJ_EXPFLAGS@
+
++# usually .la
++LALIBEXT=@LALIBEXT@
++
+ # For some platforms, a flag which causes shared library creation to
+ # check for undefined symbols. Suppressed when using --enable-asan.
+ UNDEF_CHECK=@UNDEF_CHECK@
+@@ -587,6 +596,7 @@ SHLIB_RPATH_FLAGS=@SHLIB_RPATH_FLAGS@
+ # flags for explicit libraries depending on this one,
+ # e.g. "$(SHLIB_RPATH_FLAGS) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
+ SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
++LALIB_EXPFLAGS=@LALIB_EXPFLAGS@ $(LDFLAGS)
+
+ ## Parameters to be set by configure for use in libobj.in:
+
+@@ -598,6 +608,11 @@ OBJLISTS=@OBJLISTS@
+ # the suffix substitution will break on some platforms!
+ SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
+ PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
++LALIBOBJS=$(STLIBOBJS:.o=@LAOBJEXT@)
++
++# Args to tack on the tail of LIBTOOL to generate versioned, installable
++# libtool archives.
++LIBTOOL_TAIL=@LIBTOOL_TAIL@
+
+ #
+ # rules to make various types of object files
diff --git a/mit-krb5-32/patches/patch-config_shlib.conf b/mit-krb5-32/patches/patch-config_shlib.conf
new file mode 100644
index 0000000000..ce1a1a29d6
--- /dev/null
+++ b/mit-krb5-32/patches/patch-config_shlib.conf
@@ -0,0 +1,241 @@
+$NetBSD: patch-config_shlib.conf,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+(was patch-ag)
+
+--- config/shlib.conf.orig 2016-02-29 19:50:13.000000000 +0000
++++ config/shlib.conf
+@@ -22,6 +22,7 @@ SHLIBVEXT=.so.v-nobuild
+ SHLIBSEXT=.so.s-nobuild
+ # Most systems support profiled libraries.
+ PFLIBEXT=_p.a
++LALIBEXT=.la
+ # Most systems install shared libs as mode 644, etc. while hpux wants 755
+ INSTALL_SHLIB='$(INSTALL_DATA)'
+ # Most systems use the same objects for shared libraries and dynamically
+@@ -37,6 +38,7 @@ use_linker_fini_option=no
+ STOBJEXT=.o
+ SHOBJEXT=.so
+ PFOBJEXT=.po
++LAOBJEXT=.lo
+ # Default for systems w/o shared libraries
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
+@@ -51,6 +53,9 @@ INIT_FINI_PREP=:
+ default_static=no
+ default_shared=yes
+
++SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
++PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
++
+ # Set up architecture-specific variables.
+ case $krb5_cv_host in
+ alpha*-dec-osf*)
+@@ -65,11 +70,9 @@ alpha*-dec-osf*)
+ use_linker_init_option=yes
+ use_linker_fini_option=yes
+ EXTRA_FILES="$EXTRA_FILES export"
+- SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ PROFFLAGS=-pg
+ RPATH_FLAG='-Wl,-rpath -Wl,'
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)'
+ if test "$ac_cv_c_compiler_gnu" = yes \
+@@ -132,17 +135,14 @@ alpha*-dec-osf*)
+ RPATH_FLAG='-Wl,+b,'
+ if test "$ac_cv_c_compiler_gnu" = yes; then
+ PICFLAGS=-fPIC
+- SHLIB_RPATH_FLAGS='-Wl,+b,$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='-Wl,+s $(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ LDCOMBINE='gcc -fPIC -shared -Wl,+h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-c,hpux.exports'
+ else
+ PICFLAGS=+z
+- SHLIB_RPATH_FLAGS='+b $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ LDCOMBINE='ld -b +h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -c hpux.exports'
+ fi
+ MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(LDFLAGS) \$(SHLIB_EXPFLAGS) ${LDCOMBINE_TAIL}"
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -172,12 +172,10 @@ mips-sgi-irix6.3) # This is a Kludge; se
+ else
+ LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)'
+ fi
+- SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ # no gprof for Irix...
+ PROFFLAGS=-p
+ RPATH_FLAG='-Wl,-rpath -Wl,'
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -221,12 +219,10 @@ mips-sgi-irix*)
+ opts=''
+ fi
+ LDCOMBINE='$(CC) -shared '$opts' -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini'
+- SHLIB_RPATH_FLAGS='-rpath $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ # no gprof for Irix...
+ PROFFLAGS=-p
+ RPATH_FLAG='-Wl,-rpath -Wl,'
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -258,13 +254,11 @@ mips-sni-sysv4)
+ PICFLAGS=-Kpic
+ LDCOMBINE='$(CC) -G -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)'
+ fi
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ SHLIBEXT=.so
+ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ SHLIBSEXT='.so.$(LIBMAJOR)'
+ RPATH_FLAG=-R
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -280,10 +274,8 @@ mips-*-netbsd*)
+ SHLIBSEXT='.so.$(LIBMAJOR)'
+ SHLIBEXT=.so
+ LDCOMBINE='ld -shared -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)'
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ RPATH_FLAG='-Wl,-rpath -Wl,'
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -293,15 +285,13 @@ mips-*-netbsd*)
+ PROFFLAGS=-pg
+ ;;
+
+-*-*-netbsd*)
++*-*-netbsd* | *-*-dragonfly*)
+ PICFLAGS=-fPIC
+ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ SHLIBEXT=.so
+ LDCOMBINE='$(CC) -shared'
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+- RPATH_FLAG=-R
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
++ RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -322,12 +312,10 @@ mips-*-netbsd*)
+ esac
+ SHLIBVEXT='.so.$(LIBMAJOR)'
+ RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+ SHLIBEXT=.so
+ LDCOMBINE='ld -Bshareable'
+- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
+@@ -341,10 +329,8 @@ mips-*-netbsd*)
+ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ SHLIBEXT=.so
+ LDCOMBINE='ld -Bshareable'
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+- RPATH_FLAG=-R
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
++ RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -370,7 +356,7 @@ mips-*-netbsd*)
+ for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do
+ LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib"
+ done
+- MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
++ MAKE_DYNOBJ_COMMAND='${LIBTOOL} --mode=link $(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)'
+@@ -402,11 +388,9 @@ mips-*-netbsd*)
+ SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ SHLIBSEXT='.so.$(LIBMAJOR)'
+ SHLIBEXT=.so
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ PROFFLAGS=-pg
+- RPATH_FLAG=-R
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
++ RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(PURE) $(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -429,10 +413,8 @@ mips-*-netbsd*)
+ RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
+ # For cases where we do have dependencies on other libraries
+ # built in this tree...
+- SHLIB_RPATH_FLAGS='$(RPATH_FLAG)$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ PROFFLAGS=-pg
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -457,9 +439,7 @@ mips-*-netbsd*)
+ SHLIBVEXT='.so.$(LIBMAJOR)'
+ SHLIBEXT=.so
+ LDCOMBINE='ld -Bshareable'
+- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+ SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+- PROG_RPATH_FLAGS='-Wl,-rpath,$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)'
+@@ -489,9 +469,8 @@ mips-*-netbsd*)
+ # Assume initialization always delayed.
+ INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
+ use_linker_fini_option=yes
+- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"
++ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"
+ RPATH_TAIL=:/usr/lib:/lib
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -526,10 +505,9 @@ mips-*-netbsd*)
+ # Assume initialization always delayed.
+ INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
+ use_linker_fini_option=yes
+- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
+- MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE_DYN}"
++ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
++ MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE_DYN}"
+ RPATH_TAIL=:/usr/lib:/lib
+- PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+@@ -542,8 +520,14 @@ esac
+
+ if test "${MAKE_SHLIB_COMMAND}" = "x" ; then
+ if test "${INIT_FINI_PREP}" != ":"; then
+- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
++ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
+ else
+- MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
++ MAKE_SHLIB_COMMAND="${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
+ fi
+ fi
++
++# Settings for building with pkgsrc libtool.
++CC_LINK_LIBTOOL='$(LIBTOOL) --mode=link '"$CC_LINK_SHARED"
++LALIB_EXPFLAGS='$(SHLIB_EXPFLAGS)'
++LIBTOOL_TAIL='-rpath $(KRB5_LIBDIR) -version-info $(LIBMAJOR):$(LIBMINOR)'
++INSTALL_SHLIB='$(INSTALL)'
diff --git a/mit-krb5-32/patches/patch-configure.in b/mit-krb5-32/patches/patch-configure.in
new file mode 100644
index 0000000000..796ae6cbd0
--- /dev/null
+++ b/mit-krb5-32/patches/patch-configure.in
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure.in,v 1.3 2018/06/15 20:46:01 tez Exp $
+
+Find the correct libcrypto.
+
+--- configure.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ configure.in
+@@ -287,12 +287,12 @@ AC_HELP_STRING([--with-tls-impl=IMPL],
+ case "$TLS_IMPL" in
+ openssl|auto)
+ AC_CHECK_LIB(ssl,SSL_CTX_new,[have_lib_ssl=true],[have_lib_ssl=false],
+- -lcrypto)
++ "-L${BUILDLINK_PREFIX_OPENSSL}/lib -lcrypto")
+ AC_MSG_CHECKING([for OpenSSL])
+ if test x$have_lib_ssl = xtrue ; then
+ AC_DEFINE(TLS_IMPL_OPENSSL,1,[Define if TLS implementation is OpenSSL])
+ AC_MSG_RESULT([yes])
+- TLS_IMPL_LIBS="-lssl -lcrypto"
++ TLS_IMPL_LIBS="-L${BUILDLINK_PREFIX_OPENSSL}/lib -lssl -lcrypto"
+ TLS_IMPL=openssl
+ AC_MSG_NOTICE([TLS module will use OpenSSL])
+ else
diff --git a/mit-krb5-32/patches/patch-include_osconf.hin b/mit-krb5-32/patches/patch-include_osconf.hin
new file mode 100644
index 0000000000..0510eb62fd
--- /dev/null
+++ b/mit-krb5-32/patches/patch-include_osconf.hin
@@ -0,0 +1,24 @@
+$NetBSD: patch-include_osconf.hin,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+prefer @SYSCONFDIR as location for krb5.conf
+(was patch-ah)
+
+--- include/osconf.hin.orig 2016-02-29 19:50:13.000000000 +0000
++++ include/osconf.hin
+@@ -44,13 +44,13 @@
+ #define DEFAULT_PROFILE_FILENAME "krb5.ini"
+ #else /* !_WINDOWS */
+ #if TARGET_OS_MAC
+-#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf@SYSCONFCONF"
+-#define DEFAULT_PROFILE_PATH ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
++#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf"
++#define DEFAULT_PROFILE_PATH ("@SYSCONFDIR/krb5.conf:~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
+ #define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins"
+ #define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins"
+ #define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosAuthDataPlugins"
+ #else
+-#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf@SYSCONFCONF"
++#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/etc/krb5.conf"
+ #define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH
+ #endif
+ #endif /* _WINDOWS */
diff --git a/mit-krb5-32/patches/patch-kadmin_cli_ss_wrapper.c b/mit-krb5-32/patches/patch-kadmin_cli_ss_wrapper.c
new file mode 100644
index 0000000000..0f3e37e093
--- /dev/null
+++ b/mit-krb5-32/patches/patch-kadmin_cli_ss_wrapper.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-kadmin_cli_ss_wrapper.c,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Fix build on OS X (missing time_t definition)
+
+
+--- kadmin/cli/ss_wrapper.c.orig 2016-10-19 17:10:41.000000000 -0500
++++ kadmin/cli/ss_wrapper.c 2016-10-19 17:09:41.000000000 -0500
+@@ -23,6 +23,7 @@
+ * or implied warranty.
+ */
+
++#include <k5-int.h>
+ #include <k5-platform.h>
+ #include <krb5.h>
+ #include <locale.h>
diff --git a/mit-krb5-32/patches/patch-lib_apputils_Makefile.in b/mit-krb5-32/patches/patch-lib_apputils_Makefile.in
new file mode 100644
index 0000000000..3dc482bf1c
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_apputils_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_apputils_Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+libapputils is an internal library, so make it a convenience libtool archive.
+(was patch-ck)
+
+--- lib/apputils/Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ lib/apputils/Makefile.in
+@@ -14,6 +14,9 @@ SED = sed
+
+ STLIBOBJS=net-server.o udppktinfo.o @LIBOBJS@
+ LIBBASE=apputils
++LIBTOOL_TAIL=
++PROG_RPATH= ${KRB5_LIBDIR}
++SHLIB_RDIRS= ${KRB5_LIBDIR}
+
+ all-unix: all-liblinks
+ clean-unix:: clean-liblinks clean-libs clean-libobjs
diff --git a/mit-krb5-32/patches/patch-lib_apputils_udppktinfo.c b/mit-krb5-32/patches/patch-lib_apputils_udppktinfo.c
new file mode 100644
index 0000000000..4d3ad47a68
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_apputils_udppktinfo.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_apputils_udppktinfo.c,v 1.1 2018/06/15 20:46:01 tez Exp $
+
+Don't use IP_PKTINFO on NetBSD, it doesn't support all required fields.
+(based on prior patch-lib_apputils_net-server.c)
+
+--- ./lib/apputils/udppktinfo.c.orig 2018-06-13 17:53:37.880688500 +0000
++++ ./lib/apputils/udppktinfo.c
+@@ -129,7 +129,7 @@ set_pktinfo(int sock, int family)
+ }
+ }
+
+-#if defined(HAVE_PKTINFO_SUPPORT) && defined(CMSG_SPACE)
++#if defined(HAVE_PKTINFO_SUPPORT) && defined(CMSG_SPACE) && !defined(__NetBSD__)
+
+ /*
+ * Check if a socket is bound to a wildcard address.
diff --git a/mit-krb5-32/patches/patch-lib_crypto_builtin_pbkdf2.c b/mit-krb5-32/patches/patch-lib_crypto_builtin_pbkdf2.c
new file mode 100644
index 0000000000..b9c6ec7e4b
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_crypto_builtin_pbkdf2.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-lib_crypto_builtin_pbkdf2.c,v 1.2 2019/05/06 14:06:05 wiz Exp $
+
+Fix conflict with hmac() symbol in libc.
+https://github.com/krb5/krb5/pull/926
+
+--- lib/crypto/builtin/pbkdf2.c.orig 2018-11-01 23:51:07.000000000 +0000
++++ lib/crypto/builtin/pbkdf2.c
+@@ -75,7 +75,7 @@ static void printd (const char *descr, k
+ * index appended to the original salt.
+ */
+ static krb5_error_code
+-hmac(const struct krb5_hash_provider *hash, krb5_keyblock *pass,
++krb5_hmac(const struct krb5_hash_provider *hash, krb5_keyblock *pass,
+ krb5_data *salt, krb5_data *out)
+ {
+ krb5_error_code err;
+@@ -123,7 +123,7 @@ F(char *output, char *u_tmp1, char *u_tm
+ #if 0
+ printf("F: computing hmac #1 (U_1) with %s\n", pdata.contents);
+ #endif
+- err = hmac(hash, pass, &sdata, &out);
++ err = krb5_hmac(hash, pass, &sdata, &out);
+ if (err)
+ return err;
+ #if 0
+@@ -138,7 +138,7 @@ F(char *output, char *u_tmp1, char *u_tm
+ printf("F: computing hmac #%d (U_%d)\n", j, j);
+ #endif
+ memcpy(u_tmp2, u_tmp1, hlen);
+- err = hmac(hash, pass, &sdata, &out);
++ err = krb5_hmac(hash, pass, &sdata, &out);
+ if (err)
+ return err;
+ #if 0
diff --git a/mit-krb5-32/patches/patch-lib_gssapi_Makefile.in b/mit-krb5-32/patches/patch-lib_gssapi_Makefile.in
new file mode 100644
index 0000000000..110ea56dd0
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_gssapi_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_gssapi_Makefile.in,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add needed headers
+
+--- lib/gssapi/Makefile.in.orig 2010-12-22 17:13:19.073797300 -0600
++++ lib/gssapi/Makefile.in 2010-12-22 17:14:58.061262500 -0600
+@@ -96,7 +96,7 @@
+ # appears to be properly serializing the subdir processing and local
+ # compiles... so far.
+ ##DOS##!if 0
+-$(EXPORTED_HEADERS) generic/gssapi.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse
++$(EXPORTED_HEADERS) generic/gssapi.h generic/errmap.h krb5/error_map.h krb5/gssapi_err_krb5.h generic/gssapi_err_generic.h krb5/gssapi_krb5.h: all-recurse
+ : $@ updated by recursion rule
+ ##DOS##!endif
+
diff --git a/mit-krb5-32/patches/patch-lib_gssapi_krb5_import__name.c b/mit-krb5-32/patches/patch-lib_gssapi_krb5_import__name.c
new file mode 100644
index 0000000000..e03179852d
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_gssapi_krb5_import__name.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_gssapi_krb5_import__name.c,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add DragonFly support. Fallback to LINE_MAX if BUFSIZ is not defined.
+
+--- lib/gssapi/krb5/import_name.c.orig Sat Dec 11 20:12:52 2010
++++ lib/gssapi/krb5/import_name.c Sat Dec 11 20:13:40 2010
+@@ -28,10 +28,15 @@
+ #include "gssapiP_krb5.h"
+
+ #ifndef NO_PASSWORD
++#include <limits.h>
+ #include <pwd.h>
+ #include <stdio.h>
+ #endif
+
++#ifndef BUFSIZ
++#define BUFSIZ LINE_MAX
++#endif
++
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #else
diff --git a/mit-krb5-32/patches/patch-lib_kdb_Makefile.in b/mit-krb5-32/patches/patch-lib_kdb_Makefile.in
new file mode 100644
index 0000000000..3e17596d20
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_kdb_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_kdb_Makefile.in,v 1.1 2018/12/21 15:45:13 adam Exp $
+
+Add two files that need to be generated and otherwise are not
+
+--- lib/kdb/Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ lib/kdb/Makefile.in
+@@ -63,7 +63,7 @@ check-pytests: t_stringattr
+ check-cmocka: t_sort_key_data
+ $(RUN_TEST) ./t_sort_key_data > /dev/null
+
+-generate-files-mac: darwin.exports
++generate-files-mac: darwin.exports adb_err.h adb_err.c
+
+ depend: adb_err.h
+
diff --git a/mit-krb5-32/patches/patch-lib_kdb_kdb__log.c b/mit-krb5-32/patches/patch-lib_kdb_kdb__log.c
new file mode 100644
index 0000000000..e2444c19a3
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_kdb_kdb__log.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-lib_kdb_kdb__log.c,v 1.1 2018/07/16 10:26:40 jperkin Exp $
+
+Fix mmap/munmap -Werror=incompatible-pointer-types
+
+--- lib/kdb/kdb_log.c.orig 2018-05-03 14:34:47.000000000 +0000
++++ lib/kdb/kdb_log.c
+@@ -489,7 +489,7 @@ ulog_map(krb5_context context, const cha
+ return errno;
+ }
+
+- ulog = mmap(0, MAXLOGLEN, PROT_READ | PROT_WRITE, MAP_SHARED, ulogfd, 0);
++ ulog = (kdb_hlog_t *)mmap(0, MAXLOGLEN, PROT_READ | PROT_WRITE, MAP_SHARED, ulogfd, 0);
+ if (ulog == MAP_FAILED) {
+ /* Can't map update log file to memory. */
+ close(ulogfd);
+@@ -681,7 +681,11 @@ ulog_fini(krb5_context context)
+ if (log_ctx == NULL)
+ return;
+ if (log_ctx->ulog != NULL)
++#ifdef __sun
++ munmap((caddr_t)log_ctx->ulog, MAXLOGLEN);
++#else
+ munmap(log_ctx->ulog, MAXLOGLEN);
++#endif
+ free(log_ctx);
+ context->kdblog_context = NULL;
+ }
diff --git a/mit-krb5-32/patches/patch-lib_krb5_asn.1_asn1buf.h b/mit-krb5-32/patches/patch-lib_krb5_asn.1_asn1buf.h
new file mode 100644
index 0000000000..519b6475e5
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_krb5_asn.1_asn1buf.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_krb5_asn.1_asn1buf.h,v 1.3 2018/06/15 20:46:01 tez Exp $
+
+Clang does not like this kind of inlines.
+
+--- lib/krb5/asn.1/asn1buf.h.orig 2016-02-29 19:50:13.000000000 +0000
++++ lib/krb5/asn.1/asn1buf.h
+@@ -107,7 +107,7 @@ void asn1buf_destroy(asn1buf **buf);
+ * effects Inserts o into the buffer *buf, expanding the buffer if
+ * necessary. Returns ENOMEM memory is exhausted.
+ */
+-#if ((__GNUC__ >= 2) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL)
++#if ((__GNUC__ >= 2) && !defined(__clang__) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL)
+ static inline asn1_error_code
+ asn1buf_insert_octet(asn1buf *buf, const int o)
+ {
diff --git a/mit-krb5-32/patches/patch-lib_krb5_ccache_Makefile.in b/mit-krb5-32/patches/patch-lib_krb5_ccache_Makefile.in
new file mode 100644
index 0000000000..66aef097c5
--- /dev/null
+++ b/mit-krb5-32/patches/patch-lib_krb5_ccache_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_krb5_ccache_Makefile.in,v 1.3 2018/06/15 20:46:01 tez Exp $
+
+Fix build on OS X (missing kcmrpc.h)
+
+
+--- lib/krb5/ccache/Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ lib/krb5/ccache/Makefile.in
+@@ -96,6 +96,8 @@ all-unix: all-libobjs
+
+ all-windows: subdirs $(OBJFILE)
+
++generate-files-mac: $(KCMRPC_DEPS)
++
+ ##DOS##subdirs: ccapi\$(OUTPRE)file.lst
+
+ ##DOS##ccapi\$(OUTPRE)file.lst:
diff --git a/mit-krb5-32/patches/patch-plugins_kdb_db2_Makefile.in b/mit-krb5-32/patches/patch-plugins_kdb_db2_Makefile.in
new file mode 100644
index 0000000000..94f9a1da6b
--- /dev/null
+++ b/mit-krb5-32/patches/patch-plugins_kdb_db2_Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-plugins_kdb_db2_Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+(was patch-ch)
+
+--- plugins/kdb/db2/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000
++++ plugins/kdb/db2/Makefile.in
+@@ -29,8 +29,8 @@ RELDIR=../plugins/kdb/db2
+ # Also on gssrpc, for xdr stuff.
+ SHLIB_EXPDEPS = \
+ $(GSSRPC_DEPLIBS) \
+- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
+- $(TOPLIBD)/libkrb5$(SHLIBEXT)
++ $(TOPLIBD)/libk5crypto$(DEPLIBEXT) \
++ $(TOPLIBD)/libkrb5$(DEPLIBEXT)
+ SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
+
+ DBDIR = libdb2
+@@ -38,7 +38,7 @@ DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@)
+ DBOBJLISTS-sys =
+ DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \
+ $(DBDIR)/db/OBJS.ST $(DBDIR)/mpool/OBJS.ST $(DBDIR)/recno/OBJS.ST
+-DBSHOBJLISTS = $(DBOBJLISTS:.ST=.SH)
++DBSHOBJLISTS = $(DBOBJLISTS:.ST=.LA)
+
+ SRCS= \
+ $(srcdir)/kdb_xdr.c \
+@@ -49,7 +49,7 @@ SRCS= \
+ $(srcdir)/db2_exp.c \
+ $(srcdir)/lockout.c
+
+-STOBJLISTS=OBJS.ST $(DBOBJLISTS)
++STOBJLISTS=OBJS.LA $(DBOBJLISTS)
+ STLIBOBJS= \
+ kdb_xdr.o \
+ adb_openclose.o \
diff --git a/mit-krb5-32/patches/patch-plugins_kdb_db2_libdb2_Makefile.in b/mit-krb5-32/patches/patch-plugins_kdb_db2_libdb2_Makefile.in
new file mode 100644
index 0000000000..f4c36c8aa7
--- /dev/null
+++ b/mit-krb5-32/patches/patch-plugins_kdb_db2_libdb2_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-plugins_kdb_db2_libdb2_Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+Add --enable-pkgsrc-libtool option
+
+--- plugins/kdb/db2/libdb2/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000
++++ plugins/kdb/db2/libdb2/Makefile.in
+@@ -1,12 +1,12 @@
+ mydir=plugins$(S)kdb$(S)db2$(S)libdb2
+ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+-SUBDIRS=hash btree db mpool recno test
++SUBDIRS=hash btree db mpool recno
+
+ LIBBASE=db
+ LIBMAJOR=1
+ LIBMINOR=1
+-STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \
+- recno/OBJS.ST
++STOBJLISTS=hash/OBJS.LA btree/OBJS.LA db/OBJS.LA mpool/OBJS.LA \
++ recno/OBJS.LA
+ SUBDIROBJLISTS=$(STOBJLISTS)
+ RELDIR=../plugins/kdb/db2/libdb2
+
diff --git a/mit-krb5-32/patches/patch-plugins_preauth_otp_Makefile.in b/mit-krb5-32/patches/patch-plugins_preauth_otp_Makefile.in
new file mode 100644
index 0000000000..f1a1a67161
--- /dev/null
+++ b/mit-krb5-32/patches/patch-plugins_preauth_otp_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_preauth_otp_Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+--- plugins/preauth/otp/Makefile.in.orig 2016-03-02 15:29:43.595168500 +0000
++++ plugins/preauth/otp/Makefile.in
+@@ -8,7 +8,7 @@ LIBMINOR=0
+ RELDIR=../plugins/preauth/otp
+
+ SHLIB_EXPDEPS = $(VERTO_DEPLIBS) $(KRB5_BASE_DEPLIBS) \
+- $(TOPLIBD)/libkrad$(SHLIBEXT)
++ $(TOPLIBD)/libkrad$(DEPLIBEXT)
+
+ SHLIB_EXPLIBS= -lkrad $(VERTO_LIBS) $(KRB5_BASE_LIBS)
+
diff --git a/mit-krb5-32/patches/patch-plugins_preauth_pkinit_Makefile.in b/mit-krb5-32/patches/patch-plugins_preauth_pkinit_Makefile.in
new file mode 100644
index 0000000000..060c91cde6
--- /dev/null
+++ b/mit-krb5-32/patches/patch-plugins_preauth_pkinit_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_preauth_pkinit_Makefile.in,v 1.2 2018/06/15 20:46:01 tez Exp $
+
+--- plugins/preauth/pkinit/Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ plugins/preauth/pkinit/Makefile.in
+@@ -8,8 +8,8 @@ LIBMINOR=0
+ RELDIR=../plugins/preauth/pkinit
+ # Depends on libk5crypto and libkrb5
+ SHLIB_EXPDEPS = \
+- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
+- $(TOPLIBD)/libkrb5$(SHLIBEXT)
++ $(TOPLIBD)/libk5crypto$(DEPLIBEXT) \
++ $(TOPLIBD)/libkrb5$(DEPLIBEXT)
+ SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto -lcrypto $(DL_LIB) $(SUPPORT_LIB) $(LIBS)
+
+ STLIBOBJS= \
diff --git a/mit-krb5-32/patches/patch-slave_kproplog.c b/mit-krb5-32/patches/patch-slave_kproplog.c
new file mode 100644
index 0000000000..5c332874e7
--- /dev/null
+++ b/mit-krb5-32/patches/patch-slave_kproplog.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-slave_kproplog.c,v 1.1 2018/07/16 10:26:40 jperkin Exp $
+
+Fix mmap -Werror=incompatible-pointer-types.
+
+--- slave/kproplog.c.orig 2018-05-03 14:34:47.000000000 +0000
++++ slave/kproplog.c
+@@ -429,7 +429,7 @@ map_ulog(const char *filename)
+ return NULL;
+ if (fstat(fd, &st) < 0)
+ return NULL;
+- ulog = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
++ ulog = (kdb_hlog_t *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ return (ulog == MAP_FAILED) ? NULL : ulog;
+ }
+
diff --git a/mit-krb5-32/patches/patch-util_k5ev_verto-k5ev.c b/mit-krb5-32/patches/patch-util_k5ev_verto-k5ev.c
new file mode 100644
index 0000000000..c479970157
--- /dev/null
+++ b/mit-krb5-32/patches/patch-util_k5ev_verto-k5ev.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-util_k5ev_verto-k5ev.c,v 1.4 2018/06/15 20:46:01 tez Exp $
+
+Fix include file path
+
+--- util/verto/verto-k5ev.c.orig 2018-05-03 14:34:47.000000000 +0000
++++ util/verto/verto-k5ev.c
+@@ -35,7 +35,7 @@
+
+ #include <verto.h>
+ #include <verto-module.h>
+-#include "rename.h"
++#include "gssrpc/rename.h"
+
+ /* Ignore some warnings generated by the libev code, which the libev maintainer
+ * isn't interested in avoiding. */
diff --git a/mit-krb5-32/patches/patch-util_ss_Makefile.in b/mit-krb5-32/patches/patch-util_ss_Makefile.in
new file mode 100644
index 0000000000..23fce144a0
--- /dev/null
+++ b/mit-krb5-32/patches/patch-util_ss_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-util_ss_Makefile.in,v 1.4 2018/06/15 20:46:01 tez Exp $
+
+Only build a static library as this library is not installed.
+
+--- util/ss/Makefile.in.orig 2018-05-03 14:34:47.000000000 +0000
++++ util/ss/Makefile.in
+@@ -13,6 +13,8 @@ LIBBASE=ss
+ LIBMAJOR=1
+ LIBMINOR=0
+ RELDIR=../util/ss
++LIBTOOL_TAIL=-static
++SHLIB_RDIRS=${KRB5_LIBDIR}
+
+ clean-unix:: clean-liblinks clean-libs clean-libobjs
+ install-unix: install-libs
Home |
Main Index |
Thread Index |
Old Index