diff options
Diffstat (limited to 'security/openssh/patches/patch-ab')
| -rw-r--r-- | security/openssh/patches/patch-ab | 58 |
1 files changed, 5 insertions, 53 deletions
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab index af0c28a8918..cb659caa00f 100644 --- a/security/openssh/patches/patch-ab +++ b/security/openssh/patches/patch-ab @@ -1,43 +1,8 @@ -$NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $ +$NetBSD: patch-ab,v 1.14 2003/01/19 01:26:40 seb Exp $ ---- configure.ac.orig Tue Jun 25 15:35:16 2002 +--- configure.ac.orig Thu Sep 26 00:38:47 2002 +++ configure.ac -@@ -93,7 +93,16 @@ case "$host" in - AC_DEFINE(IP_TOS_IS_BROKEN) - ;; - *-*-darwin*) -- AC_DEFINE(BROKEN_GETADDRINFO) -+ AC_MSG_CHECKING(if we have working getaddrinfo) -+ AC_TRY_RUN([#include <mach-o/dyld.h> -+main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) -+ exit(0); -+ else -+ exit(1); -+}], [AC_MSG_RESULT(working)], -+ [AC_MSG_RESULT(buggy) -+ AC_DEFINE(BROKEN_GETADDRINFO)], -+ [AC_MSG_RESULT(assume it is working)]) - ;; - *-*-hpux10.26) - if test -z "$GCC"; then -@@ -167,6 +176,7 @@ mips-sony-bsd|mips-sony-newsos4) - SONY=1 - ;; - *-*-netbsd*) -+ check_for_libcrypt_before=1 - need_dash_r=1 - ;; - *-*-freebsd*) -@@ -185,8 +195,6 @@ mips-sony-bsd|mips-sony-newsos4) - CFLAGS="$CFLAGS" - ;; - *-*-solaris*) -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" - need_dash_r=1 - AC_DEFINE(PAM_SUN_CODEBASE) - AC_DEFINE(LOGIN_NEEDS_UTMPX) -@@ -312,6 +320,9 @@ mips-sony-bsd|mips-sony-newsos4) +@@ -341,6 +341,9 @@ mips-sony-bsd|mips-sony-newsos4) ;; esac @@ -47,7 +12,7 @@ $NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $ # Allow user to specify flags AC_ARG_WITH(cflags, [ --with-cflags Specify additional flags to pass to compiler], -@@ -545,6 +556,10 @@ AC_ARG_WITH(tcp-wrappers, +@@ -575,6 +578,10 @@ AC_ARG_WITH(tcp-wrappers, AC_MSG_CHECKING(for libwrap) AC_TRY_LINK( [ @@ -58,20 +23,7 @@ $NetBSD: patch-ab,v 1.13 2002/09/09 20:16:26 jlam Exp $ #include <tcpd.h> int deny_severity = 0, allow_severity = 0; ], -@@ -723,6 +738,12 @@ if test "x$PAM_MSG" = "xyes" ; then - ) - fi - -+# Some systems want crypt() from libcrypt, *not* the version in OpenSSL, -+# because the system crypt() is more featureful. -+if test "x$check_for_libcrypt_before" = "x1"; then -+ AC_CHECK_LIB(crypt, crypt) -+fi -+ - # Search for OpenSSL - saved_CPPFLAGS="$CPPFLAGS" - saved_LDFLAGS="$LDFLAGS" -@@ -2385,7 +2406,7 @@ echo "OpenSSH has been configured with t +@@ -2449,7 +2456,7 @@ echo "OpenSSH has been configured with t echo " User binaries: $B" echo " System binaries: $C" echo " Configuration files: $D" |