New upstream release (8.0p1)

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
index fdc6cf18a..0472ea7d0 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From 389e16d0109d8c49a761cd7c267438b05c9ab984 Mon Sep 17 00:00:00 2001
+From 0f9f44654708e4fde2f52c52f717d061b5e458fa 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
@@ -18,7 +18,7 @@ but it at least probably doesn't involve dropping this feature shortly
 before a freeze.
 
 Forwarded: not-needed
-Last-Update: 2018-08-24
+Last-Update: 2019-06-05
 
 Patch-Name: restore-tcp-wrappers.patch
 ---
@@ -28,10 +28,10 @@ Patch-Name: restore-tcp-wrappers.patch
  3 files changed, 89 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 023e7cc55..917300b43 100644
+index 2869f7042..ce16e7758 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1517,6 +1517,62 @@ else
+@@ -1518,6 +1518,62 @@ else
         AC_MSG_RESULT([no])
  fi
  
@@ -94,7 +94,7 @@ index 023e7cc55..917300b43 100644
  # Check whether user wants to use ldns
  LDNS_MSG="no"
  AC_ARG_WITH(ldns,
-@@ -5329,6 +5385,7 @@ echo "                       PAM support: $PAM_MSG"
+@@ -5269,6 +5325,7 @@ echo "                       PAM support: $PAM_MSG"
  echo "                   OSF SIA support: $SIA_MSG"
  echo "                 KerberosV support: $KRB5_MSG"
  echo "                   SELinux support: $SELINUX_MSG"
@@ -128,7 +128,7 @@ index fb133c14b..57a7fd66b 100644
  .Xr moduli 5 ,
  .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index 539a000fd..673db87f6 100644
+index 98680721b..46870d3b5 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -127,6 +127,13 @@
@@ -145,7 +145,7 @@ index 539a000fd..673db87f6 100644
  /* Re-exec fds */
  #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
  #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -2099,6 +2106,24 @@ main(int ac, char **av)
+@@ -2057,6 +2064,24 @@ main(int ac, char **av)
  #ifdef SSH_AUDIT_EVENTS
         audit_connection_from(remote_ip, remote_port);
  #endif
@@ -153,7 +153,7 @@ index 539a000fd..673db87f6 100644
 +       allow_severity = options.log_facility|LOG_INFO;
 +       deny_severity = options.log_facility|LOG_WARNING;
 +       /* Check whether logins are denied from this host. */
-+       if (packet_connection_is_on_socket()) {
++       if (ssh_packet_connection_is_on_socket(ssh)) {
 +               struct request_info req;
 +
 +               request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0);