Import openssh_8.1p1.orig.tar.gz

1 files changed, 134 insertions, 134 deletions

diff --git a/configure b/configure
index d276473ca..1e67db268 100755
--- a/configure
+++ b/configure
@@ -4874,8 +4874,8 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of "nroff", so it can be a program name with args.
-set dummy nroff; ac_word=$2
+# Extract the first word of "nroff awf", so it can be a program name with args.
+set dummy nroff awf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_NROFF+:} false; then :
@@ -4964,8 +4964,8 @@ elif test "x$NROFF" != "x" ; then
 elif test "x$GROFF" != "x" ; then
         MANFMT="$GROFF -mandoc -Tascii"
 else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no manpage formatted found" >&5
-$as_echo "$as_me: WARNING: no manpage formatted found" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no manpage formatter found" >&5
+$as_echo "$as_me: WARNING: no manpage formatter found" >&2;}
         MANFMT="false"
 fi
 
@@ -5550,12 +5550,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 }
         {
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Qunused-arguments" >&5
-$as_echo_n "checking if $CC supports compile flag -Qunused-arguments... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunknown-warning-option" >&5
+$as_echo_n "checking if $CC supports compile flag -Wunknown-warning-option... " >&6; }
         saved_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $WERROR -Qunused-arguments"
+        CFLAGS="$CFLAGS $WERROR -Wunknown-warning-option"
         _define_flag=""
-        test "x$_define_flag" = "x" && _define_flag="-Qunused-arguments"
+        test "x$_define_flag" = "x" && _define_flag="-Wunknown-warning-option"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5593,12 +5593,55 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 }
         {
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wunknown-warning-option" >&5
-$as_echo_n "checking if $CC supports compile flag -Wunknown-warning-option... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wno-error=format-truncation" >&5
+$as_echo_n "checking if $CC supports compile flag -Wno-error=format-truncation... " >&6; }
         saved_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $WERROR -Wunknown-warning-option"
+        CFLAGS="$CFLAGS $WERROR -Wno-error=format-truncation"
         _define_flag=""
-        test "x$_define_flag" = "x" && _define_flag="-Wunknown-warning-option"
+        test "x$_define_flag" = "x" && _define_flag="-Wno-error=format-truncation"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Qunused-arguments" >&5
+$as_echo_n "checking if $CC supports compile flag -Qunused-arguments... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Qunused-arguments"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Qunused-arguments"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5679,6 +5722,49 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 }
         {
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wextra" >&5
+$as_echo_n "checking if $CC supports compile flag -Wextra... " >&6; }
+        saved_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $WERROR -Wextra"
+        _define_flag=""
+        test "x$_define_flag" = "x" && _define_flag="-Wextra"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+int main(int argc, char **argv) {
+        /* Some math to catch -ftrapv problems in the toolchain */
+        int i = 123 * argc, j = 456 + argc, k = 789 - argc;
+        float l = i * 2.1;
+        double m = l / 0.5;
+        long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
+        printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
+        exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+if $ac_cv_path_EGREP -i "unrecognized option|warning.*ignored" conftest.err >/dev/null
+then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                CFLAGS="$saved_CFLAGS"
+else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                 CFLAGS="$saved_CFLAGS $_define_flag"
+fi
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                  CFLAGS="$saved_CFLAGS"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+}
+        {
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports compile flag -Wpointer-arith" >&5
 $as_echo_n "checking if $CC supports compile flag -Wpointer-arith... " >&6; }
         saved_CFLAGS="$CFLAGS"
@@ -7150,9 +7236,6 @@ fi
 
         check_for_aix_broken_getaddrinfo=1
 
-$as_echo "#define BROKEN_REALPATH 1" >>confdefs.h
-
-
 $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
 
 
@@ -7417,6 +7500,30 @@ if test "x$ac_cv_lib_sandbox_sandbox_apply" = xyes; then :
 
 fi
 
+        # proc_pidinfo()-based closefrom() replacement.
+        for ac_header in libproc.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libproc.h" "ac_cv_header_libproc_h" "$ac_includes_default"
+if test "x$ac_cv_header_libproc_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPROC_H 1
+_ACEOF
+
+fi
+
+done
+
+        for ac_func in proc_pidinfo
+do :
+  ac_fn_c_check_func "$LINENO" "proc_pidinfo" "ac_cv_func_proc_pidinfo"
+if test "x$ac_cv_func_proc_pidinfo" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PROC_PIDINFO 1
+_ACEOF
+
+fi
+done
+
         ;;
 *-*-dragonfly*)
         SSHDLIBS="$SSHDLIBS -lcrypt"
@@ -7697,7 +7804,7 @@ $as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h
         fi
         ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "
 #ifdef HAVE_SYS_TYPES_H
-# include <sys/types.H>
+# include <sys/types.h>
 #endif
 
 "
@@ -7936,8 +8043,6 @@ $as_echo "#define SANDBOX_SKIP_RLIMIT_NOFILE 1" >>confdefs.h
 
 $as_echo "#define HAVE_NEXT 1" >>confdefs.h
 
-        $as_echo "#define BROKEN_REALPATH 1" >>confdefs.h
-
         $as_echo "#define USE_PIPES 1" >>confdefs.h
 
 
@@ -10820,6 +10925,9 @@ for ac_func in  \
         Blowfish_expandstate \
         Blowfish_expand0state \
         Blowfish_stream2word \
+        SHA256Update \
+        SHA384Update \
+        SHA512Update \
         asprintf \
         b64_ntop \
         __b64_ntop \
@@ -10872,6 +10980,7 @@ for ac_func in  \
         llabs \
         login_getcapbool \
         md5_crypt \
+        memmem \
         memmove \
         memset_s \
         mkdtemp \
@@ -11623,61 +11732,6 @@ fi
 done
 
 
-for ac_func in realpath
-do :
-  ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath"
-if test "x$ac_cv_func_realpath" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_REALPATH 1
-_ACEOF
-
-                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if realpath works with non-existent files" >&5
-$as_echo_n "checking if realpath works with non-existent files... " >&6; }
-        if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming working" >&5
-$as_echo "$as_me: WARNING: cross compiling: assuming working" >&2;}
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <limits.h>
-#include <stdlib.h>
-#include <errno.h>
-
-int
-main ()
-{
-
-                char buf[PATH_MAX];
-                if (realpath("/opensshnonexistentfilename1234", buf) == NULL)
-                        if (errno == ENOENT)
-                                exit(1);
-                exit(0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-
-$as_echo "#define BROKEN_REALPATH 1" >>confdefs.h
-
-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-done
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fflush(NULL)" >&5
 $as_echo_n "checking for working fflush(NULL)... " >&6; }
 if test "$cross_compiling" = yes; then :
@@ -13316,8 +13370,8 @@ fi
 done
 
 
-        # Search for SHA256 support in libc and/or OpenSSL
-        for ac_func in SHA256_Update EVP_sha256
+        # Check for SHA256, SHA384 and SHA512 support in OpenSSL
+        for ac_func in EVP_sha256 EVP_sha384 EVP_sha512
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13326,18 +13380,10 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
-else
-  unsupported_algorithms="$unsupported_algorithms \
-                hmac-sha2-256 \
-                hmac-sha2-512 \
-                diffie-hellman-group-exchange-sha256 \
-                hmac-sha2-256-etm@openssh.com \
-                hmac-sha2-512-etm@openssh.com"
-
-
 fi
 done
 
+
         # Search for RIPE-MD support in OpenSSL
         for ac_func in EVP_ripemd160
 do :
@@ -14257,8 +14303,7 @@ main ()
 {
 
         struct rlimit rl_zero;
-        int fd, r;
-        fd_set fds;
+        int r;
 
         rl_zero.rlim_cur = rl_zero.rlim_max = 0;
         r = setrlimit(RLIMIT_NOFILE, &rl_zero);
@@ -18555,54 +18600,9 @@ if test "${with_mantype+set}" = set; then :
 fi
 
 if test -z "$MANTYPE"; then
-        TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb"
-        for ac_prog in nroff awf
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NROFF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NROFF in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $TestPath
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-NROFF=$ac_cv_path_NROFF
-if test -n "$NROFF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5
-$as_echo "$NROFF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$NROFF" && break
-done
-test -n "$NROFF" || NROFF="/bin/false"
-
-        if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
+        if ${MANDOC} ${srcdir}/ssh.1 >/dev/null 2>&1; then
+                MANTYPE=doc
+        elif ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
                 MANTYPE=doc
         elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then
                 MANTYPE=man