Merge tag 'upstream/1.7_git20150920+dfsg' into experimental

Upstream version 1.7~git20150920+dfsg

5 files changed, 41 insertions, 13 deletions

diff --git a/cf/check-compile-et.m4 b/cf/check-compile-et.m4
index 56a9f7418..e580cbb49 100644
--- a/cf/check-compile-et.m4
+++ b/cf/check-compile-et.m4
@@ -28,7 +28,8 @@ 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_RUN_IFELSE([
+  AC_LANG(C)
+  AC_RUN_IFELSE([AC_LANG_SOURCE([
 #include <com_err.h>
 #include <string.h>
 #include "conftest_et.h"
@@ -37,7 +38,7 @@ int main(int argc, char **argv){
 #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})
diff --git a/cf/check-x.m4 b/cf/check-x.m4
index 5d8806c4b..e8f68e823 100644
--- a/cf/check-x.m4
+++ b/cf/check-x.m4
@@ -32,7 +32,8 @@ if test "$no_x" != yes; then
 			done
 		fi
 		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-		AC_RUN_IFELSE([
+		AC_LANG(C)
+		AC_RUN_IFELSE([AC_LANG_SOURCE([
 		#include <X11/Xlib.h>
 		foo(void)
 		{
@@ -42,7 +43,7 @@ if test "$no_x" != yes; then
 		{
 		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"
diff --git a/cf/crypto.m4 b/cf/crypto.m4
index fddbd3431..f42905d0d 100644
--- a/cf/crypto.m4
+++ b/cf/crypto.m4
@@ -11,12 +11,16 @@ m4_define([test_headers], [
 		#include <sys/types.h>
 		#endif
 		#include <openssl/evp.h>
+		#include <openssl/bn.h>
 		#include <openssl/md4.h>
 		#include <openssl/md5.h>
 		#include <openssl/sha.h>
 		#include <openssl/des.h>
 		#include <openssl/rc4.h>
 		#include <openssl/aes.h>
+		#include <openssl/rsa.h>
+		#include <openssl/dsa.h>
+		#include <openssl/dh.h>
 		#include <openssl/ec.h>
 		#include <openssl/engine.h>
 		#include <openssl/ui.h>
@@ -59,6 +63,20 @@ m4_define([test_body], [
 		DES_cbc_encrypt(0, 0, 0, schedule, 0, 0);
 		RC4(0, 0, 0, 0);])
 
+m4_define([bn_headers], [
+		#include <stdlib.h>
+		#include <openssl/bn.h>
+		])
+m4_define([bn_body], [
+		BIGNUM *bn = BN_new();
+		BN_set_word(bn, 1);
+		if (BN_is_negative(bn))
+			exit(EXIT_FAILURE);
+		BN_set_negative(bn, 1);
+		if (!BN_is_negative(bn))
+			exit(EXIT_FAILURE);
+		exit(EXIT_SUCCESS);
+		])
 
 AC_DEFUN([KRB_CRYPTO],[
 crypto_lib=unknown
@@ -92,11 +110,15 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [
 			crypto_lib=libcrypto openssl=yes
 			AC_MSG_RESULT([libcrypto])
+			AC_RUN_IFELSE([AC_LANG_PROGRAM([bn_headers],[bn_body])], [
+			  AC_DEFINE([HAVE_BN_IS_NEGATIVE], 1, [define if OpenSSL provides BN_is_negative])
+			])
 		])
 		if test "$crypto_lib" = libcrypto ; then
 			break;
 		fi
 	done
+	AC_CHECK_LIB(crypto, RAND_egd, AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd]))
 	CFLAGS="$save_CFLAGS"
 	LIBS="$save_LIBS"
 fi
diff --git a/cf/pthreads.m4 b/cf/pthreads.m4
index d5e5eedd2..ff2ca5330 100644
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -12,12 +12,12 @@ case "$host" in
 *-*-solaris2*)
 	native_pthread_support=yes
 	if test "$GCC" = yes; then
-		PTHREAD_CFLAGS=-pthreads
-		PTHREAD_LIBADD=-pthreads
+		PTHREAD_CFLAGS="-D_REENTRANT -D_TS_ERRNO"
+		PTHREAD_LIBADD=-lpthread
 	else
-		PTHREAD_CFLAGS=-mt
+		PTHREAD_CFLAGS="-mt -D_REENTRANT -D_TS_ERRNO"
 		PTHREAD_LDADD=-mt
-		PTHREAD_LIBADD=-mt
+		PTHREAD_LIBADD="-mt -lpthread"
 	fi
 	;;
 *-*-netbsd[[12]]*)
@@ -90,6 +90,10 @@ else
   PTHREAD_LIBADD=""
 fi
 
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+LDADD="$LDADD $PTHREAD_LDADD"
+LIBADD="$LIBADD $PTHREAD_LIBADD"
+
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LDADD)
 AC_SUBST(PTHREAD_LIBADD)
diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4
index 5c82d27ee..452c4fd07 100644
--- a/cf/roken-frag.m4
+++ b/cf/roken-frag.m4
@@ -17,7 +17,7 @@ AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_PROG_AWK])
 AC_REQUIRE([AC_OBJEXT])
 AC_REQUIRE([AC_EXEEXT])
-AC_REQUIRE([AC_PROG_LIBTOOL])
+AC_REQUIRE([LT_INIT])
 
 AC_REQUIRE([AC_MIPS_ABI])
 
@@ -71,7 +71,9 @@ AC_CHECK_HEADERS([\
 	search.h				\
 	shadow.h				\
 	stdint.h				\
+	sys/auxv.h				\
 	sys/bswap.h				\
+	sys/errno.h				\
 	sys/ioctl.h				\
 	sys/mman.h				\
 	sys/param.h				\
@@ -183,6 +185,7 @@ AC_CHECK_FUNCS([				\
 	asprintf				\
 	atexit					\
 	cgetent					\
+	getauxval				\
 	getconfattr				\
 	getprogname				\
 	getrlimit				\
@@ -306,14 +309,10 @@ AC_FIND_IF_NOT_BROKEN(gai_strerror,,
 #include <ws2tcpip.h>
 #endif],[0])
 
-dnl Darwin is weird, and in some senses not unix, launchd doesn't want
-dnl servers to use daemon(), so its deprecated.
 case "$host_os" in
 	darwin*)
 		;;
 	*)
-		AC_DEFINE([SUPPORT_DETACH], 1,
-		    [Define if os support want to detach is daemonens.])
 		AC_BROKEN([daemon]) ;;
 esac
 
@@ -350,6 +349,7 @@ AC_BROKEN([					\
 	localtime_r				\
 	lstat					\
 	memmove					\
+	memset_s				\
 	mkstemp					\
 	putenv					\
 	rcmd					\