diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
| commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
| tree | 86848a7668424b392d48791a0e41e05f9df7b62b /debian/patches/authorized-keys-man-symlink.patch | |
| parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
| parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) | |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'debian/patches/authorized-keys-man-symlink.patch')
| -rw-r--r-- | debian/patches/authorized-keys-man-symlink.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch index 39e63e33b..74bfb46e6 100644 --- a/debian/patches/authorized-keys-man-symlink.patch +++ b/debian/patches/authorized-keys-man-symlink.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 6384f890f732a0967590e37ad402ace6505799ea Mon Sep 17 00:00:00 2001 | 1 | From 71448da5ce75ba50bcb10dbbd3b8c7633f633e8f Mon Sep 17 00:00:00 2001 |
| 2 | From: Tomas Pospisek <tpo_deb@sourcepole.ch> | 2 | From: Tomas Pospisek <tpo_deb@sourcepole.ch> |
| 3 | Date: Sun, 9 Feb 2014 16:10:07 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:07 +0000 |
| 4 | Subject: Install authorized_keys(5) as a symlink to sshd(8) | 4 | Subject: Install authorized_keys(5) as a symlink to sshd(8) |
| @@ -13,7 +13,7 @@ Patch-Name: authorized-keys-man-symlink.patch | |||
| 13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
| 14 | 14 | ||
| 15 | diff --git a/Makefile.in b/Makefile.in | 15 | diff --git a/Makefile.in b/Makefile.in |
| 16 | index 598d55a..5cf8100 100644 | 16 | index 3d96c05..feee0b2 100644 |
| 17 | --- a/Makefile.in | 17 | --- a/Makefile.in |
| 18 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
| 19 | @@ -287,6 +287,7 @@ install-files: | 19 | @@ -287,6 +287,7 @@ install-files: |