New upstream release (8.0p1)

1 files changed, 17 insertions, 17 deletions

diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index bc2390e06..899c60123 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From 7b931d36ad36a93d2b1811858ca29408ec44ecae Mon Sep 17 00:00:00 2001
+From e04a43bd5798ba43d910493d179438845e96f631 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:09:58 +0000
 Subject: Allow harmless group-writability
@@ -13,7 +13,7 @@ default.
 
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347
-Last-Update: 2017-10-04
+Last-Update: 2019-06-05
 
 Patch-Name: user-group-modes.patch
 ---
@@ -51,7 +51,7 @@ index 57296e1f6..546aa0495 100644
                             pw->pw_name, buf);
                         auth_debug_add("Bad file modes for %.200s", buf);
 diff --git a/auth.c b/auth.c
-index d8e6b4a3d..9d1d453f1 100644
+index f7a23afba..8ffd77662 100644
 --- a/auth.c
 +++ b/auth.c
 @@ -473,8 +473,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
@@ -65,10 +65,10 @@ index d8e6b4a3d..9d1d453f1 100644
                             "bad owner or modes for %.200s",
                             pw->pw_name, user_hostfile);
 diff --git a/misc.c b/misc.c
-index bdc06fdb3..5159e6692 100644
+index 009e02bc5..634b5060a 100644
 --- a/misc.c
 +++ b/misc.c
-@@ -58,8 +58,9 @@
+@@ -59,8 +59,9 @@
  #include <netdb.h>
  #ifdef HAVE_PATHS_H
  # include <paths.h>
@@ -79,7 +79,7 @@ index bdc06fdb3..5159e6692 100644
  #ifdef SSH_TUN_OPENBSD
  #include <net/if.h>
  #endif
-@@ -1028,6 +1029,55 @@ percent_expand(const char *string, ...)
+@@ -1103,6 +1104,55 @@ percent_expand(const char *string, ...)
  #undef EXPAND_MAX_KEYS
  }
  
@@ -135,7 +135,7 @@ index bdc06fdb3..5159e6692 100644
  int
  tun_open(int tun, int mode, char **ifname)
  {
-@@ -1786,8 +1836,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -1860,8 +1910,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
                 snprintf(err, errlen, "%s is not a regular file", buf);
                 return -1;
         }
@@ -145,7 +145,7 @@ index bdc06fdb3..5159e6692 100644
                 snprintf(err, errlen, "bad ownership or modes for file %s",
                     buf);
                 return -1;
-@@ -1802,8 +1851,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -1876,8 +1925,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
                 strlcpy(buf, cp, sizeof(buf));
  
                 if (stat(buf, &st) < 0 ||
@@ -156,10 +156,10 @@ index bdc06fdb3..5159e6692 100644
                             "bad ownership or modes for directory %s", buf);
                         return -1;
 diff --git a/misc.h b/misc.h
-index 31b207a8d..aaf966e65 100644
+index 5b4325aba..a4bdee187 100644
 --- a/misc.h
 +++ b/misc.h
-@@ -168,6 +168,8 @@ int  safe_path_fd(int, const char *, struct passwd *,
+@@ -175,6 +175,8 @@ int  safe_path_fd(int, const char *, struct passwd *,
  char   *read_passphrase(const char *, int);
  int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
  
@@ -169,10 +169,10 @@ index 31b207a8d..aaf966e65 100644
  #define MAXIMUM(a, b)  (((a) > (b)) ? (a) : (b))
  #define ROUNDUP(x, y)   ((((x)+((y)-1))/(y))*(y))
 diff --git a/readconf.c b/readconf.c
-index 052d4b1ac..6b01f20d2 100644
+index 3d0b6ff90..cd60007f8 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1820,8 +1820,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -1846,8 +1846,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
  
                 if (fstat(fileno(f), &sb) == -1)
                         fatal("fstat %s: %s", filename, strerror(errno));
@@ -183,10 +183,10 @@ index 052d4b1ac..6b01f20d2 100644
         }
  
 diff --git a/ssh.1 b/ssh.1
-index 7760c3075..81f29af43 100644
+index a1c7d2305..64ead5f57 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1485,6 +1485,8 @@ The file format and configuration options are described in
+@@ -1484,6 +1484,8 @@ The file format and configuration options are described in
  .Xr ssh_config 5 .
  Because of the potential for abuse, this file must have strict permissions:
  read/write for the user, and not writable by others.
@@ -196,13 +196,13 @@ index 7760c3075..81f29af43 100644
  .It Pa ~/.ssh/environment
  Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index 54e143c93..7d55fa820 100644
+index 250c92d04..bd1e9311d 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1835,6 +1835,8 @@ The format of this file is described above.
+@@ -1885,6 +1885,8 @@ The format of this file is described above.
  This file is used by the SSH client.
  Because of the potential for abuse, this file must have strict permissions:
- read/write for the user, and not accessible by others.
+ read/write for the user, and not writable by others.
 +It may be group-writable provided that the group in question contains only
 +the user.
  .It Pa /etc/ssh/ssh_config