From 610f5f5ac3eec097415a98e4a3aa2d383e57599e Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Jan 27 2017 02:11:11 +0000
Subject: Normalize patch file names


---

diff --git a/cloud-init-0.7.6-bzr1245-ecdsa.patch b/cloud-init-0.7.6-bzr1245-ecdsa.patch
deleted file mode 100644
index 3c7019f..0000000
--- a/cloud-init-0.7.6-bzr1245-ecdsa.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
-index be8a49e..b95b956 100644
---- a/cloudinit/ssh_util.py
-+++ b/cloudinit/ssh_util.py
-@@ -22,8 +22,11 @@ DEF_SSHD_CFG = "/etc/ssh/sshd_config"
- VALID_KEY_TYPES = (
-     "dsa",
-     "ecdsa",
-+    "ecdsa-sha2-nistp256",
-     "ecdsa-sha2-nistp256-cert-v01@openssh.com",
-+    "ecdsa-sha2-nistp384",
-     "ecdsa-sha2-nistp384-cert-v01@openssh.com",
-+    "ecdsa-sha2-nistp521",
-     "ecdsa-sha2-nistp521-cert-v01@openssh.com",
-     "ed25519",
-     "rsa",
diff --git a/cloud-init-0.7.9-disable-lxd-tests.patch b/cloud-init-0.7.9-disable-lxd-tests.patch
new file mode 100644
index 0000000..7beb8b0
--- /dev/null
+++ b/cloud-init-0.7.9-disable-lxd-tests.patch
@@ -0,0 +1,28 @@
+From 8c4de19989caec2cd06cb7aef78b7c66621a54d7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 20 Jan 2017 11:17:16 -0500
+Subject: [PATCH] tests: Neuter lxd testing
+
+We aren't going to support our cloud-init build in lxd, and it requires pylxd
+bindings, which I'm not going to package myself.
+---
+ tests/cloud_tests/platforms/__init__.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/cloud_tests/platforms/__init__.py b/tests/cloud_tests/platforms/__init__.py
+index f9f5603..b21aba0 100644
+--- a/tests/cloud_tests/platforms/__init__.py
++++ b/tests/cloud_tests/platforms/__init__.py
+@@ -1,9 +1,6 @@
+ # This file is part of cloud-init. See LICENSE file for license information.
+ 
+-from tests.cloud_tests.platforms import lxd
+-
+ PLATFORMS = {
+-    'lxd': lxd.LXDPlatform,
+ }
+ 
+ 
+-- 
+2.9.3
+
diff --git a/cloud-init-0.7.9-ecdsa.patch b/cloud-init-0.7.9-ecdsa.patch
new file mode 100644
index 0000000..3c7019f
--- /dev/null
+++ b/cloud-init-0.7.9-ecdsa.patch
@@ -0,0 +1,16 @@
+diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
+index be8a49e..b95b956 100644
+--- a/cloudinit/ssh_util.py
++++ b/cloudinit/ssh_util.py
+@@ -22,8 +22,11 @@ DEF_SSHD_CFG = "/etc/ssh/sshd_config"
+ VALID_KEY_TYPES = (
+     "dsa",
+     "ecdsa",
++    "ecdsa-sha2-nistp256",
+     "ecdsa-sha2-nistp256-cert-v01@openssh.com",
++    "ecdsa-sha2-nistp384",
+     "ecdsa-sha2-nistp384-cert-v01@openssh.com",
++    "ecdsa-sha2-nistp521",
+     "ecdsa-sha2-nistp521-cert-v01@openssh.com",
+     "ed25519",
+     "rsa",
diff --git a/cloud-init.spec b/cloud-init.spec
index 127047d..3653ce6 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -21,8 +21,9 @@ Patch1:         cloud-init-0.7.5-rsyslog-programname.patch
 
 # Add 3 ecdsa-sha2-nistp* ssh key types now that they are standardized
 # https://bugzilla.redhat.com/show_bug.cgi?id=1151824
-# FIXME: was this really sent upstream?  The launchpad link is broken
-Patch3:         cloud-init-0.7.6-bzr1245-ecdsa.patch
+# https://bugs.launchpad.net/cloud-init/+bug/1658174
+# https://git.launchpad.net/cloud-init/commit/?id=853df0a0e85002582694b88db886f206f64b23c7
+Patch3:         cloud-init-0.7.9-ecdsa.patch
 
 # Use dnf instead of yum when available
 # https://bugzilla.redhat.com/show_bug.cgi?id=1194451
@@ -36,8 +37,8 @@ Patch8:         cloud-init-0.7.8-apt-dns-test.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1385172
 Patch11:        cloud-init-0.7.8-nm-controlled.patch
 
-# Requires pylxd
-Patch12: tests-Neuter-lxd-testing.patch
+# Disable tests that require pylxd
+Patch12:        cloud-init-0.7.9-disable-lxd-tests.patch
 
 BuildArch:      noarch
 
diff --git a/tests-Neuter-lxd-testing.patch b/tests-Neuter-lxd-testing.patch
deleted file mode 100644
index 7beb8b0..0000000
--- a/tests-Neuter-lxd-testing.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8c4de19989caec2cd06cb7aef78b7c66621a54d7 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Fri, 20 Jan 2017 11:17:16 -0500
-Subject: [PATCH] tests: Neuter lxd testing
-
-We aren't going to support our cloud-init build in lxd, and it requires pylxd
-bindings, which I'm not going to package myself.
----
- tests/cloud_tests/platforms/__init__.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/tests/cloud_tests/platforms/__init__.py b/tests/cloud_tests/platforms/__init__.py
-index f9f5603..b21aba0 100644
---- a/tests/cloud_tests/platforms/__init__.py
-+++ b/tests/cloud_tests/platforms/__init__.py
-@@ -1,9 +1,6 @@
- # This file is part of cloud-init. See LICENSE file for license information.
- 
--from tests.cloud_tests.platforms import lxd
--
- PLATFORMS = {
--    'lxd': lxd.LXDPlatform,
- }
- 
- 
--- 
-2.9.3
-