Import patches-applied version 2.0.4-0ubuntu2 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 8b689f4b02b11c2fbdef42fcc6e7707ead68370a
Unapplied parent: 5cf5793d5fcad94d51671d869572248ae90fc375

New changelog entries:
  * Fix for broken sshd configuration (LP: #1305418)
   - Change modification of sshd_config to address lack of newline at EOF

1 files changed, 22 insertions, 0 deletions

diff --git a/debian/patches/sshd_config_newline_fix.patch b/debian/patches/sshd_config_newline_fix.patch
new file mode 100644
index 0000000..a599c81
--- /dev/null
+++ b/debian/patches/sshd_config_newline_fix.patch
@@ -0,0 +1,22 @@
+Description: Fix for broken sshd configuration (LP: #1305418)
+ Change modification of sshd_config to address lack of newline at EOF.
+ Lack of newline resulted in appended config line on same line
+ as existing configuration option, breaking sshd_config.
+
+Author: Robert C Jennings <robert.jennings@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1305418
+---
+ waagent |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/waagent
++++ b/waagent
+@@ -3353,7 +3353,7 @@
+             # Disable RFC 4252 and RFC 4256 authentication schemes.
+             ReplaceFileContentsAtomic(filepath, "\n".join(filter(lambda a: not
+                 (a.startswith("PasswordAuthentication") or a.startswith("ChallengeResponseAuthentication")),
+-                GetFileContents(filepath).split('\n'))) + "PasswordAuthentication no\nChallengeResponseAuthentication no\n")
++                GetFileContents(filepath).split('\n'))) + "\nPasswordAuthentication no\nChallengeResponseAuthentication no\n")
+             Log("Disabled SSH password-based authentication methods.")
+         if self.AdminPassword != None:
+             MyDistro.changePass('root',self.AdminPassword)