app-containers/runc: Update app-containers/runc to 1.1.7
BUG=b/277778581
TEST=presubmit
RELEASE_NOTE=Updated app-containers/runc to 1.1.7.
cos-patch: lts-refresh
Change-Id: I66a35985e9074280fb7fbf14f7f5c2cfbdc36ffe
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/49690
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
diff --git a/project-lakitu/app-containers/runc-test/Manifest b/project-lakitu/app-containers/runc-test/Manifest
index ba2156b..1150d79 100644
--- a/project-lakitu/app-containers/runc-test/Manifest
+++ b/project-lakitu/app-containers/runc-test/Manifest
@@ -1 +1 @@
-DIST runc-test-1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
+DIST runc-test-1.1.7.tar.gz 2511464 BLAKE2B 63f09052659636b62185abbb178f7e104d22125190899e80e71ed2ba35567eb855abf786d3c7fff3dd9a1ab43ee282fcaecb6650cd8a1ce49c05acefd7c12cde SHA512 e3a18f04ac2c3553a815074ca64e04cfd71af54d78edbd4a13819f187476f96d7311c23bb63fb5c311b91865db4540985a6f9daa84819b0bac5f023b3b2a832c
diff --git a/project-lakitu/app-containers/runc-test/runc-test-1.1.4-r1.ebuild b/project-lakitu/app-containers/runc-test/runc-test-1.1.4-r1.ebuild
deleted file mode 120000
index cda875d..0000000
--- a/project-lakitu/app-containers/runc-test/runc-test-1.1.4-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-runc-test-1.1.4.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-containers/runc-test/runc-test-1.1.7-r1.ebuild b/project-lakitu/app-containers/runc-test/runc-test-1.1.7-r1.ebuild
new file mode 120000
index 0000000..e7d44ff
--- /dev/null
+++ b/project-lakitu/app-containers/runc-test/runc-test-1.1.7-r1.ebuild
@@ -0,0 +1 @@
+runc-test-1.1.7.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-containers/runc-test/runc-test-1.1.4.ebuild b/project-lakitu/app-containers/runc-test/runc-test-1.1.7.ebuild
similarity index 100%
rename from project-lakitu/app-containers/runc-test/runc-test-1.1.4.ebuild
rename to project-lakitu/app-containers/runc-test/runc-test-1.1.7.ebuild
diff --git a/project-lakitu/app-containers/runc/Manifest b/project-lakitu/app-containers/runc/Manifest
index 1aab0cf..07cf409 100644
--- a/project-lakitu/app-containers/runc/Manifest
+++ b/project-lakitu/app-containers/runc/Manifest
@@ -1 +1 @@
-DIST runc-1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
+DIST runc-1.1.7.tar.gz 2511464 BLAKE2B 63f09052659636b62185abbb178f7e104d22125190899e80e71ed2ba35567eb855abf786d3c7fff3dd9a1ab43ee282fcaecb6650cd8a1ce49c05acefd7c12cde SHA512 e3a18f04ac2c3553a815074ca64e04cfd71af54d78edbd4a13819f187476f96d7311c23bb63fb5c311b91865db4540985a6f9daa84819b0bac5f023b3b2a832c
diff --git a/project-lakitu/app-containers/runc/runc-1.1.4-r4.ebuild b/project-lakitu/app-containers/runc/runc-1.1.4-r4.ebuild
deleted file mode 120000
index d27092d..0000000
--- a/project-lakitu/app-containers/runc/runc-1.1.4-r4.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-./runc-1.1.4.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-containers/runc/runc-1.1.7-r1.ebuild b/project-lakitu/app-containers/runc/runc-1.1.7-r1.ebuild
new file mode 120000
index 0000000..62cfd0d
--- /dev/null
+++ b/project-lakitu/app-containers/runc/runc-1.1.7-r1.ebuild
@@ -0,0 +1 @@
+runc-1.1.7.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-containers/runc/runc-1.1.4.ebuild b/project-lakitu/app-containers/runc/runc-1.1.7.ebuild
similarity index 95%
rename from project-lakitu/app-containers/runc/runc-1.1.4.ebuild
rename to project-lakitu/app-containers/runc/runc-1.1.7.ebuild
index 4e3fe09..05e77f0 100644
--- a/project-lakitu/app-containers/runc/runc-1.1.4.ebuild
+++ b/project-lakitu/app-containers/runc/runc-1.1.7.ebuild
@@ -54,9 +54,6 @@
PATCHES=(
"${FILESDIR}/1.0.0-Do-not-clone-proc-self-exe-in-case-of-lakitu.patch"
- "${FILESDIR}/1.1.4-fix-CVE-2023-27561.patch"
- # Remove after upgrading to 1.1.5
- "${FILESDIR}/1.1.4-fix-CVE-2023-25809.patch"
)
src_compile() {
diff --git a/project-lakitu/profiles/base/package.mask b/project-lakitu/profiles/base/package.mask
index 6c38aa6..507d8be 100644
--- a/project-lakitu/profiles/base/package.mask
+++ b/project-lakitu/profiles/base/package.mask
@@ -8,6 +8,3 @@
# Mask sys-auth/pambase from portage-stable
sys-auth/pambase::portage-stable
<dev-lang/python-3.6
-# Mask app-containers/runc greater than or equal to v1.1.6
-# This is because of b/280648390
->=app-containers/runc-1.1.6
