Added patch for agent ctty connection issue.

3 files changed, 43 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94c37928f45d..ee7b3c9d3251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kata-containers
 	pkgdesc = Lightweight virtual machines for containers
 	pkgver = 1.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://katacontainers.io/
 	arch = x86_64
 	license = Apache
@@ -11,14 +11,17 @@ pkgbase = kata-containers
 	source = proxy-1.12.0.tar.gz::https://github.com/kata-containers/proxy/archive/1.12.0.tar.gz
 	source = runtime-1.12.0.tar.gz::https://github.com/kata-containers/runtime/archive/1.12.0.tar.gz
 	source = shim-1.12.0.tar.gz::https://github.com/kata-containers/shim/archive/1.12.0.tar.gz
+	source = 3082.patch
 	sha512sums = 4680a524e674cb1fb34e61a0ff0ed9d9535c90527f01342e426deeb5a494984c22cdfa1de4c7e6082ade5898d4108b7f0a6fd982220d6d3e1e0f20c0b66c6cbc
 	sha512sums = 94d53f9e8d918cf0e439a695fa1ab95734da0e5dbc3a7a0148ba3221520cb66086276772c11dc244216693692007b323f85fb33570450f033e4289466d1cab4f
 	sha512sums = d0241edaaba9f7df15c4daa1313b43d1acc365233455c5d71096cf2fc3d036e3849a93f2bc60c80b1f60859b6090b9711b2e357e7dc6ff7948ca5e961cebb7b6
 	sha512sums = 5818ba9962bfd541e162f9091609d2fc776accb94c2f580ef4cf11483a9d7dd6e900f235619581dacba777d042b483886bc013d11a6cd36b045e3c6c0ee2b7d2
+	sha512sums = 87568f7db71a816f4953245af4b302da2f0a19543a706bce9d84e9c7e9de8f6ef54f410e426f05c4faf46bcfb330f802fa8261848beda3aaa965bfc11408a5ca
 	b2sums = 4c6b4a9e2beff8ce04c82fc3b02d0e0e22db1eaff8d703ecc737fc54fd99fba21687f821bc0dd0579009364ceeff2c7503e1bf0ed6a958451a6a4047430c2dd6
 	b2sums = 5b1ea0dd0eff23d4956a5e7d8fac1a0d87890248f8a851fde536a29660edb31e876a55c0c95598b829bf00ba154de25b8720bcb5fe5edd61e7c36425fe4bffe5
 	b2sums = 48bd3e6bea66c8157b7965d8840d5f812db65e865ec4dee7897ebfd9cd4ff16a7043e41faeb62444944e1be14d2278fef0ff0841f3f404c17987b9bdf8bd54f3
 	b2sums = 4eefe311f1c8110cd55397828eec5a2d01f8156c4fc17526255fdf1f05ca11dbeafb3155e0be9ed15668faf15103d1deb4bab83a8dff9721a2e7baf1b1664229
+	b2sums = d4f55b660a26ff6dc9e9a7f4eab80f3a45a228b9780054ae0a8d1080ca8db29333818e9e83235c4e6a128117473fe8fcb8f9e5831042aaf71d4defca09808ef2
 
 pkgname = kata-ksm-throttler
 
diff --git a/3082.patch b/3082.patch
new file mode 100644
index 000000000000..57fd9007df11
--- /dev/null
+++ b/3082.patch
@@ -0,0 +1,33 @@
+From c56af73d3d142125e0712028be0b9e179e0ff957 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Wed, 18 Nov 2020 17:42:04 +0100
+Subject: [PATCH] virtcontainers: Don't set Ctty
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The https://go-review.googlesource.com/c/go/+/231638/ commit on Golang
+introduced a failure on Kata Containers when the runtime is built with
+golang 15.2+.
+
+Fixes: #2982
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+---
+ virtcontainers/shim.go | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/virtcontainers/shim.go b/virtcontainers/shim.go
+index 8ec7458b6..d0c891dd5 100644
+--- a/virtcontainers/shim.go
++++ b/virtcontainers/shim.go
+@@ -208,9 +208,6 @@ func startShim(args []string, params ShimParams) (int, error) {
+ 		cmd.Stderr = f
+ 		// Create Session
+ 		cmd.SysProcAttr.Setsid = true
+-		// Set Controlling terminal to Ctty
+-		cmd.SysProcAttr.Setctty = true
+-		cmd.SysProcAttr.Ctty = int(f.Fd())
+ 	}
+ 	defer func() {
+ 		if f != nil {
diff --git a/PKGBUILD b/PKGBUILD
index 6bc19fcefa35..1b812377dc55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=(
 )
 pkgver=1.12.0
 _pkgver=${pkgver/\~/-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight virtual machines for containers"
 arch=('x86_64')
 url="https://katacontainers.io/"
@@ -22,18 +22,21 @@ source=(
   "proxy-${_pkgver}.tar.gz::https://${_gh_org}/proxy/archive/${_pkgver}.tar.gz"
   "runtime-${_pkgver}.tar.gz::https://${_gh_org}/runtime/archive/${_pkgver}.tar.gz"
   "shim-${_pkgver}.tar.gz::https://${_gh_org}/shim/archive/${_pkgver}.tar.gz"
+  "3082.patch"  # https://github.com/kata-containers/runtime/pull/3082 fixing https://github.com/kata-containers/runtime/issues/2982
 )
 sha512sums=(
   4680a524e674cb1fb34e61a0ff0ed9d9535c90527f01342e426deeb5a494984c22cdfa1de4c7e6082ade5898d4108b7f0a6fd982220d6d3e1e0f20c0b66c6cbc
   94d53f9e8d918cf0e439a695fa1ab95734da0e5dbc3a7a0148ba3221520cb66086276772c11dc244216693692007b323f85fb33570450f033e4289466d1cab4f
   d0241edaaba9f7df15c4daa1313b43d1acc365233455c5d71096cf2fc3d036e3849a93f2bc60c80b1f60859b6090b9711b2e357e7dc6ff7948ca5e961cebb7b6
   5818ba9962bfd541e162f9091609d2fc776accb94c2f580ef4cf11483a9d7dd6e900f235619581dacba777d042b483886bc013d11a6cd36b045e3c6c0ee2b7d2
+  87568f7db71a816f4953245af4b302da2f0a19543a706bce9d84e9c7e9de8f6ef54f410e426f05c4faf46bcfb330f802fa8261848beda3aaa965bfc11408a5ca
 )
 b2sums=(
   4c6b4a9e2beff8ce04c82fc3b02d0e0e22db1eaff8d703ecc737fc54fd99fba21687f821bc0dd0579009364ceeff2c7503e1bf0ed6a958451a6a4047430c2dd6
   5b1ea0dd0eff23d4956a5e7d8fac1a0d87890248f8a851fde536a29660edb31e876a55c0c95598b829bf00ba154de25b8720bcb5fe5edd61e7c36425fe4bffe5
   48bd3e6bea66c8157b7965d8840d5f812db65e865ec4dee7897ebfd9cd4ff16a7043e41faeb62444944e1be14d2278fef0ff0841f3f404c17987b9bdf8bd54f3
   4eefe311f1c8110cd55397828eec5a2d01f8156c4fc17526255fdf1f05ca11dbeafb3155e0be9ed15668faf15103d1deb4bab83a8dff9721a2e7baf1b1664229
+  d4f55b660a26ff6dc9e9a7f4eab80f3a45a228b9780054ae0a8d1080ca8db29333818e9e83235c4e6a128117473fe8fcb8f9e5831042aaf71d4defca09808ef2
 )
 
 prepare(){
@@ -45,6 +48,8 @@ prepare(){
     rm -rf "${srcdir}/src/${_gh_org}/${i}"
     mv "${srcdir}/${i}-${_pkgver}" "${srcdir}/src/${_gh_org}/${i}"
   done
+  cd "${srcdir}/src/${_gh_org}/runtime"
+  patch -p1 <"${srcdir}/3082.patch"
 }
 
 build(){