New upstream release (8.2p1)

1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
index 222a996f1..d73cc283c 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From 57c1dd662f9259f58a47801e2d4b0f84e973441d Mon Sep 17 00:00:00 2001
+From 31d42cd8624f29508f772447e617ab043a6487d9 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 1c2512314..e894db9fc 100644
+index efafb6bd8..cee7cbc51 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1521,6 +1521,62 @@ else
+@@ -1556,6 +1556,62 @@ else
         AC_MSG_RESULT([no])
  fi
  
@@ -94,7 +94,7 @@ index 1c2512314..e894db9fc 100644
  # Check whether user wants to use ldns
  LDNS_MSG="no"
  AC_ARG_WITH(ldns,
-@@ -5242,6 +5298,7 @@ echo "                       PAM support: $PAM_MSG"
+@@ -5413,6 +5469,7 @@ echo "                       PAM support: $PAM_MSG"
  echo "                   OSF SIA support: $SIA_MSG"
  echo "                 KerberosV support: $KRB5_MSG"
  echo "                   SELinux support: $SELINUX_MSG"
@@ -103,10 +103,10 @@ index 1c2512314..e894db9fc 100644
  echo "                   libedit support: $LIBEDIT_MSG"
  echo "                   libldns support: $LDNS_MSG"
 diff --git a/sshd.8 b/sshd.8
-index fb133c14b..57a7fd66b 100644
+index c5f8987d2..730520231 100644
 --- a/sshd.8
 +++ b/sshd.8
-@@ -873,6 +873,12 @@ the user's home directory becomes accessible.
+@@ -893,6 +893,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 fb133c14b..57a7fd66b 100644
  .It Pa /etc/hosts.equiv
  This file is for host-based authentication (see
  .Xr ssh 1 ) .
-@@ -975,6 +981,7 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -995,6 +1001,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,12 +128,12 @@ index fb133c14b..57a7fd66b 100644
  .Xr moduli 5 ,
  .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index 3a5c1ea78..4e32fd10d 100644
+index d92f03aaf..62dc55cf2 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -127,6 +127,13 @@
- #include <Security/AuthSession.h>
- #endif
+@@ -124,6 +124,13 @@
+ #include "ssherr.h"
+ #include "sk-api.h"
  
 +#ifdef LIBWRAP
 +#include <tcpd.h>
@@ -145,7 +145,7 @@ index 3a5c1ea78..4e32fd10d 100644
  /* Re-exec fds */
  #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
  #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -2062,6 +2069,24 @@ main(int ac, char **av)
+@@ -2138,6 +2145,24 @@ main(int ac, char **av)
  #ifdef SSH_AUDIT_EVENTS
         audit_connection_from(remote_ip, remote_port);
  #endif