runc-opencontainers: update to v1.0.2

We refresh our patch context and pickup the following commits:

Bumping runc to version v1.0.2-2-g04bcb7c7, which comprises the following commits:

    86d83333 VERSION: back to development
    52b36a2d VERSION: release 1.0.2
    8ec57628 libct/cg/sd/v1: add SkipFreezeOnSet knob
    1850dc16 libct/cg/sd/v1: add freezeBeforeSet unit test
    4ce440f2 libct/cg/sd/v1: Fix unnecessary freeze/thaw
    13b45cb4 libct/nsenter: fix unused-result warning
    7cf1952f libct/nsenter: fix logging race in nsexec
    e2e5267c [1.0] script/release.sh: make builds reproducible
    960182fd libct/seccomp: skip redundant rules
    4c70105b libct/cg/v1: workaround CPU quota period set failure
    1d454045 Do not use Vagrant for CentOS 7/8
    c8d8fd5b tests/rootless.sh: fixup for "update rt" test
    257018e7 tests/int: fix "update rt period and runtime" for rootless
    76c047f1 Evaluate Cirrus CI for Vagrant tests
    466d1a1a VERSION: back to development
    4144b638 VERSION: release 1.0.1
    4efb7a69 libct/cg/sd: add TestPodSkipDevicesUpdate
    82d3eb69 libct/cg/sd: TestFreezePodCgroup: rm explicit freeze
    2fc2e3d6 libct/cg/sd/v1: Set: avoid unnecessary freeze/thaw
    ef0aa849 libct/int/TestFreeze: test freeze/thaw via Set
    01cd4b5f libct/int: allow subtests
    22b2ff0f libct/cg/sd/v1: Set: don't overwrite r.Freezer
    04edd79d libct/cg/sd: Don't freeze cgroup on cgroup v2 Set
    298a3100 Update device update tests
    257723b3 ci/gha: run on release-* branches after a push
    4dc207a6 cgroupv2: ebpf: ignore inaccessible existing programs
    90d01a04 vendor: update github.com/cilium/ebpf
    3f40fbff libct/cg/sd: Add freezer tests
    c1a5b3e1 libct/cg/fs/freezer.GetState: report current cgroup state
    0a5d8ba4 libct/user: fix parsing long /etc/group lines
    5fd7b3b7 libct/user: ParseGroupFilter: use TrimSpace
    0025bf68 libct/user: use []byte more, avoid allocations
    3745b2be [1.0] retry unix.EINTR for container init process
    e99c0f5e tests/int/no_pivot: fix for new kernels
    84113eef VERSION: release runc 1.0.0
    29168172 tests/int/cgroups: add test for bfq per-device weight
    1036f3f9 libct/cg/fs2: set per-device io weight if available
    30d83d4d libct/cg/fs/blkio: do not set weight == 0
    d7fc3028 libct/cg/fs*: mark {Open,Read,Write}File as deprecated
    8f1b4d4a libct/cg: mv fscommon.{Open,Read,Write}File to cgroups
    322c8fd3 Returns clearer error message for setenv
    46940ed8 update cilium/ebpf to fix haveBpfProgReplace() check
    6339d8a0 libcontainer/cgroups/fs/blkio: support BFQ weight[_device]
    01f5dcae build(deps): bump tim-actions/get-pr-commits from 1.0.0 to 1.1.0
    bd8e0701 libct/cg/sd: fix "SkipDevices" handling
    1b2abc89 github: workflows: fix tiny typo
    b31a9340 libcontainer: relax validation for absolute paths
    dbb35411 configs/validator: move cgroup validation to the list of checks
    9573e4b6 libct/cg/fs: don't forget to close a file
    9ebc573a cgroupv2: ebpf: debug info when detaching programs in fallback mode
    a3ca7b47 cgroupv2: ebpf: check for BPF_F_REPLACE support and degrade gracefully
    d06bda60 libct/cg/sd/dbus: fix NewDbusConnManager
    535f25c4 Allow restoring with a different LSM profile
    508f5bf6 libct/int: add device update test
    8fe3dfbb libcontainer/system: remove alias for deprecated RunningInUserNS
    3f23a736 libcontainer/configs: remove stubs for deprecated Devices funcs
    b2d28c5d libct/cg/sd: fix dbus error handling
    bf7492ee runc update: skip devices
    c3831d64 libct/cg/fs/stats_util_test: use t.Helper
    9eb0371b libct/cg/fs/memory_test: fix formatting
    e969d421 libct/int/testPids: logging nits
    a5bd78ef vendor: willf/bitset@v1.1.11 -> bits-and-blooms/bitset@v1.2.0
    65cf0e61 Bump selinux to v1.8.2
    f99d252d docs/terminals.md: add troubleshooting
    49ea4b37 update crosbymichael email
    3e1bcb1f libcontainer/keys: var should be sessKeyID/ringID (golint)
    1fb56f9f libcontainer/cgroups/devices: if block ends with a return statement
    c2416fb4 libcontainer/system: fix godoc (golint)
    9be156cb libcontainer/devices: fix godoc (golint)
    340fdd93 libcontainer/nsenter: fix captalization (golint)
    81fc5c87 libcontainer/user: fix capitalization (golint)
    e204d6a9 libcontainer/configs: add / fix godoc (golint)
    c0643046 libcontainer/apparmor: split api (exported) from implementation
    02fb18ed libcontainer/user: remove unused ErrUnsupported
    9e964dfc build(deps): bump github.com/opencontainers/selinux from 1.8.0 to 1.8.1
    470610d0 build(deps): bump github.com/cilium/ebpf from 0.5.0 to 0.6.0
    31f58829 build(deps): bump github.com/coreos/go-systemd/v22 from 22.3.1 to 22.3.2
    c836265b build(deps): bump github.com/sirupsen/logrus from 1.7.0 to 1.8.1
    074aa044 build(deps): bump google.golang.org/protobuf from 1.25.0 to 1.26.0
    7ca54562 Enable dependabot
    e6048715 Use gofumpt to format code
    1eea9253 cgroup2: io: add io.stats parsing test
    0fef122f cgroup2: io: handle 64-bit values correctly on 32-bit architectures
    efca32c7 cgroup2: io: map io.stats to v1 blkio.stats correctly
    49d293a5 cgroup2: capitalize io stats read and write Op values
    0e16e7c2 libct/cg/sd: add SkipDevices unit test
    f5a2c9cc tests/int/dev: only call lsblk once
    aa934af0 runc -v: set default for, always show main.version
    37767c05 ci: lint: show all errors in PRs
    07ca0be0 *: clean up remaining golangci-lint failures
    752e7a82 libct/cg/sd: fix SkipDevices for systemd
    fdc28957 Makefile: use git describe for $COMMIT
    33c9f8b9 libct/cg/sd: return error from stopUnit

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 18 insertions, 13 deletions

diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
index 0090a589..c855d7b5 100644
--- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
+++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch
@@ -1,19 +1,21 @@
-From d2c47a973f354ffd505bb4e809c59e57b543726d Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 6 Aug 2019 19:01:45 +0800
+From 0fe50d2ca4517f5e3070585040f35ace413acd44 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Tue, 24 Aug 2021 11:38:23 -0400
 Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty
  from static
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+[bva: refreshed for release 1.0.2]
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 ---
  Makefile | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-Index: git/src/import/Makefile
-===================================================================
---- git.orig/src/import/Makefile
-+++ git/src/import/Makefile
-@@ -25,7 +25,7 @@
+diff --git a/src/import/Makefile b/src/import/Makefile
+index efbddf0d..4b174c80 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -24,7 +24,7 @@ ifeq ($(shell $(GO) env GOOS),linux)
                 endif
         endif
  endif
@@ -21,8 +23,8 @@ Index: git/src/import/Makefile
 +GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
         -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
  GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
-        -ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
-@@ -42,7 +42,6 @@
+        -ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+@@ -41,7 +41,6 @@ recvtty:
  
  static:
         $(GO_BUILD_STATIC) -o runc .
@@ -30,3 +32,6 @@ Index: git/src/import/Makefile
  
  release:
         script/release.sh -r release/$(VERSION) -v $(VERSION)
+-- 
+2.19.1
+
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index a0602a2d..37955403 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,10 +1,10 @@
 include runc.inc
 
-SRCREV = "bfcbc947d5d11327f2680047e2e6e94f4ee93d2a"
+SRCREV = "86d83333d765f4535e4898d6778388dab715eb7c"
 SRC_URI = " \
-    git://github.com/opencontainers/runc;branch=master \
+    git://github.com/opencontainers/runc;branch=release-1.0 \
     file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
     "
-RUNC_VERSION = "1.0.0-rc95"
+RUNC_VERSION = "1.0.2"
 
 CVE_PRODUCT = "runc"