From 84d4c4359f5541cb1d2c4ddfbcd1de8336a3aeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 10 Nov 2022 17:46:52 +0100 Subject: [PATCH 1/3] gvisor-bin: Add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7461add --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/runsc +/containerd-shim-runsc-v1 From 91d0a3b60061be406203a8535dcd363591988492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 23 Nov 2022 17:58:12 +0100 Subject: [PATCH 2/3] Use unique file names for sources --- .SRCINFO | 8 ++++---- PKGBUILD | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ed60123..bfac273 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -9,12 +9,12 @@ pkgbase = gvisor-bin optdepends = docker: for Docker runtime support provides = gvisor conflicts = gvisor - source_x86_64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/runsc - source_x86_64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/containerd-shim-runsc-v1 + source_x86_64 = runsc-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/runsc + source_x86_64 = containerd-shim-runsc-v1-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/containerd-shim-runsc-v1 sha512sums_x86_64 = f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511 sha512sums_x86_64 = 3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956 - source_aarch64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/runsc - source_aarch64 = https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/containerd-shim-runsc-v1 + source_aarch64 = runsc-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/runsc + source_aarch64 = containerd-shim-runsc-v1-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/containerd-shim-runsc-v1 sha512sums_aarch64 = 87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7bac2f9aa678b8bc5d234dedd9ad5430fe38d0e3df77d65b10589e99f21bdf0516d80b5 sha512sums_aarch64 = 0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60 diff --git a/PKGBUILD b/PKGBUILD index 8d7375e..3e0d707 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,12 +18,12 @@ conflicts=( "${pkgname%-bin}" ) source_x86_64=( - "https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgbin" - "https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgshim" + "$_pkgbin-x86_64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgbin" + "$_pkgshim-x86_64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/x86_64/$_pkgshim" ) source_aarch64=( - "https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin" - "https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim" + "$_pkgbin-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin" + "$_pkgshim-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim" ) sha512sums_x86_64=('f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511' '3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956') @@ -31,6 +31,6 @@ sha512sums_aarch64=('87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7b '0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60') package() { - install -Dm 755 "$_pkgbin" "$pkgdir/usr/bin/$_pkgbin" - install -Dm 755 "$_pkgshim" "$pkgdir/usr/bin/$_pkgshim" + install -Dm 755 "$_pkgbin-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgbin" + install -Dm 755 "$_pkgshim-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgshim" } From 704e621eac5f834674e972f7fb4cee988643efc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 8 Dec 2022 21:18:06 +0100 Subject: [PATCH 3/3] upgpkg: gvisor-bin 20221205.0-1 upstream release --- .SRCINFO | 18 +++++++++--------- .gitignore | 4 ++-- PKGBUILD | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bfac273..d9d686b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gvisor-bin pkgdesc = OCI container sandbox runtime focused on security, efficiency, and ease of use - pkgver = 20221102.1 + pkgver = 20221205.0 pkgrel = 1 url = https://gvisor.dev arch = x86_64 @@ -9,13 +9,13 @@ pkgbase = gvisor-bin optdepends = docker: for Docker runtime support provides = gvisor conflicts = gvisor - source_x86_64 = runsc-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/runsc - source_x86_64 = containerd-shim-runsc-v1-x86_64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/x86_64/containerd-shim-runsc-v1 - sha512sums_x86_64 = f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511 - sha512sums_x86_64 = 3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956 - source_aarch64 = runsc-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/runsc - source_aarch64 = containerd-shim-runsc-v1-aarch64-20221102.1::https://storage.googleapis.com/gvisor/releases/release/20221102.1/aarch64/containerd-shim-runsc-v1 - sha512sums_aarch64 = 87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7bac2f9aa678b8bc5d234dedd9ad5430fe38d0e3df77d65b10589e99f21bdf0516d80b5 - sha512sums_aarch64 = 0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60 + source_x86_64 = runsc-x86_64-20221205.0::https://storage.googleapis.com/gvisor/releases/release/20221205.0/x86_64/runsc + source_x86_64 = containerd-shim-runsc-v1-x86_64-20221205.0::https://storage.googleapis.com/gvisor/releases/release/20221205.0/x86_64/containerd-shim-runsc-v1 + sha512sums_x86_64 = 71cc1902409048437c71755c51a351d986c6280dd2872961efd87beebf96a00b87013bc02697594f33053e376a8f17bbb24e67682ae48769a24a23d2d5555aaa + sha512sums_x86_64 = 03c8ae69c35d54296ed5064d8d7769a984a9b82b82e2edbdee4186d07cb363cb0db8c704458909a989f947ebbaa2da04f204277351d227868f4a2deedf3b4965 + source_aarch64 = runsc-aarch64-20221205.0::https://storage.googleapis.com/gvisor/releases/release/20221205.0/aarch64/runsc + source_aarch64 = containerd-shim-runsc-v1-aarch64-20221205.0::https://storage.googleapis.com/gvisor/releases/release/20221205.0/aarch64/containerd-shim-runsc-v1 + sha512sums_aarch64 = 186a4efd729b956e06ff19666b0dbbcc4b71ef9edba57a1f68db627c8d60eab2725be2d4814e62e4ba2950d8a783f479c259c7af5d81121fdc7fcd6f4d59efc8 + sha512sums_aarch64 = 9a9b9be295a3bbf123f7738ea3a805505098eed2966f074344e81a62691e05bc2c4264000adb2e7460e3813f8b45d573eb0863d41d0a2729c2a62bc7610be59e pkgname = gvisor-bin diff --git a/.gitignore b/.gitignore index 7461add..24cb63c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/runsc -/containerd-shim-runsc-v1 +/runsc-* +/containerd-shim-runsc-v1-* diff --git a/PKGBUILD b/PKGBUILD index 3e0d707..2fb0a8b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname='gvisor-bin' _pkgbin='runsc' _pkgshim='containerd-shim-runsc-v1' -pkgver=20221102.1 +pkgver=20221205.0 pkgrel=1 pkgdesc='OCI container sandbox runtime focused on security, efficiency, and ease of use' arch=('x86_64' 'aarch64') @@ -25,10 +25,10 @@ source_aarch64=( "$_pkgbin-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin" "$_pkgshim-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim" ) -sha512sums_x86_64=('f47a15449cd2a4b25dc768e4d9275d67c22acda6ebbc46270c38f5f135143f7551475168862b846a408f3858ee7edf725861a6bb3ce9ef2c783d1cab6d177511' - '3b8bb9453dfc8cad3b2a1c484d9acb6766c7900d6869e1696214216a0fab994e55409e4065267544a360283b2c824790f605d89749674ddb68dd58086f44f956') -sha512sums_aarch64=('87a39bb2e2e87390f6c6c38dbc4bdcced62d07af9128ddead7b0b46bc7bac2f9aa678b8bc5d234dedd9ad5430fe38d0e3df77d65b10589e99f21bdf0516d80b5' - '0ec5bd37b91a921bdeb26e92251f37d6c6adba4e2176973017b592e229c7512aa1765be4c4a87be44dfbb6bb30827b05f7e1551eff98ea006499317dec4a9e60') +sha512sums_x86_64=('71cc1902409048437c71755c51a351d986c6280dd2872961efd87beebf96a00b87013bc02697594f33053e376a8f17bbb24e67682ae48769a24a23d2d5555aaa' + '03c8ae69c35d54296ed5064d8d7769a984a9b82b82e2edbdee4186d07cb363cb0db8c704458909a989f947ebbaa2da04f204277351d227868f4a2deedf3b4965') +sha512sums_aarch64=('186a4efd729b956e06ff19666b0dbbcc4b71ef9edba57a1f68db627c8d60eab2725be2d4814e62e4ba2950d8a783f479c259c7af5d81121fdc7fcd6f4d59efc8' + '9a9b9be295a3bbf123f7738ea3a805505098eed2966f074344e81a62691e05bc2c4264000adb2e7460e3813f8b45d573eb0863d41d0a2729c2a62bc7610be59e') package() { install -Dm 755 "$_pkgbin-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgbin"