From 3cc05c82583d570d7e6923485f33bdb4924026bd Mon Sep 17 00:00:00 2001
From: zhongjiawei <zhongjiawei1@huawei.com>
Date: Fri, 30 Sep 2022 17:07:05 +0800
Subject: [PATCH 1/2] runc: runc1.1.3 patch merge

---
 apply-patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apply-patch b/apply-patch
index 47718c8..8da8bc5 100755
--- a/apply-patch
+++ b/apply-patch
@@ -5,11 +5,11 @@
 # Author: jingrui@huawei.com
 # Create: 2019-03-02
 
-pkg=runc-1.0.0-rc3
+pkg=runc-1.1.3
 cwd=$PWD
 src=$cwd/$pkg
 
-unzip v1.0.0-rc3.zip
+tar zxvf v1.1.3.tar.gz
 if [ ! -d patch ];then
     tar -xzf patch.tar.gz
 fi
@@ -25,4 +25,4 @@ done <"$series"
 
 cd $cwd
 cp -rf $src/* .
-rm -rf runc-1.0.0-rc3
+rm -rf runc-1.1.3
-- 
Gitee


From fe500b5b4ce667f97fb363663e22da4a14f65d06 Mon Sep 17 00:00:00 2001
From: zhong-jiawei-1 <zhongjiawei1@huawei.com>
Date: Tue, 18 Oct 2022 09:48:53 +0800
Subject: [PATCH 2/2] runc:move install path to /usr/bin

---
 git-commit |  2 +-
 runc.spec  | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/git-commit b/git-commit
index 34f61ed..6a5f3c7 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-b49101bf7dc504614d65a73bc3a5d8d6033962ff
+9e829af4b75cbee163a3e444a4234a7d6f6a2127
diff --git a/runc.spec b/runc.spec
index a25843b..0e841f9 100644
--- a/runc.spec
+++ b/runc.spec
@@ -1,9 +1,9 @@
-%global _bindir /usr/local/bin
+%global _bindir /usr/bin
 %global debug_package %{nil}
 
 Name: docker-runc
 Version: 1.1.3
-Release: 3
+Release: 4
 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification.
 
 License: ASL 2.0
@@ -43,6 +43,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc
 %{_bindir}/runc
 
 %changelog
+* Tue Oct 18 2022 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.3-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:move install path to /usr/bin
+
 * Tue Aug 16 2022 zhongjiawei<zhongjiawei1@huawei.com> - 1.1.3-3
 - Type:bugfix
 - CVE:NA
@@ -76,7 +82,7 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc
 * Thu Feb 10 2022 fushanqing <fushanqing@kylinos.cn> - 1.0.0.rc3-116
 - remove "%global _bindir /usr/local/bin"
 
-* Tue Jan 26 2022 songyanting <songyanting@huawei.com> - 1.0.0.rc3-115
+* Wed Jan 26 2022 songyanting <songyanting@huawei.com> - 1.0.0.rc3-115
 - Type:bugfix
 - CVE:NA
 - SUG:NA
-- 
Gitee