From b456a15aad73707bbf8c0e4263dc913a5911fa3a Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 18 Nov 2020 21:30:14 +0800
Subject: [PATCH 1/2] [patch tracking] 20201118213007660616 -
 https://github.com/OSInside/kiwi/commit/36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c

---
 ...7bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch

diff --git a/36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch b/36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch
new file mode 100644
index 0000000..8175a21
--- /dev/null
+++ b/36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch
@@ -0,0 +1,22 @@
+diff --git a/tools/dcounter.c b/tools/dcounter.c
+index 42df97447a..5a09b262d7 100644
+--- a/tools/dcounter.c
++++ b/tools/dcounter.c
+@@ -30,8 +30,7 @@ int main(int argc, char **argv) {
+         return 1;
+     }
+     fprintf(stderr, "      ");
+-    r = read(0, buf, sizeof buf);
+-    while(r > 0) {
++    while((r = read(0, buf, sizeof buf)) > 0) {
+         ssize_t p = 0;
+         ssize_t w = 0;
+         while((w = write(1, buf + p, r - p)) >= 0) {
+@@ -58,7 +57,6 @@ int main(int argc, char **argv) {
+                 }
+             }
+         }
+-        r = read(0, buf, sizeof buf);
+     }
+     fflush(stdout);
+     return 0;
-- 
Gitee


From e008184d0dd09e2ec44ec25389ec9cfdd896a6ed Mon Sep 17 00:00:00 2001
From: openeuler-ci-bot <80474298@qq.com>
Date: Wed, 18 Nov 2020 21:30:15 +0800
Subject: [PATCH 2/2] [patch tracking] 20201118213007660616 - update spec file

---
 kiwi.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kiwi.spec b/kiwi.spec
index e59772e..8f6239d 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,12 +2,13 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
 URL:            http://osinside.github.io/kiwi/
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
+Patch6000: 36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +190,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201118213007660616 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c> to <36077bb4cecc6cfe4cbb88615ccbb73671c3ae8c>
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5
 
@@ -208,4 +212,4 @@ done
 - Remove python2 dependency
 
 * Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.16.12-2
-- Package init
+- Package init
\ No newline at end of file
-- 
Gitee