From 25da23f335742263de02ed3ab4b7b0f24ae3609e Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Sat, 2 Nov 2019 10:48:32 +0800
Subject: [PATCH 1/2] update spec

---
 cloud-init.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud-init.spec b/cloud-init.spec
index f615e91..50c3d35 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,7 +1,7 @@
 Name: cloud-init
 Version: 17.1
 Release: 8
-Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
+Summary: the defacto multi-distribution package that handles early initialization of a cloud instance1.
 License: ASL 2.0 or GPLv3
 URL: http://launchpad.net/cloud-init
 Source0: https://launchpad.net/cloud-init/trunk/17.1/+download/cloud-init-17.1.tar.gz
-- 
Gitee


From b160263bef092912981360a2d10572763356f4d8 Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Tue, 5 Nov 2019 20:11:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20add-?=
 =?UTF-8?q?variable-to-forbid-tmp-dir.patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 add-variable-to-forbid-tmp-dir.patch | 58 ----------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 add-variable-to-forbid-tmp-dir.patch

diff --git a/add-variable-to-forbid-tmp-dir.patch b/add-variable-to-forbid-tmp-dir.patch
deleted file mode 100644
index 5990566..0000000
--- a/add-variable-to-forbid-tmp-dir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 224da46b2331b582577b86c3eb707f67d57800fb Mon Sep 17 00:00:00 2001
-From: chengquan <chengquan3@huawei.com>
-Date: Thu, 8 Aug 2019 16:15:31 +0800
-Subject: [PATCH] cloud-init: add variable to forbid tmp dir
-
-reason: add variable to forbid temporary directory
-
-Signed-off-by: chengquan <chengquan3@huawei.com>
----
- cloud-init-17.1/setup.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff -Nur cloud-init-17.1/setup.py cloud-init-17.1_bak/setup.py
---- cloud-init-17.1/setup.py	2019-04-12 19:00:20.782000000 +0800
-+++ cloud-init-17.1_bak/setup.py	2019-04-12 19:48:04.246000000 +0800
-@@ -86,6 +86,8 @@
-     (deps, _e) = tiny_p(cmd)
-     return str(deps).splitlines()
- 
-+# add variable to forbid tmp dir
-+num = 0
- 
- def render_tmpl(template):
-     """render template into a tmpdir under same dir as setup.py
-@@ -107,7 +109,10 @@
-         return template
- 
-     topdir = os.path.dirname(sys.argv[0])
--    tmpd = tempfile.mkdtemp(dir=topdir)
-+    global num
-+    os.mkdir(topdir + str(num))
-+    tmpd = os.path.abspath(topdir + str(num))
-+    num = num + 1
-     atexit.register(shutil.rmtree, tmpd)
-     bname = os.path.basename(template).rstrip(tmpl_ext)
-     fpath = os.path.join(tmpd, bname)
-@@ -115,6 +120,9 @@
-     # return path relative to setup.py
-     return os.path.join(os.path.basename(tmpd), bname)
- 
-+def sort_files(file_list):
-+    file_list.sort()
-+    return file_list
- 
- INITSYS_FILES = {
-     'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
-@@ -123,9 +131,9 @@
-     'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
-     'sysvinit_suse': [f for f in glob('sysvinit/suse/*') if is_f(f)],
-     'systemd': [render_tmpl(f)
--                for f in (glob('systemd/*.tmpl') +
-+                for f in sort_files((glob('systemd/*.tmpl') +
-                           glob('systemd/*.service') +
--                          glob('systemd/*.target')) if is_f(f)],
-+                          glob('systemd/*.target'))) if is_f(f)],
-     'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
-     'upstart': [f for f in glob('upstart/*') if is_f(f)],
- }
-- 
Gitee