New upstream release (7.7p1)

1 files changed, 13 insertions, 13 deletions

diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
index 5832897d2..4132937da 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From cdd9076a145a95c21538eedb3f728a897480c5de Mon Sep 17 00:00:00 2001
+From 398af3d66bfe8dc7d436570026571e522a0a13a0 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 7 Oct 2014 13:22:41 +0100
 Subject: Restore TCP wrappers support
@@ -28,10 +28,10 @@ Patch-Name: restore-tcp-wrappers.patch
  3 files changed, 89 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 84bfad8c..3b30736b 100644
+index 1cd5eab6..3e23e60d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1503,6 +1503,62 @@ AC_ARG_WITH([skey],
+@@ -1566,6 +1566,62 @@ AC_ARG_WITH([skey],
         ]
  )
  
@@ -94,19 +94,19 @@ index 84bfad8c..3b30736b 100644
  # Check whether user wants to use ldns
  LDNS_MSG="no"
  AC_ARG_WITH(ldns,
-@@ -5133,6 +5189,7 @@ echo "                 KerberosV support: $KRB5_MSG"
+@@ -5240,6 +5296,7 @@ echo "                   OSF SIA support: $SIA_MSG"
+ echo "                 KerberosV support: $KRB5_MSG"
  echo "                   SELinux support: $SELINUX_MSG"
- echo "                 Smartcard support: $SCARD_MSG"
  echo "                     S/KEY support: $SKEY_MSG"
 +echo "              TCP Wrappers support: $TCPW_MSG"
  echo "              MD5 password support: $MD5_MSG"
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "                   libldns support: $LDNS_MSG"
 diff --git a/sshd.8 b/sshd.8
-index a4201146..2ed523a2 100644
+index 968ba66b..c8299d5e 100644
 --- a/sshd.8
 +++ b/sshd.8
-@@ -839,6 +839,12 @@ the user's home directory becomes accessible.
+@@ -845,6 +845,12 @@ the user's home directory becomes accessible.
  This file should be writable only by the user, and need not be
  readable by anyone else.
  .Pp
@@ -119,7 +119,7 @@ index a4201146..2ed523a2 100644
  .It Pa /etc/hosts.equiv
  This file is for host-based authentication (see
  .Xr ssh 1 ) .
-@@ -943,6 +949,7 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -947,6 +953,7 @@ The content of this file is not sensitive; it can be world-readable.
  .Xr ssh-keygen 1 ,
  .Xr ssh-keyscan 1 ,
  .Xr chroot 2 ,
@@ -128,10 +128,10 @@ index a4201146..2ed523a2 100644
  .Xr moduli 5 ,
  .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index 45e50fac..a66e9ca6 100644
+index e88185ef..4ed0364f 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -126,6 +126,13 @@
+@@ -127,6 +127,13 @@
  #include <Security/AuthSession.h>
  #endif
  
@@ -145,7 +145,7 @@ index 45e50fac..a66e9ca6 100644
  /* Re-exec fds */
  #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
  #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -1987,6 +1994,24 @@ main(int ac, char **av)
+@@ -2042,6 +2049,24 @@ main(int ac, char **av)
  #ifdef SSH_AUDIT_EVENTS
         audit_connection_from(remote_ip, remote_port);
  #endif
@@ -168,5 +168,5 @@ index 45e50fac..a66e9ca6 100644
 +       }
 +#endif /* LIBWRAP */
  
-        /* Log the connection. */
-        laddr = get_local_ipaddr(sock_in);
+        rdomain = ssh_packet_rdomain_in(ssh);
+