This commit was generated by cvs2svn to compensate for changes in r178825,

which included commits to RCS files with non-trunk default branches.

73 files changed, 1533 insertions, 485 deletions

diff --git a/crypto/heimdal/cf/ChangeLog b/crypto/heimdal/cf/ChangeLog
index 1018925..0bd84c6 100644
--- a/crypto/heimdal/cf/ChangeLog
+++ b/crypto/heimdal/cf/ChangeLog
@@ -1,7 +1,424 @@
-2003-08-15  Love  <lha@stacken.kth.se>
+2007-10-01  Love Hörnquist Åstrand  <lha@it.su.se>
 
-	* check-compile-et.m4: 1.7->1.8: check if compile_et support
-	``error_table N M'' also, don't be overly aggressivly reset CFLAGS
+	* crypto.m4: openssl might require -ldl too, so lets check that.
+
+2007-07-31  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common (check-local::): exit on failure to perform
+	test.
+
+2007-07-28  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common (check-local): also check that --help works.
+	
+2007-07-17  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* crypto.m4: depend on EVP_CIPHER_iv_length
+
+2007-06-27  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common: Need absolute reference to the top source
+	directory and top build directory.
+	
+2007-06-20  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* wflags.m4: Add --enable-developer and make it cause -Werror to
+	be included.
+	
+2007-06-18  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common: Merge from samba config.
+
+	* Makefile.am.common (makedir-in-tree): depend on INFO_DEPS.
+
+	* valgrind-suppressions: Unknown suppression in runtime link
+	editor
+
+2007-06-08  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common: Add heimdal-lorikeet target distdir-in-tree
+
+2007-06-04  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* framework-security.m4: test for -framework Security
+	
+2007-05-10  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* roken-frag.m4: we have a fnmatch.h only if there is a working
+	implementation and a header file. If we do use roken, lets use our
+	own headerfile that does symbol renaming.
+	
+2007-04-19  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* version-script.m4: check if ld supports --version-script
+	
+2007-04-11  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: drop broken-getnameinfo.m4
+	
+	* roken-frag.m4: drop test for broken getnameinfo, that old aix is
+	no longer relevant.
+	
+2007-02-16  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* install-catman.sh: Stop overwriting cmd.
+	
+2007-01-15  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* install-catman.sh: Use test instead of [.
+
+	* install-catman.sh: Use = instead of ==, make solaris more happy.
+	
+2007-01-08  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: More headerfiles for iruserok prototype check.
+
+	* check-symbols.sh: Add fc_softc for AIX as ignore syms.
+	
+2007-01-04  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Check if iruserok needs a prototype.
+	
+2006-12-06  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-compile-et.m4: set automake symbol COM_ERR when we build
+	local com_err
+	
+2006-11-16  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* valgrind-suppressions: We shouldn't be running /bin/ls under
+	valgrind, but for now, at least make it easier to see any other
+	warnings. From Andrew Bartlett.
+	
+2006-10-22  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* Makefile.am.common: Add target for valgrind debugging
+	
+	* valgrind-suppressions: valgrind suppressions
+	
+2006-10-21  Love Hörnquist Åstrand <lha@it.su.se>
+	
+	* check-lex.m4: Borrow test for autoconf cvs to help hpux hosts
+	
+2006-10-20  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* Makefile.am.common: provide uninstall hook for cat/manpages.
+
+	* install-catman.sh: provide uninstall command
+	
+2006-10-19  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* roken-frag.m4: Add check for timegm.
+
+	* roken-frag.m4: Include sys/types.h for sys/socket.h and netdb.h.
+	
+2006-10-07  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common (install-build-headers): make this function
+	convoluted and deal with dist_, nodist, nobase and all its
+	friends.
+
+	* have-struct-field.m4: memset the structure to make sure that we
+	don't get compiler warnings.
+
+	* crypto.m4: OpenSSL_add_all_algorithms is not a openssl specific
+	requirement, hcrypto need to have to too.
+
+	* crypto.m4: Require openssl have OpenSSL_add_all_algorithms
+	
+2006-10-04  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* autobuild.m4: Add autobuild, GPLed, but free to use in projects
+	not avaible under GPL or LGPL (just like autoconf).
+	
+2006-09-16  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Add samba_SOCKET_WRAPPER fragment
+	
+2006-09-12  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* socket-wrapper.m4: Add socket-wrapper test
+	
+2006-05-06  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* crypto.m4: Move up evp.h to please OpenSSL, from Douglas
+	E. Engert.
+
+2006-04-22  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Add check for fnmatch.h, its needed to be done
+	for the automake conditional below.
+	
+2006-04-15  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* crypto.m4: Require SHA256
+	
+2006-01-18  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* crypto.m4 Check for <openssl/engine.h> if we are to consider
+	using OpenSSL, also check for <hcrypto/...> headers since
+	make_crypto.c assumes that the name of the files.
+	
+2006-01-13 Love Hörnquist Åstrand <lha@it.su.se>
+
+	* crypto.m4: libdes is renamed to hcrypto
+
+	* crypto.m4: Remove support for old hash names.
+	
+2005-10-26  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* install-catman.sh: Add variable INSTALL_CATPAGES that controls
+	if cat pages are installed, defaults to true. From Johnny Lam
+	<jlam@pkgsrc.org>.
+	
+2005-09-28  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Check for <stdint.h> and uintptr_t
+	
+2005-09-02  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Resolver check moved to rk_RESOLV, from Andrew
+	Bartlet <abartlet@samba.org>
+
+	* resolv.m4: Resolver checks, broken out so samba can use it From
+	Andrew Bartlet <abartlet@samba.org>
+	
+2005-08-22  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: Check for res_ndestroy.
+
+2005-08-03  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* crypto.m4: Add <sys/types.h>, OpenSSL 0.9.8 needs it for size_t.
+	From: Quanah Gibson-Mount <quanah@stanford.edu>
+
+2005-07-12  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-compile-et.m4: check that initialize_conf_error_table_r
+	have the right argument
+
+2005-07-07  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: allow symbols to start with ., aix uses this
+
+2005-06-16  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* krb-bigendian.m4: use ansi c prototypes
+	
+	* krb-func-getcwd-broken.m4: use ansi c prototypes
+
+	* broken-snprintf.m4: use ansi c prototypes
+
+	* have-pragma-weak.m4: use ansi c declarations
+
+	* check-getpwnam_r-posix.m4: use ansi c declarations
+
+	* broken-realloc.m4: use ansi c declarations
+	
+	* check-compile-et.m4: use ansi c declarations
+	
+	* dlopen.m4: add headers and argument to dlopen
+	
+	* c-function.m4: use ansi c declarations
+	
+	* check-var.m4: use ansi c declarations
+
+	* pthreads.m4: disable threads on aix because of utmp/utmpx
+	problems
+
+	* broken-getaddrinfo.m4: check for brokenness in getaddrinfo on
+	AIX that can't handle "0" as port number.
+	
+2005-06-11  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* db.m4: Add an option to disable ndbm, from Stefan Metzmacher
+	<metze@samba.org>
+
+2005-06-03  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* pthreads.m4: rework how pthreads support to turned on/off,
+	always run though the switch to figure out what the
+	linker/compiler flag are
+
+2005-06-01  Love Hörnquist Åstrand  <lha@it.su.se>
+	
+	* pthreads.m4: s/else if/elif/
+	
+	* check-symbols.sh: AIX have a diffrent nm, use -B to get bsd like
+	output
+	
+	* pthreads.m4: aix case: assume gcc handles -pthread, in the
+	non-gcc case, use the compiler as hint (xlc vs xlc_r) if this
+	environment handles threads or not
+
+2005-05-22  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: ignore weak symbols too
+
+2005-05-19  David Love  <fx@gnu.org>
+
+	* check-getpwnam_r-posix.m4: define _POSIX_PTHREAD_SEMANTICS to
+	make solaris provide the right getpwname_r
+
+2005-05-17  Johan Danielsson  <joda@pdc.kth.se>
+
+	* roken-frag.m4: am_conditional have_cgetent
+	
+2005-05-10  David Love  <fx@gnu.org>
+
+	* roken-frag.m4: Get daemon declared on Solaris (it's in unistd.h
+	but masked by a feature test), just to avoid a warning, since it
+	has int args.
+
+2005-05-11  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-var.m4: AC_CHECK_DECL and AC_CHECK_DECLS have a subtile
+	diffrence, the later defines HAVE_ cpp symbols, the first doesn't.
+
+2005-05-05  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: ignore N symbols too
+
+2005-04-30  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* broken-snprintf.m4: include checking if snprintf(NULL, 0, "")
+	works
+
+	* check-compile-et.m4: require compile_et to generate a
+	initialize_FOO_error_table_r (they are used in libkrb5), and
+	always check for initialize_error_table_r
+
+2005-04-29  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common: add LIB_com_err
+	
+2005-04-29  David Love  <fx@gnu.org>
+
+	* roken-frag.m4: Check for correct vis.h.
+	
+2005-04-28  David Love  <fx@gnu.org>
+
+	* pthreads.m4: Set PTHREADS_LIBS on Irix.
+
+2005-04-27  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* broken-realloc.m4: use rk_realloc if realloc is broken, this
+	makes "host-tools" not beeing able to use realloc
+
+	* pthreads.m4: Add support for Solaris, Irix, and modern
+	Linux. From David Love <fx@gnu.org>
+
+2005-04-25  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: limit the units functions to
+	asn1_[A-Za-z0-9]*_units$
+
+2005-04-20  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: this lib include com_err, add -com_err to
+	CHECK_SYMBOLS
+
+	* check-symbols.sh: print the type so I don't need to ask for it
+
+2005-04-18  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: ignore filename symbols
+	
+2005-04-04  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: assume symbols prefixed with _ is a sideeffekt
+	of the local linker and also just fine
+	
+2005-03-16 Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: include <sys/socket.h> for <netinet6/in6_var.h>
+	
+2005-03-01  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* sunos.m4: Match solaris 10.  From: Joakim Fallsjo
+	<fallsjo@sanchin.se>
+
+2004-12-29  Love  <lha@stacken.kth.se>
+
+	* check-symbols.sh: add -asn1compile symbols
+
+2004-12-29  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-symbols.sh: add exported symbols test
+	
+	* Makefile.am.common: add CHECK_SYMBOLS tests, so that we don't
+	export to much stuff
+	
+2004-09-03  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* make-proto.pl: add cpluscplus extern "C" support
+	
+2004-07-09  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* pthreads.m4: add -pthread to LIBS since libtool doesn't preserve
+	it for us when adding is as a dependency on libs
+	
+2004-04-24  Johan Danielsson  <joda@pdc.kth.se>
+
+	* largefile.m4: like AC_SYS_LARGEFILE, but also add to CPPFLAGS
+	
+2004-04-14  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-compile-et.m4: even more evil stuff for cross-compiling
+	
+	* check-x.m4: use AC_RUN_IFELSE so we can handle cross compiling
+	
+	* check-compile-et.m4: use AC_RUN_IFELSE so we can handle cross
+	compiling
+
+2004-04-13  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* make-proto.pl: if -E, add windows standard calling conv to
+	headerfile if needed
+
+	* win32.m4: add rk_WIN32_EXPORT
+	
+2004-02-12  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* configure.in: rename AC_WFLAGS to rk_WFLAGS
+	
+	* *.m4: overquote to pacify automake1.8
+
+2004-02-11  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* roken-frag.m4: resolv.h is even more special
+	
+	* roken-frag.m4: AC_CHECK_HEADERS(net/if.h netinet6/in6_var.h
+	sys/sysctl.h sys/proc.h, resolv.h) are all special and need extra
+	help
+
+	* test-package.m4: If there is a --with-PACKAGE=path but no
+	--with-PACKAGE-config, go seach for path/PACKEGE-config and use it
+	if it exists.  Inspired by Harald Barth <haba@pdc.kth.se>
+
+2003-09-03  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* crypto.m4: check for DES_, AES_, and if openssl UI_
+	
+2003-08-27  Johan Danielsson  <joda@pdc.kth.se>
+
+	* vararray.m4: test for variable-length arrays
+
+	* roken-frag.m4: test for poll and poll.h
+
+2003-08-16  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* Makefile.am.common: don't try doing local checks if CHECK_LOCAL
+	is set to no-check-local
+
+2003-08-01  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* check-compile-et.m4: check if compile_et support ``error_table N
+	M'' also, don't be overly aggressivly reset CFLAGS
+	
+2003-07-22  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* pthreads.m4: pthread test
 	
 2003-05-08  Johan Danielsson  <joda@pdc.kth.se>
 
diff --git a/crypto/heimdal/cf/Makefile.am.common b/crypto/heimdal/cf/Makefile.am.common
index ddb86a4..bbc79a5 100644
--- a/crypto/heimdal/cf/Makefile.am.common
+++ b/crypto/heimdal/cf/Makefile.am.common
@@ -1,8 +1,8 @@
-# $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+# $Id: Makefile.am.common 22488 2008-01-21 11:47:22Z lha $
 
 SUFFIXES = .et .h
 
-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
+AM_CPPFLAGS = -I$(top_builddir)/include $(INCLUDES_roken)
 
 if do_roken_rename
 ROKEN_RENAME = -DROKEN_RENAME
@@ -40,6 +40,8 @@ LIB_setsockopt		= @LIB_setsockopt@
 LIB_socket		= @LIB_socket@
 LIB_syslog		= @LIB_syslog@
 LIB_tgetent		= @LIB_tgetent@
+LIB_com_err		= @LIB_com_err@
+LIB_door_create		= @LIB_door_create@
 
 HESIODLIB = @HESIODLIB@
 HESIODINCLUDE = @HESIODINCLUDE@
@@ -69,8 +71,8 @@ install-suid-programs:
 
 install-exec-hook: install-suid-programs
 
-install-build-headers:: $(include_HEADERS) $(build_HEADERZ)
-	@foo='$(include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ)'; \
+install-build-headers:: $(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ) $(nobase_include_HEADERS)
+	@foo='$(include_HEADERS) $(dist_include_HEADERS) $(nodist_include_HEADERS) $(build_HEADERZ)'; \
 	for f in $$foo; do \
 		f=`basename $$f`; \
 		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
@@ -80,19 +82,31 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ)
 			echo " $(CP) $$file $(buildinclude)/$$f"; \
 			$(CP) $$file $(buildinclude)/$$f; \
 		fi ; \
+	done ; \
+	foo='$(nobase_include_HEADERS)'; \
+	for f in $$foo; do \
+		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
+		else file="$$f"; fi; \
+		$(mkdir_p) $(buildinclude)/`dirname $$f` ; \
+		if cmp -s  $$file $(buildinclude)/$$f 2> /dev/null ; then \
+		: ; else \
+			echo " $(CP) $$file $(buildinclude)/$$f"; \
+			$(CP) $$file $(buildinclude)/$$f; \
+		fi ; \
 	done
 
 all-local: install-build-headers
 
 check-local::
-	@if test '$(CHECK_LOCAL)'; then \
+	@if test '$(CHECK_LOCAL)' = "no-check-local"; then \
+	  foo=''; elif test '$(CHECK_LOCAL)'; then \
 	  foo='$(CHECK_LOCAL)'; else \
 	  foo='$(PROGRAMS)'; fi; \
 	  if test "$$foo"; then \
 	  failed=0; all=0; \
 	  for i in $$foo; do \
 	    all=`expr $$all + 1`; \
-	    if ./$$i --version > /dev/null 2>&1; then \
+	    if (./$$i --version && ./$$i --help) > /dev/null 2>&1; then \
 	      echo "PASS: $$i"; \
 	    else \
 	      echo "FAIL: $$i"; \
@@ -108,10 +122,10 @@ check-local::
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
 	  echo "$$dashes"; \
-	  test "$$failed" -eq 0; \
+	  test "$$failed" -eq 0 || exit 1; \
 	fi
 
-SUFFIXES += .x
+SUFFIXES += .x .z
 
 .x.c:
 	@cmp -s $< $@ 2> /dev/null || cp $< $@
@@ -186,9 +200,13 @@ dist-cat8-mans:
 dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
 
 install-cat-mans:
-	$(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+	$(SHELL) $(top_srcdir)/cf/install-catman.sh install "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+
+uninstall-cat-mans:
+	$(SHELL) $(top_srcdir)/cf/install-catman.sh uninstall "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
 
 install-data-hook: install-cat-mans
+uninstall-hook: uninstall-cat-mans
 
 
 .et.h:
@@ -202,8 +220,30 @@ if KRB5
 LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la
 LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
+LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la
 endif
 
 if DCE
 LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
 endif
+
+#
+# Useful target for debugging
+#
+
+check-valgrind:
+	tobjdir=`cd $(top_builddir) && pwd` ; \
+	tsrcdir=`cd $(top_srcdir) && pwd` ; \
+	env TESTS_ENVIRONMENT="$${tobjdir}/libtool --mode execute valgrind --leak-check=full --trace-children=yes --quiet -q --num-callers=30 --suppressions=$${tsrcdir}/cf/valgrind-suppressions" make check
+
+#
+# Target to please samba build farm, builds distfiles in-tree.
+# Will break when automake changes...
+#
+
+distdir-in-tree: $(DISTFILES) $(INFO_DEPS)
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" != .; then \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) distdir-in-tree) ; \
+	  fi ; \
+	done
diff --git a/crypto/heimdal/cf/aix.m4 b/crypto/heimdal/cf/aix.m4
index 155cef2..32aeba6 100644
--- a/crypto/heimdal/cf/aix.m4
+++ b/crypto/heimdal/cf/aix.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: aix.m4,v 1.9.6.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: aix.m4 14147 2004-08-25 14:14:01Z joda $
 dnl
 
 AC_DEFUN([rk_AIX],[
@@ -19,7 +19,7 @@ AM_CONDITIONAL(AIX4, test "$aix" = 4)
 
 
 AC_ARG_ENABLE(dynamic-afs,
-	AC_HELP_STRING([--disable-dynamic-afs],
+	AS_HELP_STRING([--disable-dynamic-afs],
 		[do not use loaded AFS library with AIX]))
 
 if test "$aix" != no; then
diff --git a/crypto/heimdal/cf/auth-modules.m4 b/crypto/heimdal/cf/auth-modules.m4
index 5fb88f3..d2383c6 100644
--- a/crypto/heimdal/cf/auth-modules.m4
+++ b/crypto/heimdal/cf/auth-modules.m4
@@ -1,4 +1,4 @@
-dnl $Id: auth-modules.m4,v 1.5.6.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: auth-modules.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl Figure what authentication modules should be built
 dnl
diff --git a/crypto/heimdal/cf/autobuild.m4 b/crypto/heimdal/cf/autobuild.m4
new file mode 100644
index 0000000..bd1f4dc
--- /dev/null
+++ b/crypto/heimdal/cf/autobuild.m4
@@ -0,0 +1,34 @@
+# autobuild.m4 serial 2 (autobuild-3.3)
+# Copyright (C) 2004 Simon Josefsson
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can can be used in projects which are not available under
+# the GNU General Public License or the GNU Library General Public
+# License but which still want to provide support for Autobuild.
+
+# Usage: AB_INIT([MODE]).
+AC_DEFUN([AB_INIT],
+[
+	AC_REQUIRE([AC_CANONICAL_BUILD])
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	AC_MSG_NOTICE([autobuild project... ${PACKAGE_NAME:-$PACKAGE}])
+	AC_MSG_NOTICE([autobuild revision... ${PACKAGE_VERSION:-$VERSION}])
+	hostname=`hostname`
+	if test "$hostname"; then
+	   AC_MSG_NOTICE([autobuild hostname... $hostname])
+	fi
+	ifelse([$1],[],,[AC_MSG_NOTICE([autobuild mode... $1])])
+	date=`date +%Y%m%d-%H%M%S`
+	if test "$?" != 0; then
+	   date=`date`
+	fi
+	if test "$date"; then
+	   AC_MSG_NOTICE([autobuild timestamp... $date])
+	fi
+])
diff --git a/crypto/heimdal/cf/broken-getaddrinfo.m4 b/crypto/heimdal/cf/broken-getaddrinfo.m4
index a97e438..b8d323c 100644
--- a/crypto/heimdal/cf/broken-getaddrinfo.m4
+++ b/crypto/heimdal/cf/broken-getaddrinfo.m4
@@ -1,10 +1,10 @@
-dnl $Id: broken-getaddrinfo.m4,v 1.3.6.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: broken-getaddrinfo.m4 15401 2005-06-16 16:10:50Z lha $
 dnl
 dnl test if getaddrinfo can handle numeric services
 
 AC_DEFUN([rk_BROKEN_GETADDRINFO],[
 AC_CACHE_CHECK([if getaddrinfo handles numeric services], ac_cv_func_getaddrinfo_numserv,
-AC_TRY_RUN([[#include <stdio.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -19,6 +19,8 @@ main(int argc, char **argv)
 	hints.ai_family = PF_UNSPEC;
 	if(getaddrinfo(NULL, "17", &hints, &ai) != 0)
 		return 1;
+	if(getaddrinfo(NULL, "0", &hints, &ai) != 0)
+		return 1;
 	return 0;
 }
-]], ac_cv_func_getaddrinfo_numserv=yes, ac_cv_func_getaddrinfo_numserv=no))])
+]])],[ac_cv_func_getaddrinfo_numserv=yes],[ac_cv_func_getaddrinfo_numserv=no]))])
diff --git a/crypto/heimdal/cf/broken-glob.m4 b/crypto/heimdal/cf/broken-glob.m4
index 4f4211a..a27e7ea 100644
--- a/crypto/heimdal/cf/broken-glob.m4
+++ b/crypto/heimdal/cf/broken-glob.m4
@@ -1,13 +1,13 @@
-dnl $Id: broken-glob.m4,v 1.4.12.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: broken-glob.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl check for glob(3)
 dnl
 AC_DEFUN([AC_BROKEN_GLOB],[
 AC_CACHE_CHECK(for working glob, ac_cv_func_glob_working,
 ac_cv_func_glob_working=yes
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
-#include <glob.h>],[
+#include <glob.h>]],[[
 glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
 #ifdef GLOB_MAXPATH
 GLOB_MAXPATH
@@ -16,7 +16,7 @@ GLOB_LIMIT
 #endif
 ,
 NULL, NULL);
-],:,ac_cv_func_glob_working=no,:))
+]])],[:],[ac_cv_func_glob_working=no]))
 
 if test "$ac_cv_func_glob_working" = yes; then
 	AC_DEFINE(HAVE_GLOB, 1, [define if you have a glob() that groks 
diff --git a/crypto/heimdal/cf/broken-realloc.m4 b/crypto/heimdal/cf/broken-realloc.m4
index e34d23d..0b7c476 100644
--- a/crypto/heimdal/cf/broken-realloc.m4
+++ b/crypto/heimdal/cf/broken-realloc.m4
@@ -1,26 +1,25 @@
 dnl
-dnl $Id: broken-realloc.m4,v 1.1.12.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: broken-realloc.m4 15435 2005-06-16 19:45:52Z lha $
 dnl
 dnl Test for realloc that doesn't handle NULL as first parameter
 dnl
 AC_DEFUN([rk_BROKEN_REALLOC], [
 AC_CACHE_CHECK(if realloc if broken, ac_cv_func_realloc_broken, [
 ac_cv_func_realloc_broken=no
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stddef.h>
 #include <stdlib.h>
 
-int main()
+int main(int argc, char **argv)
 {
 	return realloc(NULL, 17) == NULL;
 }
-],:, ac_cv_func_realloc_broken=yes, :)
+]])],[:], [ac_cv_func_realloc_broken=yes],[:])
 ])
 if test "$ac_cv_func_realloc_broken" = yes ; then
 	AC_DEFINE(BROKEN_REALLOC, 1, [Define if realloc(NULL) doesn't work.])
 fi
 AH_BOTTOM([#ifdef BROKEN_REALLOC
-#define realloc(X, Y) isoc_realloc((X), (Y))
-#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
+#define realloc(X, Y) rk_realloc((X), (Y))
 #endif])
 ])
diff --git a/crypto/heimdal/cf/broken-snprintf.m4 b/crypto/heimdal/cf/broken-snprintf.m4
index 8436733..8e22874 100644
--- a/crypto/heimdal/cf/broken-snprintf.m4
+++ b/crypto/heimdal/cf/broken-snprintf.m4
@@ -1,17 +1,17 @@
-dnl $Id: broken-snprintf.m4,v 1.4.10.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: broken-snprintf.m4 15455 2005-06-16 21:03:43Z lha $
 dnl
 AC_DEFUN([AC_BROKEN_SNPRINTF], [
 AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
 ac_cv_func_snprintf_working=yes
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <string.h>
-int main()
+int main(int argc, char **argv)
 {
 	char foo[[3]];
 	snprintf(foo, 2, "12");
-	return strcmp(foo, "1");
-}],:,ac_cv_func_snprintf_working=no,:))
+	return strcmp(foo, "1") || snprintf(NULL, 0, "%d", 12) != 2;
+}]])],[:],[ac_cv_func_snprintf_working=no],[:]))
 
 if test "$ac_cv_func_snprintf_working" = yes; then
 	AC_DEFINE_UNQUOTED(HAVE_SNPRINTF, 1, [define if you have a working snprintf])
@@ -24,7 +24,7 @@ fi
 AC_DEFUN([AC_BROKEN_VSNPRINTF],[
 AC_CACHE_CHECK(for working vsnprintf,ac_cv_func_vsnprintf_working,
 ac_cv_func_vsnprintf_working=yes
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -39,11 +39,20 @@ int foo(int num, ...)
 	return strcmp(bar, "1");
 }
 
+int bar(int num, int len, ...)
+{
+	int r;
+	va_list arg;
+	va_start(arg, len);
+	r = vsnprintf(NULL, 0, "%s", arg);
+	va_end(arg);
+	return r != len;
+}
 
-int main()
+int main(int argc, char **argv)
 {
-	return foo(0, "12");
-}],:,ac_cv_func_vsnprintf_working=no,:))
+	return foo(0, "12") || bar(0, 2, "12");
+}]])],[:],[ac_cv_func_vsnprintf_working=no],[:]))
 
 if test "$ac_cv_func_vsnprintf_working" = yes; then
 	AC_DEFINE_UNQUOTED(HAVE_VSNPRINTF, 1, [define if you have a working vsnprintf])
diff --git a/crypto/heimdal/cf/broken.m4 b/crypto/heimdal/cf/broken.m4
index 92b84dd..6306ba7 100644
--- a/crypto/heimdal/cf/broken.m4
+++ b/crypto/heimdal/cf/broken.m4
@@ -1,4 +1,4 @@
-dnl $Id: broken.m4,v 1.6 2002/05/19 19:36:52 joda Exp $
+dnl $Id: broken.m4 11003 2002-05-19 19:37:08Z joda $
 dnl
 dnl
 dnl Same as AC _REPLACE_FUNCS, just define HAVE_func if found in normal
diff --git a/crypto/heimdal/cf/broken2.m4 b/crypto/heimdal/cf/broken2.m4
index 56ed7a1..20d5163 100644
--- a/crypto/heimdal/cf/broken2.m4
+++ b/crypto/heimdal/cf/broken2.m4
@@ -1,4 +1,4 @@
-dnl $Id: broken2.m4,v 1.4 2002/05/19 22:16:46 joda Exp $
+dnl $Id: broken2.m4 14181 2004-08-31 12:53:36Z joda $
 dnl
 dnl AC_BROKEN but with more arguments
 
@@ -6,17 +6,16 @@ dnl AC_BROKEN2(func, includes, arguments)
 AC_DEFUN([AC_BROKEN2],
 [AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(ac_cv_func_[]$1,
-[AC_TRY_LINK([$2],
-[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$1) || defined (__stub___$1)
 choke me
 #else
-$1($3)
+$1($3);
 #endif
-], [eval "ac_cv_func_[]$1=yes"], [eval "ac_cv_func_[]$1=no"])])
+]])], [eval "ac_cv_func_[]$1=yes"], [eval "ac_cv_func_[]$1=no"])])
 if eval "test \"\${ac_cv_func_[]$1}\" = yes"; then
   AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, define)
   AC_MSG_RESULT(yes)
diff --git a/crypto/heimdal/cf/c-attribute.m4 b/crypto/heimdal/cf/c-attribute.m4
index 6641b74..1025538 100644
--- a/crypto/heimdal/cf/c-attribute.m4
+++ b/crypto/heimdal/cf/c-attribute.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: c-attribute.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: c-attribute.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 
 dnl
@@ -9,10 +9,7 @@ dnl
 AC_DEFUN([AC_C___ATTRIBUTE__], [
 AC_MSG_CHECKING(for __attribute__)
 AC_CACHE_VAL(ac_cv___attribute__, [
-AC_TRY_COMPILE([
-#include <stdlib.h>
-],
-[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
 static void foo(void) __attribute__ ((noreturn));
 
 static void
@@ -20,9 +17,9 @@ foo(void)
 {
   exit(1);
 }
-],
-ac_cv___attribute__=yes,
-ac_cv___attribute__=no)])
+]])],
+[ac_cv___attribute__=yes],
+[ac_cv___attribute__=no])])
 if test "$ac_cv___attribute__" = "yes"; then
   AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
 fi
diff --git a/crypto/heimdal/cf/c-function.m4 b/crypto/heimdal/cf/c-function.m4
index 056b890..cb39705 100644
--- a/crypto/heimdal/cf/c-function.m4
+++ b/crypto/heimdal/cf/c-function.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: c-function.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: c-function.m4 15422 2005-06-16 18:59:29Z lha $
 dnl
 
 dnl
@@ -9,22 +9,22 @@ dnl
 AC_DEFUN([AC_C___FUNCTION__], [
 AC_MSG_CHECKING(for __FUNCTION__)
 AC_CACHE_VAL(ac_cv___function__, [
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <string.h>
 
-static char *foo()
+static char *foo(void)
 {
   return __FUNCTION__;
 }
 
-int main()
+int main(int argc, char **argc)
 {
   return strcmp(foo(), "foo") != 0;
 }
-],
-ac_cv___function__=yes,
-ac_cv___function__=no,
-ac_cv___function__=no)])
+]])],
+[ac_cv___function__=yes],
+[ac_cv___function__=no],
+[ac_cv___function__=no])])
 if test "$ac_cv___function__" = "yes"; then
   AC_DEFINE(HAVE___FUNCTION__, 1, [define if your compiler has __FUNCTION__])
 fi
diff --git a/crypto/heimdal/cf/capabilities.m4 b/crypto/heimdal/cf/capabilities.m4
index 9b258d5..12cbef8 100644
--- a/crypto/heimdal/cf/capabilities.m4
+++ b/crypto/heimdal/cf/capabilities.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: capabilities.m4,v 1.2.20.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: capabilities.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 
 dnl
diff --git a/crypto/heimdal/cf/check-compile-et.m4 b/crypto/heimdal/cf/check-compile-et.m4
index b71833c..583abdf 100644
--- a/crypto/heimdal/cf/check-compile-et.m4
+++ b/crypto/heimdal/cf/check-compile-et.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-compile-et.m4,v 1.7.2.1 2003/08/15 14:40:42 lha Exp $
+dnl $Id: check-compile-et.m4 19252 2006-12-06 13:32:55Z lha $
 dnl
 dnl CHECK_COMPILE_ET
 AC_DEFUN([CHECK_COMPILE_ET], [
@@ -7,6 +7,7 @@ AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
 
 krb_cv_compile_et="no"
 krb_cv_com_err_need_r=""
+krb_cv_compile_et_cross=no
 if test "${COMPILE_ET}" = "compile_et"; then
 
 dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
@@ -27,24 +28,27 @@ if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
     CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
   fi
   dnl Check that the `prefix' and `index' directives were honored.
-  AC_TRY_RUN([
+  AC_RUN_IFELSE([
 #include <com_err.h>
 #include <string.h>
 #include "conftest_et.h"
-int main(){
+int main(int argc, char **argv){
 #ifndef ERROR_TABLE_BASE_conf
 #error compile_et does not handle error_table N M
 #endif
 return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
-  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
+  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"],
+  [krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes] )
 fi
 AC_MSG_RESULT(${krb_cv_compile_et})
-if test "${krb_cv_compile_et}" = "yes"; then
-  AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
-  AC_EGREP_CPP(initialize_error_table_r,[#include "conftest_et.c"],
-     [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"])
+if test "${krb_cv_compile_et}" = "yes" -a "${krb_cv_compile_et_cross}" = no; then
+  AC_MSG_CHECKING([for if com_err generates a initialize_conf_error_table_r])
+  AC_EGREP_CPP([initialize_conf_error_table_r.*struct et_list],
+     [#include "conftest_et.h"],
+     [krb_cv_com_err_need_r="ok"])
   if test X"$krb_cv_com_err_need_r" = X ; then
     AC_MSG_RESULT(no)
+    krb_cv_compile_et=no
   else
     AC_MSG_RESULT(yes)
   fi
@@ -52,16 +56,18 @@ fi
 rm -fr conftest*
 fi
 
-if test "${krb_cv_compile_et}" = "yes"; then
+if test "${krb_cv_compile_et_cross}" = yes ; then
+  krb_cv_com_err="cross"
+elif test "${krb_cv_compile_et}" = "yes"; then
   dnl Since compile_et seems to work, let's check libcom_err
   krb_cv_save_LIBS="${LIBS}"
   LIBS="${LIBS} -lcom_err"
   AC_MSG_CHECKING(for com_err)
-  AC_TRY_LINK([#include <com_err.h>],[
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <com_err.h>]],[[
     const char *p;
     p = error_message(0);
-    $krb_cv_com_err_need_r
-  ],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
+    initialize_error_table_r(0,0,0,0);
+  ]])],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
   AC_MSG_RESULT(${krb_cv_com_err})
   LIBS="${krb_cv_save_LIBS}"
 else
@@ -77,6 +83,14 @@ if test "${krb_cv_com_err}" = "yes"; then
     LIB_com_err_a=""
     LIB_com_err_so=""
     AC_MSG_NOTICE(Using the already-installed com_err)
+    localcomerr=no
+elif test "${krb_cv_com_err}" = "cross"; then
+    DIR_com_err="com_err"
+    LIB_com_err="\$(top_builddir)/lib/com_err/libcom_err.la"
+    LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
+    LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
+    AC_MSG_NOTICE(Using our own com_err with toolchain compile_et)
+    localcomerr=yes
 else
     COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et"
     DIR_com_err="com_err"
@@ -84,7 +98,9 @@ else
     LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
     LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
     AC_MSG_NOTICE(Using our own com_err)
+    localcomerr=yes
 fi
+AM_CONDITIONAL(COM_ERR, test "$localcomerr" = yes)dnl
 AC_SUBST(DIR_com_err)
 AC_SUBST(LIB_com_err)
 AC_SUBST(LIB_com_err_a)
diff --git a/crypto/heimdal/cf/check-getpwnam_r-posix.m4 b/crypto/heimdal/cf/check-getpwnam_r-posix.m4
index d3b1e0f..bb7e388 100644
--- a/crypto/heimdal/cf/check-getpwnam_r-posix.m4
+++ b/crypto/heimdal/cf/check-getpwnam_r-posix.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-getpwnam_r-posix.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: check-getpwnam_r-posix.m4 15435 2005-06-16 19:45:52Z lha $
 dnl
 dnl check for getpwnam_r, and if it's posix or not
 
@@ -8,14 +8,15 @@ if test "$ac_cv_func_getpwnam_r" = yes; then
 	AC_CACHE_CHECK(if getpwnam_r is posix,ac_cv_func_getpwnam_r_posix,
 	ac_libs="$LIBS"
 	LIBS="$LIBS $LIB_getpwnam_r"
-	AC_TRY_RUN([
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#define _POSIX_PTHREAD_SEMANTICS
 #include <pwd.h>
-int main()
+int main(int argc, char **argv)
 {
 	struct passwd pw, *pwd;
 	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
 }
-],ac_cv_func_getpwnam_r_posix=yes,ac_cv_func_getpwnam_r_posix=no,:)
+]])],[ac_cv_func_getpwnam_r_posix=yes],[ac_cv_func_getpwnam_r_posix=no],[:])
 LIBS="$ac_libs")
 if test "$ac_cv_func_getpwnam_r_posix" = yes; then
 	AC_DEFINE(POSIX_GETPWNAM_R, 1, [Define if getpwnam_r has POSIX flavour.])
diff --git a/crypto/heimdal/cf/check-man.m4 b/crypto/heimdal/cf/check-man.m4
index dd04666..7538cc8 100644
--- a/crypto/heimdal/cf/check-man.m4
+++ b/crypto/heimdal/cf/check-man.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-man.m4,v 1.3.12.1 2004/04/01 07:27:32 joda Exp $
+dnl $Id: check-man.m4 13338 2004-02-12 14:21:14Z lha $
 dnl check how to format manual pages
 dnl
 
diff --git a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
index f169a4f..64bb8f1 100644
--- a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
+++ b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: check-netinet-ip-and-tcp.m4,v 1.3.12.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: check-netinet-ip-and-tcp.m4 14162 2004-08-26 11:27:32Z joda $
 dnl
 
 dnl extra magic check for netinet/{ip.h,tcp.h} because on irix 6.5.3
@@ -13,14 +13,14 @@ for i in netinet/ip.h netinet/tcp.h; do
 cv=`echo "$i" | sed 'y%./+-%__p_%'`
 
 AC_CACHE_CHECK([for $i],ac_cv_header_$cv,
-[AC_TRY_CPP([\
+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_STANDARDS_H
 #include <standards.h>
 #endif
 #include <$i>
-],
-eval "ac_cv_header_$cv=yes",
-eval "ac_cv_header_$cv=no")])
+]])],
+[eval "ac_cv_header_$cv=yes"],
+[eval "ac_cv_header_$cv=no"])])
 ac_res=`eval echo \\$ac_cv_header_$cv`
 if test "$ac_res" = yes; then
 	ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
diff --git a/crypto/heimdal/cf/check-type-extra.m4 b/crypto/heimdal/cf/check-type-extra.m4
index 08471a7..2778a9d 100644
--- a/crypto/heimdal/cf/check-type-extra.m4
+++ b/crypto/heimdal/cf/check-type-extra.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-type-extra.m4,v 1.2.34.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: check-type-extra.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl ac_check_type + extra headers
 
diff --git a/crypto/heimdal/cf/check-var.m4 b/crypto/heimdal/cf/check-var.m4
index 1960f72..1e68465 100644
--- a/crypto/heimdal/cf/check-var.m4
+++ b/crypto/heimdal/cf/check-var.m4
@@ -1,19 +1,17 @@
-dnl $Id: check-var.m4,v 1.7 2003/02/17 00:44:57 lha Exp $
+dnl $Id: check-var.m4 15422 2005-06-16 18:59:29Z lha $
 dnl
 dnl rk_CHECK_VAR(variable, includes)
 AC_DEFUN([rk_CHECK_VAR], [
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL(ac_cv_var_$1, [
 m4_ifval([$2],[
-	AC_TRY_LINK([$2
-	void * foo() { return &$1; }],
-	    [foo()],
-	    ac_cv_var_$1=yes, ac_cv_var_$1=no)])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2
+	void * foo(void) { return &$1; }]],[[foo()]])],
+	    [ac_cv_var_$1=yes],[ac_cv_var_$1=no])])
 if test "$ac_cv_var_$1" != yes ; then
-AC_TRY_LINK([extern int $1;
-int foo() { return $1; }],
-	    [foo()],
-	    ac_cv_var_$1=yes, ac_cv_var_$1=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern int $1;
+int foo(void) { return $1; }]],[[foo()]])],
+	    [ac_cv_var_$1=yes],[ac_cv_var_$1=no])
 fi
 ])
 ac_foo=`eval echo \\$ac_cv_var_$1`
@@ -21,7 +19,7 @@ AC_MSG_RESULT($ac_foo)
 if test "$ac_foo" = yes; then
 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
 		[Define if you have the `]$1[' variable.])
-	m4_ifval([$2], AC_CHECK_DECLARATION([$2],[$1]))
+	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
 fi
 ])
 
diff --git a/crypto/heimdal/cf/check-x.m4 b/crypto/heimdal/cf/check-x.m4
index 53a3d8c..07f7e2d 100644
--- a/crypto/heimdal/cf/check-x.m4
+++ b/crypto/heimdal/cf/check-x.m4
@@ -1,7 +1,7 @@
 dnl 
 dnl See if there is any X11 present
 dnl
-dnl $Id: check-x.m4,v 1.2.20.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: check-x.m4 15435 2005-06-16 19:45:52Z lha $
 
 AC_DEFUN([KRB_CHECK_X],[
 AC_PATH_XTRA
@@ -32,17 +32,18 @@ if test "$no_x" != yes; then
 			done
 		fi
 		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-		AC_TRY_RUN([
+		AC_RUN_IFELSE([
 		#include <X11/Xlib.h>
-		foo()
+		foo(void)
 		{
 		XOpenDisplay(NULL);
 		}
-		main()
+		main(int argc, char **argv)
 		{
 		return 0;
 		}
-		], krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:)
+		],krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:,
+		krb_cv_sys_x_libs_rpath="" ; krb_cv_sys_x_libs="" ; break)
 	done
 	LIBS="$ac_save_libs"
 	CFLAGS="$ac_save_cflags"
diff --git a/crypto/heimdal/cf/check-xau.m4 b/crypto/heimdal/cf/check-xau.m4
index 94f9586..4d416fd 100644
--- a/crypto/heimdal/cf/check-xau.m4
+++ b/crypto/heimdal/cf/check-xau.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-xau.m4,v 1.3.34.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: check-xau.m4 15454 2005-06-16 21:02:16Z lha $
 dnl
 dnl check for Xau{Read,Write}Auth and XauFileName
 dnl
@@ -16,12 +16,12 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 ## could be done by checking for XauReadAuth in -lXau first, but this
 ## breaks in IRIX 6.5
 
-AC_FIND_FUNC_NO_LIBS(XauWriteAuth, X11 Xau)
+AC_FIND_FUNC_NO_LIBS(XauWriteAuth, X11 Xau,[#include <X11/Xauth.h>],[0,0])
 ac_xxx="$LIBS"
 LIBS="$LIB_XauWriteAuth $LIBS"
-AC_FIND_FUNC_NO_LIBS(XauReadAuth, X11 Xau)
+AC_FIND_FUNC_NO_LIBS(XauReadAuth, X11 Xau,[#include <X11/Xauth.h>],[0])
 LIBS="$LIB_XauReadAauth $LIBS"
-AC_FIND_FUNC_NO_LIBS(XauFileName, X11 Xau)
+AC_FIND_FUNC_NO_LIBS(XauFileName, X11 Xau,[#include <X11/Xauth.h>])
 LIBS="$ac_xxx"
 
 ## set LIB_XauReadAuth to union of these tests, since this is what the
diff --git a/crypto/heimdal/cf/crypto.m4 b/crypto/heimdal/cf/crypto.m4
index c79ba4c..69b2fc9 100644
--- a/crypto/heimdal/cf/crypto.m4
+++ b/crypto/heimdal/cf/crypto.m4
@@ -1,40 +1,38 @@
-dnl $Id: crypto.m4,v 1.16.2.1 2003/05/05 20:08:32 joda Exp $
+dnl $Id: crypto.m4 22080 2007-11-16 11:10:54Z lha $
 dnl
 dnl test for crypto libraries:
 dnl - libcrypto (from openssl)
-dnl - libdes (from krb4)
-dnl - own-built libdes
+dnl - own-built libhcrypto
 
 m4_define([test_headers], [
 		#undef KRB5 /* makes md4.h et al unhappy */
 		#ifdef HAVE_OPENSSL
+		#ifdef HAVE_SYS_TYPES_H
+		#include <sys/types.h>
+		#endif
+		#include <openssl/evp.h>
 		#include <openssl/md4.h>
 		#include <openssl/md5.h>
 		#include <openssl/sha.h>
-		#define OPENSSL_DES_LIBDES_COMPATIBILITY
 		#include <openssl/des.h>
 		#include <openssl/rc4.h>
+		#include <openssl/aes.h>
+		#include <openssl/engine.h>
+		#include <openssl/ui.h>
 		#include <openssl/rand.h>
+		#include <openssl/hmac.h>
+		#include <openssl/pkcs12.h>
 		#else
-		#include <md4.h>
-		#include <md5.h>
-		#include <sha.h>
-		#include <des.h>
-		#include <rc4.h>
-		#endif
-		#ifdef OLD_HASH_NAMES
-		typedef struct md4 MD4_CTX;
-		#define MD4_Init(C) md4_init((C))
-		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
-		#define MD4_Final(D, C) md4_finito((C), (D))
-		typedef struct md5 MD5_CTX;
-		#define MD5_Init(C) md5_init((C))
-		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
-		#define MD5_Final(D, C) md5_finito((C), (D))
-		typedef struct sha SHA_CTX;
-		#define SHA1_Init(C) sha_init((C))
-		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
-		#define SHA1_Final(D, C) sha_finito((C), (D))
+		#include <hcrypto/evp.h>
+		#include <hcrypto/md4.h>
+		#include <hcrypto/md5.h>
+		#include <hcrypto/sha.h>
+		#include <hcrypto/des.h>
+		#include <hcrypto/rc4.h>
+		#include <hcrypto/aes.h>
+		#include <hcrypto/engine.h>
+		#include <hcrypto/hmac.h>
+		#include <hcrypto/pkcs12.h>
 		#endif
 		])
 m4_define([test_body], [
@@ -42,15 +40,21 @@ m4_define([test_body], [
 		MD4_CTX md4;
 		MD5_CTX md5;
 		SHA_CTX sha1;
+		SHA256_CTX sha256;
 
 		MD4_Init(&md4);
 		MD5_Init(&md5);
 		SHA1_Init(&sha1);
+		SHA256_Init(&sha256);
+		EVP_CIPHER_iv_length(((EVP_CIPHER*)0));
 		#ifdef HAVE_OPENSSL
 		RAND_status();
+		UI_UTIL_read_pw_string(0,0,0,0);
 		#endif
 
-		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
+		OpenSSL_add_all_algorithms();
+		AES_encrypt(0,0,0);
+		DES_cbc_encrypt(0, 0, 0, schedule, 0, 0);
 		RC4(0, 0, 0, 0);])
 
 
@@ -58,12 +62,11 @@ AC_DEFUN([KRB_CRYPTO],[
 crypto_lib=unknown
 AC_WITH_ALL([openssl])
 
-DIR_des=
+DIR_hcrypto=
 
 AC_MSG_CHECKING([for crypto library])
 
 openssl=no
-old_hash=no
 
 if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
 	save_CPPFLAGS="$CPPFLAGS"
@@ -83,24 +86,17 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
 		for j in $cdirs; do
 			for k in $clibs; do
 				LIBS="$j $k $save_LIBS"
-				AC_TRY_LINK(test_headers, test_body,
-					openssl=yes ires="$i" lres="$j $k"; break 3)
+				AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],
+						[test_body])],
+					[openssl=yes ires="$i" lres="$j $k"; break 3])
 			done
 		done
 		CFLAGS="$i $save_CFLAGS"
 		for j in $cdirs; do
 			for k in $clibs; do
 				LIBS="$j $k $save_LIBS"
-				AC_TRY_LINK(test_headers, test_body,
-					openssl=no ires="$i" lres="$j $k"; break 3)
-			done
-		done
-		CFLAGS="-DHAVE_OLD_HASH_NAMES $i $save_CFLAGS"
-		for j in $cdirs; do
-			for k in $clibs; do
-				LIBS="$j $k $save_LIBS"
-				AC_TRY_LINK(test_headers, test_body,
-					openssl=no ires="$i" lres="$j $k"; break 3)
+				AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])],
+					[openssl=no ires="$i" lres="$j $k"; break 3])
 			done
 		done
 	done
@@ -108,36 +104,36 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
 	CFLAGS="$save_CFLAGS"
 	LIBS="$save_LIBS"
 	if test "$ires" -a "$lres"; then
-		INCLUDE_des="$ires"
-		LIB_des="$lres"
+		INCLUDE_hcrypto="$ires"
+		LIB_hcrypto="$lres"
 		crypto_lib=krb4
 		AC_MSG_RESULT([same as krb4])
-		LIB_des_a='$(LIB_des)'
-		LIB_des_so='$(LIB_des)'
-		LIB_des_appl='$(LIB_des)'
+		LIB_hcrypto_a='$(LIB_hcrypto)'
+		LIB_hcrypto_so='$(LIB_hcrypto)'
+		LIB_hcrypto_appl='$(LIB_hcrypto)'
 	fi
 fi
 
 if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
 	save_CFLAGS="$CFLAGS"
 	save_LIBS="$LIBS"
-	INCLUDE_des=
-	LIB_des=
+	INCLUDE_hcrypto=
+	LIB_hcrypto=
 	if test "$with_openssl_include" != ""; then
-		INCLUDE_des="-I${with_openssl_include}"
+		INCLUDE_hcrypto="-I${with_openssl_include}"
 	fi
 	if test "$with_openssl_lib" != ""; then
-		LIB_des="-L${with_openssl_lib}"
+		LIB_hcrypto="-L${with_openssl_lib}"
 	fi
-	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}"
-	saved_LIB_des="$LIB_des"
-	for lres in "" "-lnsl -lsocket"; do
-		LIB_des="${saved_LIB_des} -lcrypto $lres"
-		LIB_des_a="$LIB_des"
-		LIB_des_so="$LIB_des"
-		LIB_des_appl="$LIB_des"
-		LIBS="${LIBS} ${LIB_des}"
-		AC_TRY_LINK(test_headers, test_body, [
+	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_hcrypto} ${CFLAGS}"
+	saved_LIB_hcrypto="$LIB_hcrypto"
+	for lres in "" "-ldl" "-lnsl -lsocket" "-lnsl -lsocket -ldl"; do
+		LIB_hcrypto="${saved_LIB_hcrypto} -lcrypto $lres"
+		LIB_hcrypto_a="$LIB_hcrypto"
+		LIB_hcrypto_so="$LIB_hcrypto"
+		LIB_hcrypto_appl="$LIB_hcrypto"
+		LIBS="${LIBS} ${LIB_hcrypto}"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [
 			crypto_lib=libcrypto openssl=yes
 			AC_MSG_RESULT([libcrypto])
 		])
@@ -151,13 +147,13 @@ fi
 
 if test "$crypto_lib" = "unknown"; then
 
-  DIR_des='des'
-  LIB_des='$(top_builddir)/lib/des/libdes.la'
-  LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
-  LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
-  LIB_des_appl="-ldes"
+  DIR_hcrypto='hcrypto'
+  LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la'
+  LIB_hcrypto_a='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.a'
+  LIB_hcrypto_so='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.so'
+  LIB_hcrypto_appl="-lhcrypto"
 
-  AC_MSG_RESULT([included libdes])
+  AC_MSG_RESULT([included libhcrypto])
 
 fi
 
@@ -170,16 +166,12 @@ fi
 if test "$openssl" = "yes"; then
   AC_DEFINE([HAVE_OPENSSL], 1, [define to use openssl's libcrypto])
 fi
-if test "$old_hash" = yes; then
-  AC_DEFINE([HAVE_OLD_HASH_NAMES], 1,
-		[define if you have hash functions like md4_finito()])
-fi
 AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = yes)dnl
 
-AC_SUBST(DIR_des)
-AC_SUBST(INCLUDE_des)
-AC_SUBST(LIB_des)
-AC_SUBST(LIB_des_a)
-AC_SUBST(LIB_des_so)
-AC_SUBST(LIB_des_appl)
+AC_SUBST(DIR_hcrypto)
+AC_SUBST(INCLUDE_hcrypto)
+AC_SUBST(LIB_hcrypto)
+AC_SUBST(LIB_hcrypto_a)
+AC_SUBST(LIB_hcrypto_so)
+AC_SUBST(LIB_hcrypto_appl)
 ])
diff --git a/crypto/heimdal/cf/db.m4 b/crypto/heimdal/cf/db.m4
index 7646bf6..cc8b8ca 100644
--- a/crypto/heimdal/cf/db.m4
+++ b/crypto/heimdal/cf/db.m4
@@ -1,13 +1,18 @@
-dnl $Id: db.m4,v 1.9 2002/09/10 14:29:47 joda Exp $
+dnl $Id: db.m4 15456 2005-06-16 21:04:43Z lha $
 dnl
 dnl tests for various db libraries
 dnl
 AC_DEFUN([rk_DB],[
 AC_ARG_ENABLE(berkeley-db,
-                       AC_HELP_STRING([--disable-berkeley-db],
+                       AS_HELP_STRING([--disable-berkeley-db],
                                       [if you don't want berkeley db]),[
 ])
 
+AC_ARG_ENABLE(ndbm-db,
+                       AS_HELP_STRING([--disable-ndbm-db],
+                                      [if you don't want ndbm db]),[
+])
+
 have_ndbm=no
 db_type=unknown
 
@@ -95,70 +100,72 @@ dnl test for ndbm compatability
 
 fi # berkeley db
 
-if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
-
-  AC_CHECK_HEADERS([				\
-	dbm.h					\
-	ndbm.h					\
-  ])
+if test "$enable_ndbm_db" != "no"; then
 
-  AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
-  #include <stdio.h>
-  #if defined(HAVE_NDBM_H)
-  #include <ndbm.h>
-  #elif defined(HAVE_DBM_H)
-  #include <dbm.h>
-  #endif
-  DBM *dbm;
-  ],[NULL])
-
-  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
-    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
-      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
-    else
-      LIB_NDBM=""
-    fi
-    AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
-    have_ndbm=yes
-    if test "$db_type" = "unknown"; then
-      db_type=ndbm
-      DBLIB="$LIB_NDBM"
-    fi
-  else
-
-    $as_unset ac_cv_func_dbm_firstkey
-    $as_unset ac_cv_funclib_dbm_firstkey
+  if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
 
     AC_CHECK_HEADERS([				\
-	  gdbm/ndbm.h				\
+  	dbm.h					\
+  	ndbm.h					\
     ])
-
-    AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [
+  
+    AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
     #include <stdio.h>
-    #include <gdbm/ndbm.h>
+    #if defined(HAVE_NDBM_H)
+    #include <ndbm.h>
+    #elif defined(HAVE_DBM_H)
+    #include <dbm.h>
+    #endif
     DBM *dbm;
     ],[NULL])
-
+  
     if test "$ac_cv_func_dbm_firstkey" = "yes"; then
       if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
-	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+        LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
       else
-	LIB_NDBM=""
+        LIB_NDBM=""
       fi
       AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
       have_ndbm=yes
       if test "$db_type" = "unknown"; then
-	db_type=ndbm
-	DBLIB="$LIB_NDBM"
+        db_type=ndbm
+        DBLIB="$LIB_NDBM"
+      fi
+    else
+  
+      $as_unset ac_cv_func_dbm_firstkey
+      $as_unset ac_cv_funclib_dbm_firstkey
+  
+      AC_CHECK_HEADERS([				\
+  	  gdbm/ndbm.h				\
+      ])
+  
+      AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [
+      #include <stdio.h>
+      #include <gdbm/ndbm.h>
+      DBM *dbm;
+      ],[NULL])
+  
+      if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+        if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+  	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+        else
+  	LIB_NDBM=""
+        fi
+        AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
+        have_ndbm=yes
+        if test "$db_type" = "unknown"; then
+  	db_type=ndbm
+  	DBLIB="$LIB_NDBM"
+        fi
       fi
     fi
-  fi
-
+  fi #enable_ndbm_db
 fi # unknown
 
 if test "$have_ndbm" = "yes"; then
   AC_MSG_CHECKING([if ndbm is implemented with db])
-  AC_TRY_RUN([
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <unistd.h>
 #include <fcntl.h>
 #if defined(HAVE_GDBM_NDBM_H)
@@ -168,7 +175,7 @@ if test "$have_ndbm" = "yes"; then
 #elif defined(HAVE_DBM_H)
 #include <dbm.h>
 #endif
-int main()
+int main(int argc, char **argv)
 {
   DBM *d;
 
@@ -177,7 +184,7 @@ int main()
     return 1;
   dbm_close(d);
   return 0;
-}],[
+}]])],[
     if test -f conftest.db; then
       AC_MSG_RESULT([yes])
       AC_DEFINE(HAVE_NEW_DB, 1, [Define if NDBM really is DB (creates files *.db)])
diff --git a/crypto/heimdal/cf/destdirs.m4 b/crypto/heimdal/cf/destdirs.m4
index 0d56e9c..6b75f65 100644
--- a/crypto/heimdal/cf/destdirs.m4
+++ b/crypto/heimdal/cf/destdirs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: destdirs.m4,v 1.2 2002/08/12 15:12:50 joda Exp $
+dnl $Id: destdirs.m4 11082 2002-08-12 15:12:50Z joda $
 dnl
 
 AC_DEFUN([rk_DESTDIRS], [
diff --git a/crypto/heimdal/cf/dlopen.m4 b/crypto/heimdal/cf/dlopen.m4
index 322f8b9..310ca55 100644
--- a/crypto/heimdal/cf/dlopen.m4
+++ b/crypto/heimdal/cf/dlopen.m4
@@ -1,8 +1,11 @@
 dnl
-dnl $Id: dlopen.m4,v 1.1 2002/08/28 16:32:16 joda Exp $
+dnl $Id: dlopen.m4 15433 2005-06-16 19:40:59Z lha $
 dnl
 
 AC_DEFUN([rk_DLOPEN], [
-	AC_FIND_FUNC_NO_LIBS(dlopen, dl)
+	AC_FIND_FUNC_NO_LIBS(dlopen, dl,[
+#ifdef HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif],[0,0])
 	AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)
 ])
diff --git a/crypto/heimdal/cf/find-func-no-libs.m4 b/crypto/heimdal/cf/find-func-no-libs.m4
index 4410330..76965a8 100644
--- a/crypto/heimdal/cf/find-func-no-libs.m4
+++ b/crypto/heimdal/cf/find-func-no-libs.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs.m4,v 1.5.20.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: find-func-no-libs.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl Look for function in any of the specified libraries
diff --git a/crypto/heimdal/cf/find-func-no-libs2.m4 b/crypto/heimdal/cf/find-func-no-libs2.m4
index 566504a..617a09e 100644
--- a/crypto/heimdal/cf/find-func-no-libs2.m4
+++ b/crypto/heimdal/cf/find-func-no-libs2.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs2.m4,v 1.6.10.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: find-func-no-libs2.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl
 dnl Look for function in any of the specified libraries
@@ -21,7 +21,7 @@ if eval "test \"\$ac_cv_func_$1\" != yes" ; then
 		*) ac_lib="-l$ac_lib" ;;
 		esac
 		LIBS="$6 $ac_lib $5 $ac_save_LIBS"
-		AC_TRY_LINK([$3],[$1($4)],eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break)
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break])
 	done
 	eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
 	LIBS="$ac_save_LIBS"
diff --git a/crypto/heimdal/cf/find-func.m4 b/crypto/heimdal/cf/find-func.m4
index a5916cd..2354f38 100644
--- a/crypto/heimdal/cf/find-func.m4
+++ b/crypto/heimdal/cf/find-func.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func.m4,v 1.1.42.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: find-func.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl AC_FIND_FUNC(func, libraries, includes, arguments)
 AC_DEFUN([AC_FIND_FUNC], [
diff --git a/crypto/heimdal/cf/find-if-not-broken.m4 b/crypto/heimdal/cf/find-if-not-broken.m4
index 87ea361..3e94638 100644
--- a/crypto/heimdal/cf/find-if-not-broken.m4
+++ b/crypto/heimdal/cf/find-if-not-broken.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-if-not-broken.m4,v 1.4.8.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: find-if-not-broken.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl Mix between AC_FIND_FUNC and AC_BROKEN
diff --git a/crypto/heimdal/cf/framework-security.m4 b/crypto/heimdal/cf/framework-security.m4
new file mode 100644
index 0000000..3358292
--- /dev/null
+++ b/crypto/heimdal/cf/framework-security.m4
@@ -0,0 +1,31 @@
+AC_DEFUN([rk_FRAMEWORK_SECURITY], [
+
+AC_MSG_CHECKING([for framework security])
+AC_CACHE_VAL(rk_cv_framework_security,
+[
+if test "$rk_cv_framework_security" != yes; then
+	ac_save_LIBS="$LIBS"
+	LIBS="$ac_save_LIBS -framework Security -framework CoreFoundation"
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <Security/Security.h>
+]],
+[[SecKeychainSearchRef searchRef;
+SecKeychainSearchCreateFromAttributes(NULL,kSecCertificateItemClass,NULL, &searchRef);
+CFRelease(&searchRef);
+]])],[rk_cv_framework_security=yes])
+	LIBS="$ac_save_LIBS"
+fi
+])
+
+if test "$rk_cv_framework_security" = yes; then
+   AC_DEFINE(HAVE_FRAMEWORK_SECURITY, 1, [Have -framework Security])
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(FRAMEWORK_SECURITY, test "$rk_cv_framework_security" = yes)
+
+if test "$rk_cv_framework_security" = yes; then
+   AC_NEED_PROTO([#include <Security/Security.h>],SecKeyGetCSPHandle)
+fi
+
+])
diff --git a/crypto/heimdal/cf/have-pragma-weak.m4 b/crypto/heimdal/cf/have-pragma-weak.m4
index a13016a..32b7a67 100644
--- a/crypto/heimdal/cf/have-pragma-weak.m4
+++ b/crypto/heimdal/cf/have-pragma-weak.m4
@@ -1,4 +1,4 @@
-dnl $Id: have-pragma-weak.m4,v 1.3.34.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: have-pragma-weak.m4 15435 2005-06-16 19:45:52Z lha $
 dnl
 AC_DEFUN([AC_HAVE_PRAGMA_WEAK], [
 if test "${enable_shared}" = "yes"; then
@@ -16,11 +16,11 @@ cat > conftest_bar.$ac_ext <<'EOF'
 #include "confdefs.h"
 extern int foo;
 
-int t() {
+int t(void) {
   return foo;
 }
 
-int main() {
+int main(int argc, char **argv) {
   return t();
 }
 EOF
diff --git a/crypto/heimdal/cf/have-struct-field.m4 b/crypto/heimdal/cf/have-struct-field.m4
index 341970a..8618bc0 100644
--- a/crypto/heimdal/cf/have-struct-field.m4
+++ b/crypto/heimdal/cf/have-struct-field.m4
@@ -1,4 +1,4 @@
-dnl $Id: have-struct-field.m4,v 1.6.22.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: have-struct-field.m4 18314 2006-10-07 17:31:56Z lha $
 dnl
 dnl check for fields in a structure
 dnl
@@ -7,9 +7,11 @@ dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
 AC_DEFUN([AC_HAVE_STRUCT_FIELD], [
 define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
 AC_CACHE_CHECK([for $2 in $1], cache_val,[
-AC_TRY_COMPILE([$3],[$1 x; x.$2;],
-cache_val=yes,
-cache_val=no)])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]],
+	[[$1 x; memset(&x, 0, sizeof(x)); x.$2]])],
+	[cache_val=yes],
+	[cache_val=no])
+])
 if test "$cache_val" = yes; then
 	define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_]))
 	AC_DEFINE(foo, 1, [Define if $1 has field $2.])
diff --git a/crypto/heimdal/cf/have-type.m4 b/crypto/heimdal/cf/have-type.m4
index c764ed6..34d5bef 100644
--- a/crypto/heimdal/cf/have-type.m4
+++ b/crypto/heimdal/cf/have-type.m4
@@ -1,4 +1,4 @@
-dnl $Id: have-type.m4,v 1.6.12.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: have-type.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl check for existance of a type
 
@@ -8,16 +8,16 @@ AC_REQUIRE([AC_HEADER_STDC])
 cv=`echo "$1" | sed 'y%./+- %__p__%'`
 AC_MSG_CHECKING(for $1)
 AC_CACHE_VAL([ac_cv_type_$cv],
-AC_TRY_COMPILE(
-[#include <sys/types.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 #endif
-$2],
-[$1 foo;],
-eval "ac_cv_type_$cv=yes",
-eval "ac_cv_type_$cv=no"))dnl
+$2]],
+[[$1 foo;]])],
+[eval "ac_cv_type_$cv=yes"],
+[eval "ac_cv_type_$cv=no"]))dnl
 ac_foo=`eval echo \\$ac_cv_type_$cv`
 AC_MSG_RESULT($ac_foo)
 if test "$ac_foo" = yes; then
diff --git a/crypto/heimdal/cf/have-types.m4 b/crypto/heimdal/cf/have-types.m4
index e369910..79ceb97 100644
--- a/crypto/heimdal/cf/have-types.m4
+++ b/crypto/heimdal/cf/have-types.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: have-types.m4,v 1.2.12.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: have-types.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 
 AC_DEFUN([AC_HAVE_TYPES], [
diff --git a/crypto/heimdal/cf/install-catman.sh b/crypto/heimdal/cf/install-catman.sh
index 4a5aa8e..872e162 100755
--- a/crypto/heimdal/cf/install-catman.sh
+++ b/crypto/heimdal/cf/install-catman.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
 #
-# $Id: install-catman.sh,v 1.3 2001/09/29 16:05:38 assar Exp $
+# $Id: install-catman.sh 20232 2007-02-16 11:03:13Z lha $
 #
 # install preformatted manual pages
 
+cmd="$1"; shift
 INSTALL_DATA="$1"; shift
 mkinstalldirs="$1"; shift
 srcdir="$1"; shift
 manbase="$1"; shift
 suffix="$1"; shift
+catinstall="${INSTALL_CATPAGES-yes}"
 
 for f in "$@"; do
 	base=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\1/'`
@@ -17,37 +19,54 @@ for f in "$@"; do
 	catdir="$manbase/cat$section"
 	c="$base.cat$section"
 
-	if test -f "$srcdir/$c"; then
-		if test \! -d "$catdir"; then
-			eval "$mkinstalldirs $catdir"
+	if test "$catinstall" = yes -a -f "$srcdir/$c"; then
+		if test "$cmd" = install ; then
+			if test \! -d "$catdir"; then
+				eval "$mkinstalldirs $catdir"
+			fi
+			eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
+			eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
+		elif test "$cmd" = uninstall ; then
+			eval "echo rm -f $catdir/$base.$suffix"
+			eval "rm -f $catdir/$base.$suffix"
 		fi
-		eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
-		eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
 	fi
 	for link in `sed -n -e '/SYNOPSIS/q;/DESCRIPTION/q;s/^\.Nm \([^ ]*\).*/\1/p' $srcdir/$f`; do
-		if [ "$link" != "$base" ]; then
+		if test "$link" = "$base" ; then
+			continue
+		fi
+		if test "$cmd" = install ; then
 			target="$mandir/$link.$section"
-			for cmd in "ln -f $mandir/$base.$section $target" \
+			for lncmd in "ln -f $mandir/$base.$section $target" \
 				   "ln -s $base.$section $target" \
 				   "cp -f $mandir/$base.$section $target"
 			do
-				if eval "$cmd"; then
-					eval echo "$cmd"
+				if eval "$lncmd"; then
+					eval echo "$lncmd"
 					break
 				fi
 			done
-			if test -f "$srcdir/$c"; then
+			if test "$catinstall" = yes -a -f "$srcdir/$c"; then
 				target="$catdir/$link.$suffix"
-				for cmd in "ln -f $catdir/$base.$suffix $target" \
+				for lncmd in "ln -f $catdir/$base.$suffix $target" \
 					   "ln -fs $base.$suffix $target" \
 					   "cp -f $catdir/$base.$suffix $target"
 				do
-					if eval "$cmd"; then
-						eval echo "$cmd"
+					if eval "$lncmd"; then
+						eval echo "$lncmd"
 						break
 					fi
 				done
 			fi
+		elif test "$cmd" = uninstall ; then
+			target="$mandir/$link.$section"
+			eval "echo rm -f $target"
+			eval "rm -f $target"
+			if test "$catinstall" = yes; then
+				target="$catdir/$link.$suffix"
+				eval "echo rm -f $target"
+				eval "rm -f $target"
+			fi
 		fi
 	done
 done
diff --git a/crypto/heimdal/cf/irix.m4 b/crypto/heimdal/cf/irix.m4
index b62e2c3..510b81f 100644
--- a/crypto/heimdal/cf/irix.m4
+++ b/crypto/heimdal/cf/irix.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: irix.m4,v 1.1 2002/08/28 19:11:44 joda Exp $
+dnl $Id: irix.m4 11267 2002-08-28 19:11:44Z joda $
 dnl
 
 AC_DEFUN([rk_IRIX],
diff --git a/crypto/heimdal/cf/krb-bigendian.m4 b/crypto/heimdal/cf/krb-bigendian.m4
index 672cc25..30e1a79 100644
--- a/crypto/heimdal/cf/krb-bigendian.m4
+++ b/crypto/heimdal/cf/krb-bigendian.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: krb-bigendian.m4,v 1.8.6.1 2004/04/01 07:27:33 joda Exp $
+dnl $Id: krb-bigendian.m4 15456 2005-06-16 21:04:43Z lha $
 dnl
 
 dnl check if this computer is little or big-endian
@@ -9,29 +9,29 @@ dnl it when cross-compiling
 
 AC_DEFUN([KRB_C_BIGENDIAN], [
 AC_ARG_ENABLE(bigendian,
-	AC_HELP_STRING([--enable-bigendian],[the target is big endian]),
+	AS_HELP_STRING([--enable-bigendian],[the target is big endian]),
 krb_cv_c_bigendian=yes)
 AC_ARG_ENABLE(littleendian,
-	AC_HELP_STRING([--enable-littleendian],[the target is little endian]),
+	AS_HELP_STRING([--enable-littleendian],[the target is little endian]),
 krb_cv_c_bigendian=no)
-AC_CACHE_CHECK(whether byte order is known at compile time,
+AC_CACHE_CHECK([whether byte order is known at compile time],
 krb_cv_c_bigendian_compile,
-[AC_TRY_COMPILE([
+[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
-#include <sys/param.h>],[
+#include <sys/param.h>
 #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
  bogus endian macros
-#endif], krb_cv_c_bigendian_compile=yes, krb_cv_c_bigendian_compile=no)])
+#endif]])],[krb_cv_c_bigendian_compile=yes],[krb_cv_c_bigendian_compile=no])])
 AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[
   if test "$krb_cv_c_bigendian_compile" = "yes"; then
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
-#include <sys/param.h>],[
+#include <sys/param.h>
 #if BYTE_ORDER != BIG_ENDIAN
   not big endian
-#endif], krb_cv_c_bigendian=yes, krb_cv_c_bigendian=no)
+#endif]])],[krb_cv_c_bigendian=yes],[krb_cv_c_bigendian=no])
   else
-    AC_TRY_RUN([main () {
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[main (int argc, char **argv) {
       /* Are we little or big endian?  From Harbison&Steele.  */
       union
       {
@@ -40,8 +40,8 @@ AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[
     } u;
     u.l = 1;
     exit (u.c[sizeof (long) - 1] == 1);
-  }], krb_cv_c_bigendian=no, krb_cv_c_bigendian=yes,
-  AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian]))
+  }]])],[krb_cv_c_bigendian=no],[krb_cv_c_bigendian=yes],
+  [AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian])])
   fi
 ])
 if test "$krb_cv_c_bigendian" = "yes"; then
diff --git a/crypto/heimdal/cf/krb-func-getcwd-broken.m4 b/crypto/heimdal/cf/krb-func-getcwd-broken.m4
index e3f9372..6ab4a26 100644
--- a/crypto/heimdal/cf/krb-func-getcwd-broken.m4
+++ b/crypto/heimdal/cf/krb-func-getcwd-broken.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-func-getcwd-broken.m4,v 1.3.8.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-func-getcwd-broken.m4 15455 2005-06-16 21:03:43Z lha $
 dnl
 dnl
 dnl test for broken getcwd in (SunOS braindamage)
@@ -10,7 +10,7 @@ AC_MSG_CHECKING(if getcwd is broken)
 AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
 ac_cv_func_getcwd_broken=no
 
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <errno.h>
 char *getcwd(char*, int);
 
@@ -20,7 +20,7 @@ void *popen(char *cmd, char *mode)
 	return 0;
 }
 
-int main()
+int main(int argc, char **argv)
 {
 	char *ret;
 	ret = getcwd(0, 1024);
@@ -28,7 +28,7 @@ int main()
 		return 0;
 	return 1;
 }
-], ac_cv_func_getcwd_broken=yes,:,:)
+]])], [ac_cv_func_getcwd_broken=yes],[:],[:])
 ])
 if test "$ac_cv_func_getcwd_broken" = yes; then
 	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
diff --git a/crypto/heimdal/cf/krb-func-getlogin.m4 b/crypto/heimdal/cf/krb-func-getlogin.m4
index ec091d7..03cecfc 100644
--- a/crypto/heimdal/cf/krb-func-getlogin.m4
+++ b/crypto/heimdal/cf/krb-func-getlogin.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: krb-func-getlogin.m4,v 1.1.32.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-func-getlogin.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl test for POSIX (broken) getlogin
 dnl
diff --git a/crypto/heimdal/cf/krb-ipv6.m4 b/crypto/heimdal/cf/krb-ipv6.m4
index 1afcbb2..ba0b000 100644
--- a/crypto/heimdal/cf/krb-ipv6.m4
+++ b/crypto/heimdal/cf/krb-ipv6.m4
@@ -1,10 +1,10 @@
-dnl $Id: krb-ipv6.m4,v 1.13.8.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-ipv6.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl test for IPv6
 dnl
 AC_DEFUN([AC_KRB_IPV6], [
 AC_ARG_WITH(ipv6,
-	AC_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
+	AS_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
 if test "$withval" = "no"; then
 	ac_cv_lib_ipv6=no
 fi])
@@ -89,7 +89,7 @@ fi
 ])
 
 AC_CACHE_CHECK([for IPv6], ac_cv_lib_ipv6, [
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -102,8 +102,8 @@ AC_TRY_LINK([
 #ifdef HAVE_NETINET_IN6_H
 #include <netinet/in6.h>
 #endif
-],
-[
+]],
+[[
  struct sockaddr_in6 sin6;
  int s;
 
@@ -113,9 +113,9 @@ AC_TRY_LINK([
  sin6.sin6_port = htons(17);
  sin6.sin6_addr = in6addr_any;
  bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
-],
-ac_cv_lib_ipv6=yes,
-ac_cv_lib_ipv6=no)])
+]])],
+[ac_cv_lib_ipv6=yes],
+[ac_cv_lib_ipv6=no])])
 if test "$ac_cv_lib_ipv6" = yes; then
   AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.])
 else
@@ -125,7 +125,7 @@ fi
 ## test for AIX missing in6addr_loopback
 if test "$ac_cv_lib_ipv6" = yes; then
 	AC_CACHE_CHECK([for in6addr_loopback],[ac_cv_var_in6addr_loopback],[
-	AC_TRY_LINK([
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -137,10 +137,10 @@ if test "$ac_cv_lib_ipv6" = yes; then
 #endif
 #ifdef HAVE_NETINET_IN6_H
 #include <netinet/in6.h>
-#endif],[
+#endif]],[[
 struct sockaddr_in6 sin6;
 sin6.sin6_addr = in6addr_loopback;
-],ac_cv_var_in6addr_loopback=yes,ac_cv_var_in6addr_loopback=no)])
+]])],[ac_cv_var_in6addr_loopback=yes],[ac_cv_var_in6addr_loopback=no])])
 	if test "$ac_cv_var_in6addr_loopback" = yes; then
 		AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, 
 			[Define if you have the in6addr_loopback variable])
diff --git a/crypto/heimdal/cf/krb-prog-ln-s.m4 b/crypto/heimdal/cf/krb-prog-ln-s.m4
index 16a4dff..e4bb7ca 100644
--- a/crypto/heimdal/cf/krb-prog-ln-s.m4
+++ b/crypto/heimdal/cf/krb-prog-ln-s.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-prog-ln-s.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-prog-ln-s.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl Better test for ln -s, ln or cp
diff --git a/crypto/heimdal/cf/krb-prog-ranlib.m4 b/crypto/heimdal/cf/krb-prog-ranlib.m4
index cf06193..6a851a2 100644
--- a/crypto/heimdal/cf/krb-prog-ranlib.m4
+++ b/crypto/heimdal/cf/krb-prog-ranlib.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-prog-ranlib.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-prog-ranlib.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl Also look for EMXOMF for OS/2
diff --git a/crypto/heimdal/cf/krb-prog-yacc.m4 b/crypto/heimdal/cf/krb-prog-yacc.m4
index 54dd8b4..10203e4 100644
--- a/crypto/heimdal/cf/krb-prog-yacc.m4
+++ b/crypto/heimdal/cf/krb-prog-yacc.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-prog-yacc.m4,v 1.3.16.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-prog-yacc.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl We prefer byacc or yacc because they do not use `alloca'
diff --git a/crypto/heimdal/cf/krb-readline.m4 b/crypto/heimdal/cf/krb-readline.m4
index ed5aa0a..61a50c5 100644
--- a/crypto/heimdal/cf/krb-readline.m4
+++ b/crypto/heimdal/cf/krb-readline.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-readline.m4,v 1.5.6.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-readline.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl Tests for readline functions
 dnl
@@ -9,11 +9,11 @@ AC_DEFUN([KRB_READLINE],[
 AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
 if test "$ac_cv_func_el_init" = yes ; then
 	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
-		AC_TRY_COMPILE([#include <stdio.h>
-			#include <histedit.h>],
-			[el_init("", NULL, NULL, NULL);],
-			ac_cv_func_el_init_four=yes,
-			ac_cv_func_el_init_four=no)])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+			#include <histedit.h>]],
+			[[el_init("", NULL, NULL, NULL);]])],
+			[ac_cv_func_el_init_four=yes],
+			[ac_cv_func_el_init_four=no])])
 	if test "$ac_cv_func_el_init_four" = yes; then
 		AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.])
 	fi
diff --git a/crypto/heimdal/cf/krb-struct-spwd.m4 b/crypto/heimdal/cf/krb-struct-spwd.m4
index 49d8efd..17fb2a3 100644
--- a/crypto/heimdal/cf/krb-struct-spwd.m4
+++ b/crypto/heimdal/cf/krb-struct-spwd.m4
@@ -1,18 +1,17 @@
-dnl $Id: krb-struct-spwd.m4,v 1.3.32.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-struct-spwd.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl Test for `struct spwd'
 
 AC_DEFUN([AC_KRB_STRUCT_SPWD], [
 AC_MSG_CHECKING(for struct spwd)
 AC_CACHE_VAL(ac_cv_struct_spwd, [
-AC_TRY_COMPILE(
-[#include <pwd.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <pwd.h>
 #ifdef HAVE_SHADOW_H
 #include <shadow.h>
-#endif],
-[struct spwd foo;],
-ac_cv_struct_spwd=yes,
-ac_cv_struct_spwd=no)
+#endif]],[[struct spwd foo;]])],
+[ac_cv_struct_spwd=yes],
+[ac_cv_struct_spwd=no])
 ])
 AC_MSG_RESULT($ac_cv_struct_spwd)
 
diff --git a/crypto/heimdal/cf/krb-struct-winsize.m4 b/crypto/heimdal/cf/krb-struct-winsize.m4
index 3fcc527..06e5f5b 100644
--- a/crypto/heimdal/cf/krb-struct-winsize.m4
+++ b/crypto/heimdal/cf/krb-struct-winsize.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-struct-winsize.m4,v 1.3.10.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-struct-winsize.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl Search for struct winsize
diff --git a/crypto/heimdal/cf/krb-sys-aix.m4 b/crypto/heimdal/cf/krb-sys-aix.m4
index 02ba585..544e779 100644
--- a/crypto/heimdal/cf/krb-sys-aix.m4
+++ b/crypto/heimdal/cf/krb-sys-aix.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-sys-aix.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-sys-aix.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl AIX have a very different syscall convention
diff --git a/crypto/heimdal/cf/krb-sys-nextstep.m4 b/crypto/heimdal/cf/krb-sys-nextstep.m4
index 1d098bc..dcf7e09 100644
--- a/crypto/heimdal/cf/krb-sys-nextstep.m4
+++ b/crypto/heimdal/cf/krb-sys-nextstep.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-sys-nextstep.m4,v 1.4.6.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-sys-nextstep.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl NEXTSTEP is not posix compliant by default,
 dnl you need a switch -posix to the compiler
diff --git a/crypto/heimdal/cf/krb-version.m4 b/crypto/heimdal/cf/krb-version.m4
index e452ad0..92d731f 100644
--- a/crypto/heimdal/cf/krb-version.m4
+++ b/crypto/heimdal/cf/krb-version.m4
@@ -1,4 +1,4 @@
-dnl $Id: krb-version.m4,v 1.3.6.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: krb-version.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl
 dnl output a C header-file with some version strings
diff --git a/crypto/heimdal/cf/largefile.m4 b/crypto/heimdal/cf/largefile.m4
new file mode 100644
index 0000000..972ba9c
--- /dev/null
+++ b/crypto/heimdal/cf/largefile.m4
@@ -0,0 +1,16 @@
+dnl $Id: largefile.m4 13768 2004-04-24 21:51:32Z joda $
+dnl
+dnl Figure out what flags we need for 64-bit file access, and also set
+dnl them on the command line.
+dnl
+AC_DEFUN([rk_SYS_LARGEFILE],[
+AC_REQUIRE([AC_SYS_LARGEFILE])dnl
+dnl need to set this on the command line, since it might otherwise break
+dnl with generated code, such as lex
+if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
+	CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+fi
+if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
+	CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+fi
+])
diff --git a/crypto/heimdal/cf/make-proto.pl b/crypto/heimdal/cf/make-proto.pl
index 769d96c..f119b51 100644
--- a/crypto/heimdal/cf/make-proto.pl
+++ b/crypto/heimdal/cf/make-proto.pl
@@ -1,5 +1,5 @@
 # Make prototypes from .c files
-# $Id: make-proto.pl,v 1.16 2002/09/19 19:29:42 joda Exp $
+# $Id: make-proto.pl 14183 2004-09-03 08:50:57Z lha $
 
 ##use Getopt::Std;
 require 'getopts.pl';
@@ -10,7 +10,7 @@ $debug = 0;
 $oproto = 1;
 $private_func_re = "^_";
 
-do Getopts('o:p:dqR:P:') || die "foo";
+do Getopts('x:m:o:p:dqE:R:P:') || die "foo";
 
 if($opt_d) {
     $debug = 1;
@@ -23,6 +23,45 @@ if($opt_q) {
 if($opt_R) {
     $private_func_re = $opt_R;
 }
+%flags = (
+	  'multiline-proto' => 1,
+	  'header' => 1,
+	  'function-blocking' => 0,
+	  'gnuc-attribute' => 1,
+	  'cxx' => 1
+	  );
+if($opt_m) {
+    foreach $i (split(/,/, $opt_m)) {
+	if($i eq "roken") {
+	    $flags{"multiline-proto"} = 0;
+	    $flags{"header"} = 0;
+	    $flags{"function-blocking"} = 0;
+	    $flags{"gnuc-attribute"} = 0;
+	    $flags{"cxx"} = 0;
+	} else {
+	    if(substr($i, 0, 3) eq "no-") {
+		$flags{substr($i, 3)} = 0;
+	    } else {
+		$flags{$i} = 1;
+	    }
+	}
+    }
+}
+
+if($opt_x) {
+    open(EXP, $opt_x);
+    while(<EXP>) {
+	chomp;
+	s/\#.*//g;
+	s/\s+/ /g;
+	if(/^([a-zA-Z0-9_]+)\s?(.*)$/) {
+	    $exported{$1} = $2;
+	} else {
+	    print $_, "\n";
+	}
+    }
+    close EXP;
+}
 
 while(<>) {
     print $brace, " ", $_ if($debug);
@@ -68,6 +107,7 @@ while(<>) {
 		# remove parameter names 
 		if($opt_P eq "remove") {
 		    s/(\s*)([a-zA-Z0-9_]+)([,>])/$3/g;
+		    s/\s+\*/*/g;
 		    s/\(\*(\s*)([a-zA-Z0-9_]+)\)/(*)/g;
 		} elsif($opt_P eq "comment") {
 		    s/([a-zA-Z0-9_]+)([,>])/\/\*$1\*\/$2/g;
@@ -75,7 +115,11 @@ while(<>) {
 		}
 		s/\<\>/<void>/;
 		# add newlines before parameters
-		s/,\s*/,\n\t/g;
+		if($flags{"multiline-proto"}) {
+		    s/,\s*/,\n\t/g;
+		} else {
+		    s/,\s*/, /g;
+		}
 		# fix removed ,
 		s/\$/,/g;
 		# match function name
@@ -89,14 +133,16 @@ while(<>) {
 		    $RP = ")";
 		}
 		# only add newline if more than one parameter
-                if(/,/){ 
+                if($flags{"multiline-proto"} && /,/){ 
 		    s/\</ $LP\n\t/;
 		}else{
 		    s/\</ $LP/;
 		}
 		s/\>/$RP/;
 		# insert newline before function name
-		s/(.*)\s([a-zA-Z0-9_]+ \Q$LP\E)/$1\n$2/;
+		if($flags{"multiline-proto"}) {
+		    s/(.*)\s([a-zA-Z0-9_]+ \Q$LP\E)/$1\n$2/;
+		}
 		if($attr ne "") {
 		    $_ .= "\n    $attr";
 		}
@@ -142,13 +188,13 @@ if($opt_p) {
 $public_h = "";
 $private_h = "";
 
-$public_h_header = "/* This is a generated file */
+$public_h_header .= "/* This is a generated file */
 #ifndef $block
 #define $block
 
 ";
 if ($oproto) {
-$public_h_header .= "#ifdef __STDC__
+    $public_h_header .= "#ifdef __STDC__
 #include <stdarg.h>
 #ifndef __P
 #define __P(x) x
@@ -165,6 +211,7 @@ $public_h_header .= "#ifdef __STDC__
 
 ";
 }
+$public_h_trailer = "";
 
 $private_h_header = "/* This is a generated file */
 #ifndef $private
@@ -172,7 +219,7 @@ $private_h_header = "/* This is a generated file */
 
 ";
 if($oproto) {
-$private_h_header .= "#ifdef __STDC__
+    $private_h_header .= "#ifdef __STDC__
 #include <stdarg.h>
 #ifndef __P
 #define __P(x) x
@@ -189,43 +236,94 @@ $private_h_header .= "#ifdef __STDC__
 
 ";
 }
+$private_h_trailer = "";
+
 foreach(sort keys %funcs){
     if(/^(main)$/) { next }
-    if(/$private_func_re/) {
+    if(!defined($exported{$_}) && /$private_func_re/) {
 	$private_h .= $funcs{$_} . "\n\n";
 	if($funcs{$_} =~ /__attribute__/) {
 	    $private_attribute_seen = 1;
 	}
     } else {
-	$public_h .= $funcs{$_} . "\n\n";
+	if($flags{"function-blocking"}) {
+	    $fupper = uc $_;
+	    if($exported{$_} =~ /proto/) {
+		$public_h .= "#if !defined(HAVE_$fupper) || defined(NEED_${fupper}_PROTO)\n";
+	    } else {
+		$public_h .= "#ifndef HAVE_$fupper\n";
+	    }
+	}
+	$public_h .= $funcs{$_} . "\n";
 	if($funcs{$_} =~ /__attribute__/) {
 	    $public_attribute_seen = 1;
 	}
+	if($flags{"function-blocking"}) {
+	    $public_h .= "#endif\n";
+	}
+	$public_h .= "\n";
     }
 }
 
-if ($public_attribute_seen) {
-    $public_h_header .= "#if !defined(__GNUC__) && !defined(__attribute__)
+if($flags{"gnuc-attribute"}) {
+    if ($public_attribute_seen) {
+	$public_h_header .= "#if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
 #endif
 
 ";
-}
+    }
 
-if ($private_attribute_seen) {
-    $private_h_header .= "#if !defined(__GNUC__) && !defined(__attribute__)
+    if ($private_attribute_seen) {
+	$private_h_header .= "#if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
 #endif
 
 ";
+    }
 }
+if($flags{"cxx"}) {
+    $public_h_header .= "#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+";
+    $public_h_trailer .= "#ifdef __cplusplus
+}
+#endif
+
+";
+
+}
+if ($opt_E) {
+    $public_h_header .= "#ifndef $opt_E
+#if defined(_WIN32)
+#define $opt_E _stdcall
+#else
+#define $opt_E
+#endif
+#endif
 
+";
+    
+    $private_h_header .= "#ifndef $opt_E
+#if defined(_WIN32)
+#define $opt_E _stdcall
+#else
+#define $opt_E
+#endif
+#endif
 
-if ($public_h ne "") {
-    $public_h = $public_h_header . $public_h . "#endif /* $block */\n";
+";
+}
+    
+if ($public_h ne "" && $flags{"header"}) {
+    $public_h = $public_h_header . $public_h . 
+	$public_h_trailer . "#endif /* $block */\n";
 }
-if ($private_h ne "") {
-    $private_h = $private_h_header . $private_h . "#endif /* $private */\n";
+if ($private_h ne "" && $flags{"header"}) {
+    $private_h = $private_h_header . $private_h .
+	$private_h_trailer . "#endif /* $private */\n";
 }
 
 if($opt_o) {
diff --git a/crypto/heimdal/cf/mips-abi.m4 b/crypto/heimdal/cf/mips-abi.m4
index 401ee91..2af513e 100644
--- a/crypto/heimdal/cf/mips-abi.m4
+++ b/crypto/heimdal/cf/mips-abi.m4
@@ -1,4 +1,4 @@
-dnl $Id: mips-abi.m4,v 1.6.8.1 2004/04/01 07:27:34 joda Exp $
+dnl $Id: mips-abi.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl
 dnl Check for MIPS/IRIX ABI flags. Sets $abi and $abilibdirext to some
@@ -6,7 +6,7 @@ dnl value.
 
 AC_DEFUN([AC_MIPS_ABI], [
 AC_ARG_WITH(mips_abi,
-	AC_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
+	AS_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
 
 case "$host_os" in
 irix*)
@@ -39,7 +39,7 @@ AC_MSG_CHECKING([if $CC supports the $abi option])
 AC_CACHE_VAL($ac_foo, [
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $abi"
-AC_TRY_COMPILE(,int x;, eval $ac_foo=yes, eval $ac_foo=no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x;]])],[eval $ac_foo=yes], [eval $ac_foo=no])dnl
 CFLAGS="$save_CFLAGS"
 ])
 ac_res=`eval echo \\\$$ac_foo`
@@ -50,7 +50,7 @@ case $abi in
 	-mabi=32) 
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -mabi=n32"
-	AC_TRY_COMPILE(,int x;, ac_res=yes, ac_res=no)
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x;]])],[ac_res=yes],[ac_res=no])dnl
 	CLAGS="$save_CFLAGS"
 	if test $ac_res = yes; then
 		# New GCC
diff --git a/crypto/heimdal/cf/misc.m4 b/crypto/heimdal/cf/misc.m4
index a825834..042f30a5 100644
--- a/crypto/heimdal/cf/misc.m4
+++ b/crypto/heimdal/cf/misc.m4
@@ -1,5 +1,5 @@
 
-dnl $Id: misc.m4,v 1.5 2002/05/24 15:35:32 joda Exp $
+dnl $Id: misc.m4 11022 2002-05-24 15:35:32Z joda $
 dnl
 AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl
 AC_DEFUN([rk_LIBOBJ],[AC_LIBOBJ([$1])])dnl
diff --git a/crypto/heimdal/cf/need-proto.m4 b/crypto/heimdal/cf/need-proto.m4
index b319076..978abb1 100644
--- a/crypto/heimdal/cf/need-proto.m4
+++ b/crypto/heimdal/cf/need-proto.m4
@@ -1,4 +1,4 @@
-dnl $Id: need-proto.m4,v 1.4.6.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: need-proto.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl
 dnl Check if we need the prototype for a function
@@ -9,13 +9,11 @@ dnl AC_NEED_PROTO(includes, function)
 AC_DEFUN([AC_NEED_PROTO], [
 if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then
 AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
-AC_TRY_COMPILE([$1],
-[struct foo { int foo; } xx;
-extern int $2 (struct foo*);
-$2(&xx);
-],
-eval "ac_cv_func_$2_noproto=yes",
-eval "ac_cv_func_$2_noproto=no"))
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1
+struct foo { int foo; } xx;
+extern int $2 (struct foo*);]],[[$2(&xx)]])],
+[eval "ac_cv_func_$2_noproto=yes"],
+[eval "ac_cv_func_$2_noproto=no"]))
 if test "$ac_cv_func_$2_noproto" = yes; then
 	AC_DEFINE(AS_TR_CPP(NEED_[]$2[]_PROTO), 1,
 		[define if the system is missing a prototype for $2()])
diff --git a/crypto/heimdal/cf/osfc2.m4 b/crypto/heimdal/cf/osfc2.m4
index 3ae889b..6366f7a 100644
--- a/crypto/heimdal/cf/osfc2.m4
+++ b/crypto/heimdal/cf/osfc2.m4
@@ -1,10 +1,10 @@
-dnl $Id: osfc2.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: osfc2.m4 14147 2004-08-25 14:14:01Z joda $
 dnl
 dnl enable OSF C2 stuff
 
 AC_DEFUN([AC_CHECK_OSFC2],[
 AC_ARG_ENABLE(osfc2,
-	AC_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
+	AS_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
 LIB_security=
 if test "$enable_osfc2" = yes; then
 	AC_DEFINE(HAVE_OSFC2, 1, [Define to enable basic OSF C2 support.])
diff --git a/crypto/heimdal/cf/otp.m4 b/crypto/heimdal/cf/otp.m4
index 37265ef..fa6a530 100644
--- a/crypto/heimdal/cf/otp.m4
+++ b/crypto/heimdal/cf/otp.m4
@@ -1,11 +1,11 @@
-dnl $Id: otp.m4,v 1.2 2002/05/19 20:51:08 joda Exp $
+dnl $Id: otp.m4 14147 2004-08-25 14:14:01Z joda $
 dnl
 dnl check requirements for OTP library
 dnl
 AC_DEFUN([rk_OTP],[
 AC_REQUIRE([rk_DB])dnl
 AC_ARG_ENABLE(otp,
-	AC_HELP_STRING([--disable-otp],[if you don't want OTP support]))
+	AS_HELP_STRING([--disable-otp],[if you don't want OTP support]))
 if test "$enable_otp" = yes -a "$db_type" = unknown; then
 	AC_MSG_ERROR([OTP requires a NDBM/DB compatible library])
 fi
diff --git a/crypto/heimdal/cf/proto-compat.m4 b/crypto/heimdal/cf/proto-compat.m4
index a666a55..0da8b25 100644
--- a/crypto/heimdal/cf/proto-compat.m4
+++ b/crypto/heimdal/cf/proto-compat.m4
@@ -1,4 +1,4 @@
-dnl $Id: proto-compat.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: proto-compat.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl
 dnl Check if the prototype of a function is compatible with another one
@@ -9,10 +9,9 @@ dnl AC_PROTO_COMPAT(includes, function, prototype)
 AC_DEFUN([AC_PROTO_COMPAT], [
 AC_CACHE_CHECK([if $2 is compatible with system prototype],
 ac_cv_func_$2_proto_compat,
-AC_TRY_COMPILE([$1],
-[$3;],
-eval "ac_cv_func_$2_proto_compat=yes",
-eval "ac_cv_func_$2_proto_compat=no"))
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]],[[$3]])],
+[eval "ac_cv_func_$2_proto_compat=yes"],
+[eval "ac_cv_func_$2_proto_compat=no"]))
 define([foo], translit($2, [a-z], [A-Z])[_PROTO_COMPATIBLE])
 if test "$ac_cv_func_$2_proto_compat" = yes; then
 	AC_DEFINE(foo, 1, [define if prototype of $2 is compatible with
diff --git a/crypto/heimdal/cf/pthreads.m4 b/crypto/heimdal/cf/pthreads.m4
new file mode 100644
index 0000000..fd2c81b
--- /dev/null
+++ b/crypto/heimdal/cf/pthreads.m4
@@ -0,0 +1,75 @@
+dnl $Id: pthreads.m4 20295 2007-04-11 11:08:08Z lha $
+
+AC_DEFUN([KRB_PTHREADS], [
+AC_MSG_CHECKING(if compiling threadsafe libraries)
+
+AC_ARG_ENABLE(pthread-support,
+	AS_HELP_STRING([--enable-pthread-support],
+			[if you want thread safe libraries]),
+	[],[enable_pthread_support=maybe])
+
+case "$host" in 
+*-*-solaris2*)
+	native_pthread_support=yes
+	if test "$GCC" = yes; then
+		PTHREADS_CFLAGS=-pthreads
+		PTHREADS_LIBS=-pthreads
+	else
+		PTHREADS_CFLAGS=-mt
+		PTHREADS_LIBS=-mt
+	fi
+	;;
+*-*-netbsd*)
+	native_pthread_support="if running netbsd 1.6T or newer"
+	dnl heim_threads.h knows this
+	PTHREADS_LIBS=""
+	;;
+*-*-freebsd5*)
+	native_pthread_support=yes
+	;;
+*-*-linux* | *-*-linux-gnu)
+	case `uname -r` in
+	2.*)
+		native_pthread_support=yes
+		PTHREADS_CFLAGS=-pthread
+		PTHREADS_LIBS=-pthread
+		;;
+	esac
+	;;
+*-*-aix*)
+	dnl AIX is disabled since we don't handle the utmp/utmpx
+        dnl problems that aix causes when compiling with pthread support
+	native_pthread_support=no
+	;;
+mips-sgi-irix6.[[5-9]])  # maybe works for earlier versions too
+	native_pthread_support=yes
+	PTHREADS_LIBS="-lpthread"
+	;;
+*-*-darwin*)
+	native_pthread_support=yes
+	;;
+*)
+	native_pthread_support=no
+	;;
+esac
+
+if test "$enable_pthread_support" = maybe ; then
+	enable_pthread_support="$native_pthread_support"
+fi
+	
+if test "$enable_pthread_support" != no; then
+    AC_DEFINE(ENABLE_PTHREAD_SUPPORT, 1,
+	[Define if you want have a thread safe libraries])
+    dnl This sucks, but libtool doesn't save the depenecy on -pthread
+    dnl for libraries.
+    LIBS="$PTHREADS_LIBS $LIBS"
+else
+  PTHREADS_CFLAGS=""
+  PTHREADS_LIBS=""
+fi
+
+AC_SUBST(PTHREADS_CFLAGS)
+AC_SUBST(PTHREADS_LIBS)
+
+AC_MSG_RESULT($enable_pthread_support)
+])
diff --git a/crypto/heimdal/cf/resolv.m4 b/crypto/heimdal/cf/resolv.m4
new file mode 100644
index 0000000..8bb5e4e
--- /dev/null
+++ b/crypto/heimdal/cf/resolv.m4
@@ -0,0 +1,109 @@
+dnl stuff used by DNS resolv code in roken
+dnl
+dnl $Id: resolv.m4 16009 2005-09-02 10:17:38Z lha $
+dnl
+
+AC_DEFUN([rk_RESOLV],[
+
+AC_CHECK_HEADERS([arpa/nameser.h])
+
+AC_CHECK_HEADERS(resolv.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+])
+
+AC_FIND_FUNC(res_search, resolv,
+[
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+],
+[0,0,0,0,0])
+
+AC_FIND_FUNC(res_nsearch, resolv,
+[
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+],
+[0,0,0,0,0,0])
+
+AC_FIND_FUNC(res_ndestroy, resolv,
+[
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+],
+[0])
+
+AC_FIND_FUNC(dn_expand, resolv,
+[
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+],
+[0,0,0,0,0])
+
+rk_CHECK_VAR(_res, 
+[#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif])
+
+])
diff --git a/crypto/heimdal/cf/retsigtype.m4 b/crypto/heimdal/cf/retsigtype.m4
index 465c654..2857bff 100644
--- a/crypto/heimdal/cf/retsigtype.m4
+++ b/crypto/heimdal/cf/retsigtype.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: retsigtype.m4,v 1.1.12.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: retsigtype.m4 13338 2004-02-12 14:21:14Z lha $
 dnl
 dnl Figure out return type of signal handlers, and define SIGRETURN macro
 dnl that can be used to return from one
diff --git a/crypto/heimdal/cf/roken-frag.m4 b/crypto/heimdal/cf/roken-frag.m4
index 569777a..eccbdbd 100644
--- a/crypto/heimdal/cf/roken-frag.m4
+++ b/crypto/heimdal/cf/roken-frag.m4
@@ -1,4 +1,4 @@
-dnl $Id: roken-frag.m4,v 1.45.2.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: roken-frag.m4 20639 2007-05-10 17:22:58Z lha $
 dnl
 dnl some code to get roken working
 dnl
@@ -26,7 +26,7 @@ dnl C characteristics
 AC_REQUIRE([AC_C___ATTRIBUTE__])
 AC_REQUIRE([AC_C_INLINE])
 AC_REQUIRE([AC_C_CONST])
-AC_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs)
+rk_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs)
 
 AC_REQUIRE([rk_DB])
 
@@ -46,37 +46,32 @@ AC_REQUIRE([AC_HEADER_TIME])
 
 AC_CHECK_HEADERS([\
 	arpa/inet.h				\
-	arpa/nameser.h				\
 	config.h				\
 	crypt.h					\
 	dirent.h				\
 	errno.h					\
 	err.h					\
 	fcntl.h					\
+	fnmatch.h				\
 	grp.h					\
 	ifaddrs.h				\
-	net/if.h				\
-	netdb.h					\
 	netinet/in.h				\
 	netinet/in6.h				\
 	netinet/in_systm.h			\
 	netinet6/in6.h				\
-	netinet6/in6_var.h			\
 	paths.h					\
+	poll.h					\
 	pwd.h					\
-	resolv.h				\
 	rpcsvc/ypclnt.h				\
 	shadow.h				\
+	stdint.h				\
 	sys/bswap.h				\
 	sys/ioctl.h				\
 	sys/mman.h				\
 	sys/param.h				\
-	sys/proc.h				\
 	sys/resource.h				\
-	sys/socket.h				\
 	sys/sockio.h				\
 	sys/stat.h				\
-	sys/sysctl.h				\
 	sys/time.h				\
 	sys/tty.h				\
 	sys/types.h				\
@@ -89,95 +84,80 @@ AC_CHECK_HEADERS([\
 	userconf.h				\
 	usersec.h				\
 	util.h					\
-	vis.h					\
 ])
-	
-AC_REQUIRE([CHECK_NETINET_IP_AND_TCP])
-
-AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes)
-AM_CONDITIONAL(have_fnmatch_h, test "$ac_cv_header_fnmatch_h" = yes)
-AM_CONDITIONAL(have_ifaddrs_h, test "$ac_cv_header_ifaddrs_h" = yes)
-AM_CONDITIONAL(have_vis_h, test "$ac_cv_header_vis_h" = yes)
-
-dnl Check for functions and libraries
-
-AC_FIND_FUNC(socket, socket)
-AC_FIND_FUNC(gethostbyname, nsl)
-AC_FIND_FUNC(syslog, syslog)
-
-AC_KRB_IPV6
 
-AC_FIND_FUNC(gethostbyname2, inet6 ip6)
+AC_HAVE_TYPE([uintptr_t],[#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif])
 
-AC_FIND_FUNC(res_search, resolv,
-[
-#include <stdio.h>
+dnl Sunpro 5.2 has a vis.h which is something different.
+AC_CHECK_HEADERS(vis.h, , , [
+#include <vis.h>
+#ifndef VIS_SP
+#error invis
+#endif])
+	
+AC_CHECK_HEADERS(netdb.h, , , [AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
+])
 
-AC_FIND_FUNC(res_nsearch, resolv,
-[
-#include <stdio.h>
+AC_CHECK_HEADERS(sys/socket.h, , , [AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0,0])
+])
 
-AC_FIND_FUNC(dn_expand, resolv,
-[
-#include <stdio.h>
+AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-],
-[0,0,0,0,0])
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif])
 
-rk_CHECK_VAR(_res, 
-[#include <stdio.h>
+AC_CHECK_HEADERS(netinet6/in6_var.h, , , [AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
 #endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
 #endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif])
+])
+
+AC_CHECK_HEADERS(sys/sysctl.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
+
+AC_CHECK_HEADERS(sys/proc.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
+
+AC_REQUIRE([CHECK_NETINET_IP_AND_TCP])
 
+AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes)
+AM_CONDITIONAL(have_ifaddrs_h, test "$ac_cv_header_ifaddrs_h" = yes)
+AM_CONDITIONAL(have_vis_h, test "$ac_cv_header_vis_h" = yes)
+
+dnl Check for functions and libraries
+
+AC_FIND_FUNC(socket, socket)
+AC_FIND_FUNC(gethostbyname, nsl)
+AC_FIND_FUNC(syslog, syslog)
+
+AC_KRB_IPV6
+
+AC_FIND_FUNC(gethostbyname2, inet6 ip6)
+
+rk_RESOLV
 
 AC_BROKEN_SNPRINTF
 AC_BROKEN_VSNPRINTF
@@ -201,6 +181,7 @@ AC_CHECK_FUNCS([				\
 	initstate				\
 	issetugid				\
 	on_exit					\
+	poll					\
 	random					\
 	setprogname				\
 	setstate				\
@@ -221,6 +202,7 @@ AC_CHECK_FUNCS([				\
 if test "$ac_cv_func_cgetent" = no; then
 	AC_LIBOBJ(getcap)
 fi
+AM_CONDITIONAL(have_cgetent, test "$ac_cv_func_cgetent" = yes)
 
 AC_REQUIRE([AC_FUNC_GETLOGIN])
 
@@ -298,6 +280,7 @@ AC_FIND_IF_NOT_BROKEN(gai_strerror,,
 AC_BROKEN([					\
 	chown					\
 	copyhostent				\
+	closefrom				\
 	daemon					\
 	ecalloc					\
 	emalloc					\
@@ -353,6 +336,7 @@ AC_BROKEN([					\
 	strtok_r				\
 	strupr					\
 	swab					\
+	timegm					\
 	unsetenv				\
 	verr					\
 	verrx					\
@@ -364,6 +348,9 @@ AC_BROKEN([					\
 	writev					\
 ])
 
+AM_CONDITIONAL(have_fnmatch_h,
+	test "$ac_cv_header_fnmatch_h" = yes -a "$ac_cv_func_fnmatch" = yes)
+
 AC_FOREACH([rk_func], [strndup strsep strtok_r],
 	[AC_NEED_PROTO([#include <string.h>], rk_func)])
 
@@ -424,13 +411,6 @@ dnl
 AC_HAVE_STRUCT_FIELD(struct sockaddr, sa_len, [#include <sys/types.h>
 #include <sys/socket.h>])
 
-if test "$ac_cv_func_getnameinfo" = "yes"; then
-  rk_BROKEN_GETNAMEINFO
-  if test "$ac_cv_func_getnameinfo_broken" = yes; then
-	AC_LIBOBJ(getnameinfo)
-  fi
-fi
-
 if test "$ac_cv_func_getaddrinfo" = "yes"; then
   rk_BROKEN_GETADDRINFO
   if test "$ac_cv_func_getaddrinfo_numserv" = no; then
@@ -444,6 +424,27 @@ AC_NEED_PROTO([#include <stdlib.h>], unsetenv)
 AC_NEED_PROTO([#include <unistd.h>], gethostname)
 AC_NEED_PROTO([#include <unistd.h>], mkstemp)
 AC_NEED_PROTO([#include <unistd.h>], getusershell)
+AC_NEED_PROTO([#include <unistd.h>], daemon)
+AC_NEED_PROTO([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif],
+iruserok)
 
 AC_NEED_PROTO([
 #ifdef HAVE_SYS_TYPES_H
@@ -579,24 +580,11 @@ rk_CHECK_VAR([__progname],
 #include <err.h>
 #endif])
 
-AC_CHECK_DECLARATION([#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif], optarg)
-AC_CHECK_DECLARATION([#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif], optind)
-AC_CHECK_DECLARATION([#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif], opterr)
-AC_CHECK_DECLARATION([#include <stdlib.h>
+AC_CHECK_DECLS([optarg, optind, opterr, optopt, environ],[],[][
+#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif], optopt)
-
-AC_CHECK_DECLARATION([#include <stdlib.h>], environ)
+#endif])
 
 dnl
 dnl Check for fields in struct tm
@@ -612,11 +600,21 @@ dnl
 rk_CHECK_VAR(timezone,[#include <time.h>])
 rk_CHECK_VAR(altzone,[#include <time.h>])
 
-AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
-AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
-AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>])
-AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/socket.h>])
-AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
+AC_HAVE_TYPE([sa_family_t],[
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([socklen_t],[
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct sockaddr], [
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct sockaddr_storage], [
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct addrinfo], [
+#include <sys/types.h>
+#include <netdb.h>])
 AC_HAVE_TYPE([struct ifaddrs], [#include <ifaddrs.h>])
 AC_HAVE_TYPE([struct iovec],[
 #include <sys/types.h>
@@ -639,6 +637,12 @@ dnl
 
 AC_KRB_STRUCT_SPWD
 
+#
+# Check if we want samba's socket wrapper
+#
+
+samba_SOCKET_WRAPPER
+
 dnl won't work with automake
 dnl moved to AC_OUTPUT in configure.in
 dnl AC_CONFIG_FILES($1/Makefile)
diff --git a/crypto/heimdal/cf/roken.m4 b/crypto/heimdal/cf/roken.m4
index 04a8076..7d8a7e8 100644
--- a/crypto/heimdal/cf/roken.m4
+++ b/crypto/heimdal/cf/roken.m4
@@ -1,4 +1,4 @@
-dnl $Id: roken.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: roken.m4 14162 2004-08-26 11:27:32Z joda $
 dnl
 dnl try to look for an installed roken library with sufficient stuff
 dnl
@@ -10,7 +10,7 @@ dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppfla
 AC_DEFUN([AC_ROKEN], [
 
 AC_ARG_WITH(roken,
-	AC_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
+	AS_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
 [if test "$withval" = "no"; then
   AC_MSG_ERROR(roken is required)
 fi])
@@ -32,13 +32,13 @@ AC_MSG_CHECKING(for roken in $i)
 
 CPPFLAGS="-I$i/include ${CPPFLAGS}"
 
-AC_TRY_CPP(
-[#include <roken.h>
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
+#include <roken.h>
 #if ROKEN_VERSION < $1
 #error old roken version, should be $1
 fail
 #endif
-],[roken_installed=yes; break])
+]])],[roken_installed=yes; break])
 
 AC_MSG_RESULT($roken_installed)
 
diff --git a/crypto/heimdal/cf/socket-wrapper.m4 b/crypto/heimdal/cf/socket-wrapper.m4
new file mode 100644
index 0000000..a2b934b
--- /dev/null
+++ b/crypto/heimdal/cf/socket-wrapper.m4
@@ -0,0 +1,16 @@
+dnl $Id: socket-wrapper.m4 18077 2006-09-12 17:33:07Z lha $
+dnl
+AC_DEFUN([samba_SOCKET_WRAPPER], [
+
+AC_ARG_ENABLE(socket-wrapper,
+	AS_HELP_STRING([--enable-socket-wrapper],
+		[use sambas socket-wrapper for testing]))
+
+AM_CONDITIONAL(have_socket_wrapper, test "x$enable_socket_wrapper" = xyes)dnl
+
+if test "x$enable_socket_wrapper" = xyes ; then
+       AC_DEFINE(SOCKET_WRAPPER_REPLACE, 1,
+               [Define if you want to use samba socket wrappers.])
+fi
+
+])
diff --git a/crypto/heimdal/cf/sunos.m4 b/crypto/heimdal/cf/sunos.m4
index 6572d0b..18876f5 100644
--- a/crypto/heimdal/cf/sunos.m4
+++ b/crypto/heimdal/cf/sunos.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: sunos.m4,v 1.2 2002/10/16 14:42:13 joda Exp $
+dnl $Id: sunos.m4 14608 2005-03-01 22:17:44Z lha $
 dnl
 
 AC_DEFUN([rk_SUNOS],[
@@ -11,7 +11,7 @@ case "$host" in
 *-*-solaris2.7)
 	sunos=57
 	;;
-*-*-solaris2.[[89]])
+*-*-solaris2.[[89]] | *-*-solaris2.10)
 	sunos=58
 	;;
 *-*-solaris2*)
diff --git a/crypto/heimdal/cf/telnet.m4 b/crypto/heimdal/cf/telnet.m4
index add065c..b2bef86 100644
--- a/crypto/heimdal/cf/telnet.m4
+++ b/crypto/heimdal/cf/telnet.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: telnet.m4,v 1.1 2002/08/28 19:19:01 joda Exp $
+dnl $Id: telnet.m4 15435 2005-06-16 19:45:52Z lha $
 dnl
 dnl stuff used by telnet
 
@@ -31,11 +31,11 @@ case "$host" in
 	AC_CHECK_FUNC(getmsg)
 	if test "$ac_cv_func_getmsg" = "yes"; then
 		AC_CACHE_CHECK([if getmsg works], ac_cv_func_getmsg_works,
-		AC_TRY_RUN([
+		AC_RUN_IFELSE([AC_LANG_SOURCE([[
 			#include <stdio.h>
 			#include <errno.h>
 
-			int main()
+			int main(int argc, char **argv)
 			{
 			  int ret;
 			  ret = getmsg(open("/dev/null", 0), NULL, NULL, NULL);
@@ -43,9 +43,9 @@ case "$host" in
 			    return 1;
 			  return 0;
 			}
-			], ac_cv_func_getmsg_works=yes, 
-			ac_cv_func_getmsg_works=no,
-			ac_cv_func_getmsg_works=no))
+			]])], [ac_cv_func_getmsg_works=yes], 
+			[ac_cv_func_getmsg_works=no],
+			[ac_cv_func_getmsg_works=no]))
 		if test "$ac_cv_func_getmsg_works" = "yes"; then
 			AC_DEFINE(HAVE_GETMSG, 1,
 				[Define if you have a working getmsg.])
diff --git a/crypto/heimdal/cf/test-package.m4 b/crypto/heimdal/cf/test-package.m4
index dd38e1e..8ef9ef7 100644
--- a/crypto/heimdal/cf/test-package.m4
+++ b/crypto/heimdal/cf/test-package.m4
@@ -1,27 +1,27 @@
-dnl $Id: test-package.m4,v 1.12.4.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: test-package.m4 14166 2004-08-26 12:35:42Z joda $
 dnl
 dnl rk_TEST_PACKAGE(package,headers,libraries,extra libs,
 dnl			default locations, conditional, config-program)
 
 AC_DEFUN([rk_TEST_PACKAGE],[
 AC_ARG_WITH($1,
-	AC_HELP_STRING([--with-$1=dir],[use $1 in dir]))
+	AS_HELP_STRING([--with-$1=dir],[use $1 in dir]))
 AC_ARG_WITH($1-lib,
-	AC_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
+	AS_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-lib])
 elif test "X$with_$1" = "X"; then
   with_$1=yes
 fi])
 AC_ARG_WITH($1-include,
-	AC_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
+	AS_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-include])
 elif test "X$with_$1" = "X"; then
   with_$1=yes
 fi])
 AC_ARG_WITH($1-config,
-	AC_HELP_STRING([--with-$1-config=path],[config program for $1]))
+	AS_HELP_STRING([--with-$1-config=path],[config program for $1]))
 
 m4_ifval([$6],
 	m4_define([rk_pkgname], $6),
@@ -68,6 +68,14 @@ $1_cflags=
 $1_libs=
 
 case "$with_$1_config" in
+yes|no|""|"$7")
+	if test -f $with_$1/bin/$7 ; then
+		with_$1_config=$with_$1/bin/$7
+	fi
+	;;
+esac
+
+case "$with_$1_config" in
 yes|no|"")
 	;;
 *)
@@ -83,7 +91,7 @@ if test "$with_$1" != no; then
 	if test "$[]$1_cflags" -a "$[]$1_libs"; then
 		CFLAGS="$[]$1_cflags $save_CFLAGS"
 		LIBS="$[]$1_libs $save_LIBS"
-		AC_TRY_LINK([$2],,[
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[
 			INCLUDE_$1="$[]$1_cflags"
 			LIB_$1="$[]$1_libs"
 			AC_MSG_RESULT([from $with_$1_config])
@@ -93,11 +101,11 @@ if test "$with_$1" != no; then
 		ires= lres=
 		for i in $header_dirs; do
 			CFLAGS="-I$i $save_CFLAGS"
-			AC_TRY_COMPILE([$2],,ires=$i;break)
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$i;break])
 		done
 		for i in $lib_dirs; do
 			LIBS="-L$i $3 $4 $save_LIBS"
-			AC_TRY_LINK([$2],,lres=$i;break)
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[lres=$i;break])
 		done
 		if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
 			INCLUDE_$1="-I$ires"
diff --git a/crypto/heimdal/cf/valgrind-suppressions b/crypto/heimdal/cf/valgrind-suppressions
new file mode 100644
index 0000000..1e32042
--- /dev/null
+++ b/crypto/heimdal/cf/valgrind-suppressions
@@ -0,0 +1,84 @@
+# $Id: valgrind-suppressions 21182 2007-06-20 02:57:13Z lha $
+{
+   linux db init brokenness
+   Memcheck:Param
+   pwrite64(buf)
+   fun:do_pwrite64
+   fun:__os_io
+   fun:__memp_pgwrite
+   fun:__memp_fsync
+   fun:__bam_read_root
+   fun:__bam_open
+   fun:__db_dbopen
+   fun:__db_open
+   fun:DB_open
+}
+{
+   linux strerror
+   Memcheck:Leak
+   fun:_vgrZU_libcZdsoZa_malloc
+   fun:rwlock_add_to_list
+   fun:rwlock_have_already
+   fun:pthread_rwlock_rdlock
+   fun:__dcigettext
+   fun:dcgettext
+   fun:strerror_r
+   fun:strerror
+}
+{
+   linux db close brokenness
+   Memcheck:Param
+   pwrite64(buf)
+   fun:do_pwrite64
+   fun:__os_io
+   fun:__memp_pgwrite
+   fun:__memp_fsync
+   fun:__db_sync
+   fun:__db_close
+   fun:DB_close
+}
+{
+   GLIBC 2.1.2 getservbyname defect
+   Memcheck:Leak
+   fun:_vgrZU_libcZdsoZa_malloc
+   fun:strdup
+   obj:*
+   obj:*
+   fun:getservbyname_r@@GLIBC_2.1.2
+   fun:getservbyname
+}
+{
+   glibc getaddrinfo defect
+   Memcheck:Leak
+   fun:_vgrZU_libcZdsoZa_malloc
+   fun:__libc_res_nsend
+   fun:__libc_res_nquery
+   fun:__libc_res_nquerydomain
+   fun:__libc_res_nsearch
+   obj:*
+   fun:gaih_inet
+   fun:getaddrinfo
+}
+{
+   glibc dlopen failure called from /bin/ls
+   Memcheck:Addr4
+   obj:/lib/ld-2.3.6.so
+   obj:/lib/ld-2.3.6.so
+   obj:/lib/ld-2.3.6.so
+}
+{
+   Unknown suppression in runtime link editor
+   Memcheck:Cond
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+}
+{
+   Unknown suppression in runtime link editor
+   Memcheck:Addr4
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+   obj:/lib/ld-2.5.so
+}
diff --git a/crypto/heimdal/cf/vararray.m4 b/crypto/heimdal/cf/vararray.m4
new file mode 100644
index 0000000..86f58d9
--- /dev/null
+++ b/crypto/heimdal/cf/vararray.m4
@@ -0,0 +1,16 @@
+dnl
+dnl $Id: vararray.m4 14166 2004-08-26 12:35:42Z joda $
+dnl
+dnl Test for variable size arrays.
+dnl
+
+AC_DEFUN([rk_C_VARARRAY], [
+	AC_CACHE_CHECK([if the compiler supports variable-length arrays],[rk_cv_c_vararray],[
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int x = 0; { int y[x]; }]])],
+		[rk_cv_c_vararray=yes],
+		[rk_cv_c_vararray=no])])
+	if test "$rk_cv_c_vararray" = yes; then
+		AC_DEFINE([HAVE_VARIABLE_LENGTH_ARRAY], [1],
+			[Define if your compiler supports variable-length arrays.])
+	fi
+])
diff --git a/crypto/heimdal/cf/version-script.m4 b/crypto/heimdal/cf/version-script.m4
new file mode 100644
index 0000000..342e5ac
--- /dev/null
+++ b/crypto/heimdal/cf/version-script.m4
@@ -0,0 +1,40 @@
+dnl check if ld supports --version-script
+dnl
+AC_DEFUN([rk_VERSIONSCRIPT],[
+AC_CACHE_CHECK(for ld --version-script, rk_cv_version_script,[
+  rk_cv_version_script=no
+
+  cat > conftest.map <<EOF
+HEIM_GSS_V1 {
+        global: gss*;
+};
+HEIM_GSS_V1_1 {
+        global: gss_init_creds;
+} HEIM_GSS_V1;
+EOF
+cat > conftest.c <<EOF
+int gss_init_creds(int foo) { return 0; }
+EOF
+
+  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
+                               -o conftest.so conftest.c
+                               -Wl,--version-script,conftest.map]);
+  then
+    rk_cv_version_script=yes
+  fi
+rm -f conftest*
+])
+
+if test $rk_cv_version_script = yes ; then
+  doversioning=yes
+  LDFLAGS_VERSION_SCRIPT="-Wl,--version-script,"
+else
+  doversioning=no
+  LDFLAGS_VERSION_SCRIPT=
+fi
+AC_SUBST(VERSIONING)
+
+AM_CONDITIONAL(versionscript,test $doversioning = yes)
+AC_SUBST(LDFLAGS_VERSION_SCRIPT)
+
+])
\ No newline at end of file
diff --git a/crypto/heimdal/cf/wflags.m4 b/crypto/heimdal/cf/wflags.m4
index 4051f29..d099151 100644
--- a/crypto/heimdal/cf/wflags.m4
+++ b/crypto/heimdal/cf/wflags.m4
@@ -1,8 +1,15 @@
-dnl $Id: wflags.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
+dnl $Id: wflags.m4 21183 2007-06-20 03:07:07Z lha $
 dnl
 dnl set WFLAGS
 
-AC_DEFUN([AC_WFLAGS],[
+AC_DEFUN([rk_WFLAGS],[
+
+AC_ARG_ENABLE(developer, 
+	AS_HELP_STRING([--enable-developer], [enable developer warnings]))
+if test "X$enable_developer" = Xyes; then
+    dwflags="-Werror"
+fi
+
 WFLAGS_NOUNUSED=""
 WFLAGS_NOIMPLICITINT=""
 if test -z "$WFLAGS" -a "$GCC" = "yes"; then
@@ -11,7 +18,7 @@ if test -z "$WFLAGS" -a "$GCC" = "yes"; then
   #   -Wcast-align doesn't work well on alpha osf/1
   #   -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast
   #   -Wmissing-declarations -Wnested-externs
-  WFLAGS="ifelse($#, 0,-Wall, $1)"
+  WFLAGS="ifelse($#, 0,-Wall, $1) $dwflags"
   WFLAGS_NOUNUSED="-Wno-unused"
   WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
 fi
diff --git a/crypto/heimdal/cf/win32.m4 b/crypto/heimdal/cf/win32.m4
new file mode 100644
index 0000000..0687ff7
--- /dev/null
+++ b/crypto/heimdal/cf/win32.m4
@@ -0,0 +1,12 @@
+dnl $Id: win32.m4 13709 2004-04-13 14:29:47Z lha $
+dnl rk_WIN32_EXPORT buildsymbol symbol-that-export
+AC_DEFUN([rk_WIN32_EXPORT],[AH_TOP([#ifdef $1
+#ifndef $2
+#ifdef _WIN32_
+#define $2 _export _stdcall
+#else
+#define $2
+#endif
+#endif
+#endif
+])])
diff --git a/crypto/heimdal/cf/with-all.m4 b/crypto/heimdal/cf/with-all.m4
index 1b9d39f..d518b45 100644
--- a/crypto/heimdal/cf/with-all.m4
+++ b/crypto/heimdal/cf/with-all.m4
@@ -1,16 +1,16 @@
 dnl
-dnl $Id: with-all.m4,v 1.1 2001/08/29 17:01:23 assar Exp $
+dnl $Id: with-all.m4 14147 2004-08-25 14:14:01Z joda $
 dnl
 
 dnl AC_WITH_ALL(name)
 
 AC_DEFUN([AC_WITH_ALL], [
 AC_ARG_WITH($1,
-	AC_HELP_STRING([--with-$1=dir],
+	AS_HELP_STRING([--with-$1=dir],
 		[use $1 in dir]))
 
 AC_ARG_WITH($1-lib,
-	AC_HELP_STRING([--with-$1-lib=dir],
+	AS_HELP_STRING([--with-$1-lib=dir],
 		[use $1 libraries in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-lib])
@@ -19,7 +19,7 @@ elif test "X$with_$1" = "X"; then
 fi])
 
 AC_ARG_WITH($1-include,
-	AC_HELP_STRING([--with-$1-include=dir],
+	AS_HELP_STRING([--with-$1-include=dir],
 		[use $1 headers in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-include])