diff options
| author | Chris Larson <clarson@kergoth.com> | 2003-09-17 22:02:17 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-09-17 22:02:17 +0000 |
| commit | cd174f2ffd7c85a15918c19d62faa25741db3ad8 (patch) | |
| tree | 809525e81b0f617d2b3a3fc25589db6e55751b19 | |
| parent | a8145b51b14e479fdf46f24eff27841763b5e718 (diff) | |
Update to OpenSSH 3.7.1p1 for security reasons.
BKrev: 3f68d9e9ZVoihw_JZxkr47sE4B3_Cg
| -rw-r--r-- | content/openssh-3.7.1p1.oe (renamed from content/openssh-3.7p1/scp-nossl.patch) | 0 | ||||
| -rw-r--r-- | content/openssh-3.7.1p1/cross.patch (renamed from content/openssh-3.7p1/sshd_config) | 0 | ||||
| -rw-r--r-- | content/openssh-3.7.1p1/scp-nossl.patch | 0 | ||||
| -rw-r--r-- | content/openssh-3.7.1p1/sshd_config | 0 | ||||
| -rw-r--r-- | content/openssh-3.7p1.oe | 30 | ||||
| -rw-r--r-- | content/openssh-3.7p1/cross.patch | 22642 |
6 files changed, 0 insertions, 22672 deletions
diff --git a/content/openssh-3.7p1/scp-nossl.patch b/content/openssh-3.7.1p1.oe index e69de29bb2..e69de29bb2 100644 --- a/content/openssh-3.7p1/scp-nossl.patch +++ b/content/openssh-3.7.1p1.oe diff --git a/content/openssh-3.7p1/sshd_config b/content/openssh-3.7.1p1/cross.patch index e69de29bb2..e69de29bb2 100644 --- a/content/openssh-3.7p1/sshd_config +++ b/content/openssh-3.7.1p1/cross.patch diff --git a/content/openssh-3.7.1p1/scp-nossl.patch b/content/openssh-3.7.1p1/scp-nossl.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/content/openssh-3.7.1p1/scp-nossl.patch diff --git a/content/openssh-3.7.1p1/sshd_config b/content/openssh-3.7.1p1/sshd_config new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/content/openssh-3.7.1p1/sshd_config diff --git a/content/openssh-3.7p1.oe b/content/openssh-3.7p1.oe deleted file mode 100644 index 93d670cb98..0000000000 --- a/content/openssh-3.7p1.oe +++ /dev/null @@ -1,30 +0,0 @@ -DEPENDS = virtual/libc zlib openssl -SECTION = net -DESCRIPTION = Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\ - Ssh (Secure Shell) is a program for logging into a remote machine\ - and for executing commands on a remote machine.\ - It provides secure encrypted communications between two untrusted\ - hosts over an insecure network. X11 connections and arbitrary TCP/IP\ - ports can also be forwarded over the secure channel.\ - It is intended as a replacement for rlogin, rsh and rcp, and can be\ - used to provide applications with a secure communication channel. - -SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ - file://${FILESDIR}/cross.patch;patch=1 \ - file://${FILESDIR}/scp-nossl.patch;patch=1 -S = ${WORKDIR}/${P} - -inherit autotools - -export sysconfdir = /etc/ssh -export ASKPASS_PROGRAM = /usr/bin/ssh-askpass -export LD = ${CC} -CFLAGS_prepend = "-I${S} " -CFLAGS_append = " -D__FILE_OFFSET_BITS=64" -LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " -EXTRA_OECONF = --disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ - --with-rand-helper=no --without-pam - -do_compile_append () { - install -m 0644 ${FILESDIR}/sshd_config ${S}/ -} diff --git a/content/openssh-3.7p1/cross.patch b/content/openssh-3.7p1/cross.patch deleted file mode 100644 index 534d8072f8..0000000000 --- a/content/openssh-3.7p1/cross.patch +++ /dev/null @@ -1,22642 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- openssh-3.7p1/configure.ac~cross -+++ openssh-3.7p1/configure.ac -@@ -450,7 +450,8 @@ - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***]) -- ] -+ ], -+ [ AC_MSG_RESULT(yes) ] - ) - - # Checks for header files. -@@ -609,19 +610,21 @@ - ] - ) - --AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) --AC_TRY_RUN( -- [ --#include <sys/types.h> --#include <dirent.h> --int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} -- ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) -- ] --) -+AC_CACHE_CHECK([whether struct dirent allocates space for d_name], ac_cv_have_space_d_name_in_struct_dirent, [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <dirent.h> -+ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} -+ ], -+ [ac_cv_have_space_d_name_in_struct_dirent="yes"], -+ [ac_cv_have_space_d_name_in_struct_dirent="no"] -+ ) -+]) -+ -+if test "x$ac_cv_dirent_have_space_d_name" = "xyes" ; then -+ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) -+fi - - # Check whether user wants S/Key support - SKEY_MSG="no" -@@ -760,19 +763,21 @@ - - # Check for broken snprintf - if test "x$ac_cv_func_snprintf" = "xyes" ; then -- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) -+AC_CACHE_CHECK([whether snprintf correctly terminates long strings], -+ ac_cv_have_broken_snprintf, [ - AC_TRY_RUN( - [ - #include <stdio.h> - int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} - ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_SNPRINTF) -- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -- ] -+ [ ac_cv_have_broken_snprintf="no" ], -+ [ ac_cv_have_broken_snprintf="yes" ] - ) -+]) -+if test "x$ac_cv_have_broken_snprintf" = "xyes" ; then -+ AC_DEFINE(BROKEN_SNPRINTF) -+ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) -+fi - fi - - dnl see whether mkstemp() requires XXXXXX -@@ -803,7 +808,8 @@ - - dnl make sure that openpty does not reacquire controlling terminal - if test ! -z "$check_for_openpty_ctty_bug"; then -- AC_MSG_CHECKING(if openpty correctly handles controlling tty) -+AC_CACHE_CHECK([if openpty acquires controlling terminal], -+ ac_cv_have_openpty_ctty_bug, [ - AC_TRY_RUN( - [ - #include <stdio.h> -@@ -838,14 +844,13 @@ - } - } - ], -- [ -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(SSHD_ACQUIRES_CTTY) -- ] -+ [ ac_cv_have_openpty_ctty_bug="no" ], -+ [ ac_cv_have_openpty_ctty_bug="yes" ] - ) -+]) -+if test "x$ac_cv_have_openpty_ctty_bug" = "xyes" ; then -+ AC_DEFINE(SSHD_ACQUIRES_CTTY) -+fi - fi - - AC_FUNC_GETPGRP -@@ -979,6 +984,10 @@ - [ - AC_MSG_RESULT(not found) - AC_MSG_ERROR(OpenSSL version header not found.) -+ ], -+ [ -+ AC_MSG_RESULT(unknown) -+ AC_MSG_WARN(Skipping OpenSSL header version check due to crosscompilation.) - ] - ) - -@@ -1012,6 +1021,10 @@ - [ - AC_MSG_RESULT(not found) - AC_MSG_ERROR(OpenSSL library not found.) -+ ], -+ [ -+ AC_MSG_RESULT(unknown) -+ AC_MSG_WARN(Skipping OpenSSL library version check due to crosscompilation.) - ] - ) - -@@ -1031,6 +1044,10 @@ - AC_MSG_ERROR([Your OpenSSL headers do not match your library. - Check config.log for details. - Also see contrib/findssl.sh for help identifying header/library mismatches.]) -+ ], -+ [ -+ AC_MSG_RESULT(unknown) -+ AC_MSG_WARN(Skipping OpenSSL version comparison due to crosscompilation.) - ] - ) - -@@ -1040,30 +1057,8 @@ - AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt") - fi - -- - ### Configure cryptographic random number support - --# Check wheter OpenSSL seeds itself --AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded]) --AC_TRY_RUN( -- [ --#include <string.h> --#include <openssl/rand.h> --int main(void) { exit(RAND_status() == 1 ? 0 : 1); } -- ], -- [ -- OPENSSL_SEEDS_ITSELF=yes -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- # Default to use of the rand helper if OpenSSL doesn't -- # seed itself -- USE_RAND_HELPER=yes -- ] --) -- -- - # Do we want to force the use of the rand helper? - AC_ARG_WITH(rand-helper, - [ --with-rand-helper Use subprocess to gather strong randomness ], -@@ -1080,6 +1075,27 @@ - USE_RAND_HELPER=yes - fi - ], -+ # Check whether OpenSSL seeds itself -+ [ -+ AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded]) -+ AC_TRY_RUN( -+ [ -+ #include <string.h> -+ #include <openssl/rand.h> -+ int main(void) { exit(RAND_status() == 1 ? 0 : 1); } -+ ], -+ [ -+ OPENSSL_SEEDS_ITSELF=yes -+ AC_MSG_RESULT(yes) -+ ], -+ [ -+ AC_MSG_RESULT(no) -+ # Default to use of the rand helper if OpenSSL doesn't -+ # seed itself -+ USE_RAND_HELPER=yes -+ ] -+ ) -+ ] - ) - - # Which randomness source do we use? -@@ -1626,32 +1642,43 @@ - exit 1; - else - dnl test snprintf (broken on SCO w/gcc) -- AC_TRY_RUN( -- [ --#include <stdio.h> --#include <string.h> --#ifdef HAVE_SNPRINTF --main() --{ -- char buf[50]; -- char expected_out[50]; -- int mazsize = 50 ; --#if (SIZEOF_LONG_INT == 8) -- long int num = 0x7fffffffffffffff; --#else -- long long num = 0x7fffffffffffffffll; --#endif -- strcpy(expected_out, "9223372036854775807"); -- snprintf(buf, mazsize, "%lld", num); -- if(strcmp(buf, expected_out) != 0) -- exit(1); -- exit(0); --} --#else --main() { exit(0); } --#endif -- ], [ true ], [ AC_DEFINE(BROKEN_SNPRINTF) ] -- ) -+ if test "x$ac_cv_have_broken_snprintf" != "xyes" ; then -+# no need to test again if we already know its broken :) -+ AC_CACHE_CHECK([whether snprintf is broken], -+ ac_cv_have_broken_snprintf, [ -+ AC_TRY_RUN( -+ [ -+ #include <stdio.h> -+ #include <string.h> -+ #ifdef HAVE_SNPRINTF -+ main() -+ { -+ char buf[50]; -+ char expected_out[50]; -+ int mazsize = 50 ; -+ #if (SIZEOF_LONG_INT == 8) -+ long int num = 0x7fffffffffffffff; -+ #else -+ long long num = 0x7fffffffffffffffll; -+ #endif -+ strcpy(expected_out, "9223372036854775807"); -+ snprintf(buf, mazsize, "%lld", num); -+ if(strcmp(buf, expected_out) != 0) -+ exit(1); -+ exit(0); -+ } -+ #else -+ main() { exit(0); } -+ #endif -+ ], [ true ], [ -+ ac_cv_have_broken_snprintf="yes" -+ ] -+ ) -+ ]) -+ if test "x$ac_cv_have_broken_snprintf" = "xyes" ; then -+ AC_DEFINE(BROKEN_SNPRINTF) -+ fi -+ fi - fi - - dnl Checks for structure members -@@ -2083,13 +2110,14 @@ - ) - fi - fi -+if test "$cross_compiling" != yes; then - AC_CHECK_FILE("/dev/ptc", - [ - AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC) - have_dev_ptc=1 - ] - ) -- -+fi - # Options from here on. Some of these are preset by platform above - AC_ARG_WITH(mantype, - [ --with-mantype=man|cat|doc Set man page type], -@@ -2183,7 +2211,9 @@ - fi - - # check for /etc/default/login and use it if present. -+if test "x$cross_compiling" != "xyes"; then - AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) -+fi - - if test "x$external_path_file" = "x/etc/default/login"; then - AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) ---- openssh-3.7p1/configure~cross -+++ openssh-3.7p1/configure -@@ -1,12 +1,81 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by Autoconf 2.52. -+# Generated by GNU Autoconf 2.57. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be Bourne compatible -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -+ set -o posix -+fi -+ -+# Support unset when possible. -+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)$' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -+ /^X\/\(\/\/\)$/{ s//\1/; q; } -+ /^X\/\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ - -+# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -14,22 +83,113 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi - --# Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -- emulate sh -- NULLCMD=: --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix --fi -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" || { -+ # Find who we are. Look in the path if we contain no path at all -+ # relative or not. -+ case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done - --# Name of the executable. --as_me=`echo "$0" |sed 's,.*[\\/],,'` -+ ;; -+ esac -+ # We did not find ourselves, most probably we were run as `sh COMMAND' -+ # in which case we are not to be found in the path. -+ if test "x$as_myself" = x; then -+ as_myself=$0 -+ fi -+ if test ! -f "$as_myself"; then -+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -+ { (exit 1); exit 1; }; } -+ fi -+ case $CONFIG_SHELL in -+ '') -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for as_base in sh bash ksh sh5; do -+ case $as_dir in -+ /*) -+ if ("$as_dir/$as_base" -c ' -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -+ CONFIG_SHELL=$as_dir/$as_base -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$0" ${1+"$@"} -+ fi;; -+ esac -+ done -+done -+;; -+ esac -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line before each line; the second 'sed' does the real -+ # work. The second script uses 'N' to pair each line-number line -+ # with the numbered line, and appends trailing '-' during -+ # substitution so that $LINENO is not a special case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -+ sed '=' <$as_myself | -+ sed ' -+ N -+ s,$,-, -+ : loop -+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ t loop -+ s,-$,, -+ s,^['$as_cr_digits']*\n,, -+ ' >$as_me.lineno && -+ chmod +x $as_me.lineno || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensible to this). -+ . ./$as_me.lineno -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -+ *c*,-n*) ECHO_N= ECHO_C=' -+' ECHO_T=' ' ;; -+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+esac - - if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -@@ -55,24 +215,20 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - --as_executable_p="test -f" -- --# Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -- as_unset=unset -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: - else -- as_unset=false -+ as_mkdir_p=false - fi - --# NLS nuisances. --$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } --$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } --$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } --$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } --$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } --$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } --$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } --$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } -+as_executable_p="test -f" -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+ - - # IFS - # We need space, tab and new line, in precisely that order. -@@ -81,7 +237,8 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } -+$as_unset CDPATH -+ - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -@@ -94,9 +251,11 @@ - # Initializations. - # - ac_default_prefix=/usr/local -+ac_config_libobj_dir=. - cross_compiling=no - subdirs= --MFLAGS= MAKEFLAGS= -+MFLAGS= -+MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - - # Maximum number of lines to put in a shell here document. -@@ -104,6 +263,13 @@ - # only ac_max_sed_lines should be used. - : ${ac_max_here_lines=38} - -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= -+ - ac_unique_file="ssh.c" - # Factoring default headers for most tests. - ac_includes_default="\ -@@ -142,6 +308,9 @@ - # include <unistd.h> - #endif" - -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PERL SED ENT TEST_MINUS_S_SH SH LOGIN_PROGRAM_FALLBACK LD EGREP LIBWRAP LIBPAM INSTALL_SSH_RAND_HELPER SSH_PRIVSEP_USER PROG_LS PROG_NETSTAT PROG_ARP PROG_IFCONFIG PROG_JSTAT PROG_PS PROG_SAR PROG_W PROG_WHO PROG_LAST PROG_LASTLOG PROG_DF PROG_VMSTAT PROG_UPTIME PROG_IPCS PROG_TAIL INSTALL_SSH_PRNG_CMDS OPENSC_CONFIG PRIVSEP_PATH xauth_path STRIP_OPT XAUTH_PATH NROFF MANTYPE mansubdir user_path piddir LIBOBJS LTLIBOBJS' -+ac_subst_files='' -+ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -@@ -180,13 +349,6 @@ - infodir='${prefix}/info' - mandir='${prefix}/man' - --# Identity of this package. --PACKAGE_NAME= --PACKAGE_TARNAME= --PACKAGE_VERSION= --PACKAGE_STRING= --PACKAGE_BUGREPORT= -- - ac_prev= - for ac_option - do -@@ -319,7 +481,7 @@ - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) -+ | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -@@ -498,7 +660,7 @@ - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac - done -@@ -510,18 +672,19 @@ - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac - done - - # There might be people who depend on the old broken behavior: `$host' - # used to hold the argument of --host etc. -+# FIXME: To remove some day. - build=$build_alias - host=$host_alias - target=$target_alias - --# FIXME: should be removed in autoconf 3.0. -+# FIXME: To remove some day. - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -@@ -537,13 +700,23 @@ - - test "$silent" = yes && exec 6>/dev/null - -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. -- ac_prog=$0 -- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` -- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. -+ ac_confdir=`(dirname "$0") 2>/dev/null || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$0" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. -@@ -553,13 +726,16 @@ - fi - if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else -- { echo "$as_me: error: cannot find sources in $srcdir" >&2 -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - fi -+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ { (exit 1); exit 1; }; } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -600,7 +776,7 @@ - if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. -- cat <<EOF -+ cat <<_ACEOF - \`configure' configures this package to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... -@@ -621,9 +797,9 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --EOF -+_ACEOF - -- cat <<EOF -+ cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -650,19 +826,19 @@ - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] --EOF -+_ACEOF - -- cat <<\EOF -+ cat <<\_ACEOF - - System types: - --build=BUILD configure for building on BUILD [guessed] -- --host=HOST build programs to run on HOST [BUILD] --EOF -+ --host=HOST cross-compile to build programs to run on HOST [BUILD] -+_ACEOF - fi - - if test -n "$ac_init_help"; then - -- cat <<\EOF -+ cat <<\_ACEOF - - Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -@@ -728,40 +904,60 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --EOF -+_ACEOF - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` -- for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue -- cd $ac_subdir -- # A "../" for each directory in /$ac_subdir. -- ac_dots=`echo $ac_subdir | -- sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d $ac_dir || continue -+ ac_builddir=. - -- case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_sub_srcdir=$srcdir ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_sub_srcdir=$srcdir/$ac_subdir ;; -- *) # Relative path. -- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; -- esac -+if test "$ac_dir" != .; then -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+else -+ ac_dir_suffix= ac_top_builddir= -+fi -+ -+case $srcdir in -+ .) # No --srcdir option. We are building in place. -+ ac_srcdir=. -+ if test -z "$ac_top_builddir"; then -+ ac_top_srcdir=. -+ else -+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -+ fi ;; -+ [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir ;; -+ *) # Relative path. -+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_builddir$srcdir ;; -+esac -+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -+# absolute. -+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - -+ cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_sub_srcdir/configure.gnu; then -+ if test -f $ac_srcdir/configure.gnu; then - echo -- $SHELL $ac_sub_srcdir/configure.gnu --help=recursive -- elif test -f $ac_sub_srcdir/configure; then -+ $SHELL $ac_srcdir/configure.gnu --help=recursive -+ elif test -f $ac_srcdir/configure; then - echo -- $SHELL $ac_sub_srcdir/configure --help=recursive -- elif test -f $ac_sub_srcdir/configure.ac || -- test -f $ac_sub_srcdir/configure.in; then -+ $SHELL $ac_srcdir/configure --help=recursive -+ elif test -f $ac_srcdir/configure.ac || -+ test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else -- echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -@@ -769,31 +965,31 @@ - - test -n "$ac_init_help" && exit 0 - if $ac_init_version; then -- cat <<\EOF -+ cat <<\_ACEOF - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. --EOF -+_ACEOF - exit 0 - fi - exec 5>config.log --cat >&5 <<EOF -+cat >&5 <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.52. Invocation command line was -+generated by GNU Autoconf 2.57. Invocation command line was - - $ $0 $@ - --EOF -+_ACEOF - { - cat <<_ASUNAME --## ---------- ## --## Platform. ## --## ---------- ## -+## --------- ## -+## Platform. ## -+## --------- ## - - hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` - uname -m = `(uname -m) 2>/dev/null || echo unknown` -@@ -812,51 +1008,96 @@ - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - --PATH = $PATH -- - _ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ echo "PATH: $as_dir" -+done -+ - } >&5 - --cat >&5 <<EOF --## ------------ ## --## Core tests. ## --## ------------ ## -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF - --EOF - - # Keep a trace of the command line. - # Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= - ac_sep= --for ac_arg -+ac_must_keep_next=false -+for ac_pass in 1 2 - do -- case $ac_arg in -- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -- | --no-cr | --no-c) ;; -- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- ac_sep=" " ;; -- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" -- ac_sep=" " ;; -- esac -- # Get rid of the leading space. -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -+ # Get rid of the leading space. -+ ac_sep=" " -+ ;; -+ esac -+ done - done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. -+# WARNING: Be sure not to use single quotes in there, as some shells, -+# such as our DU 5.0 friend, will then `close' the trap. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. -- echo >&5 -- echo "## ----------------- ##" >&5 -- echo "## Cache variables. ##" >&5 -- echo "## ----------------- ##" >&5 -- echo >&5 -- # The following way of writing the cache mishandles newlines in values, -+ { -+ echo -+ -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, - { - (set) 2>&1 | - |
