runc: update to rc95

Updating to the latest runc, which includes the following commits:

   37767c05 ci: lint: show all errors in PRs
   07ca0be0 *: clean up remaining golangci-lint failures
   00119c85 integration: add repeated "runc update" test
   d0f2c25f cgroup2: devices: replace all existing filters when attaching
   98a3c0e4 cgroup2: devices: switch to emulator for cgroupv1 parity
   dcc1cf7c devices: add emulator.Rules shorthand
   54904516 libcontainer: fix integration failure in "make test"
   c7c70ce8 *: clean t.Skip messages
   a95237f8 libctr/cg/systemd: export rangeToBits
   df0206a6 errcheck: utils
   0c65f833 errcheck: signals
   3b31e3ea errcheck: tty
   b45fbd43 errcheck: libcontainer
   463ee5e1 errcheck: libcontainer/nsenter
   7e7ff872 errcheck: libcontainer/configs
   a8995053 errcheck: libcontainer/integration
   b93666eb libct/cg/fs2: setFreezer: wait until frozen
   1069e4e9 libct/cg/fs2: optimize setFreezer more
   5d193188 libct/cg/fs2: optimize setFreezer
   8a7a374f VERSION: back to development
   b9ee9c63 VERSION: release v1.0.0-rc95
   0ca91f44 rootfs: add mount destination validation
   c61f6062 libcontainer: honor seccomp defaultErrnoRet
   d519da5e Dockerfile, Vagrantfile.centos7, .github: bats 1.3.0
   bdad2859 Dockerfile, Vagrantfile.centos7: use go 1.16
   f96530f2 EMERITUS: recognise previous maintainers
   c73a6626 VERSION: back to development
   2c7861bc VERSION: release v1.0.0-rc94
   12e9cac9 Vagrantfile.fedora: set Delegate=yes
   ac70a9a1 tests/int: run rootless_cgroup tests for v2+systemd
   601cf582 tests/int/cgroups: don't check for hugetlb
   40b97919 tests/int: enable/use requires cgroups_<ctrl>
   44fcbfd6 tests/int/helpers: generalize require cgroups_freezer
   353f2ad1 tests/int/update.bats: don't set cpuset in setup
   4f8ccc5f libct/cg/sd/v2: call initPath from Path
   0ed1f802 tests/int/helpers: rm old code
   af2e03c5 ci/gha: bump shellcheck 0.7.1 -> 0.7.2
   2d1bb91d ci/gha: bump shfmt 3.2.0 -> 3.2.4
   a7feb423 libct/int: add TestFdLeaksSystemd
   c7f847ed libct/cg/sd: use global dbus connection
   99c5c504 libct/cg/sd: introduce and use getManagerProperty
   0fabed76 libct/int/checkpoint_test: use kill(0) for pid check
   7eb1405b libct/int/checkpoint_test: use waitProcess helper
   72d7a824 libct/int/checkpoint_test: use t.Helper
   bcca7968 libct/int: simplify/fix showing errors
   524abc59 freezer: add delay after freeze
   e1d842cf libct/intelrdt: fix unit test
   541fc19e Makefile: allow overriding go command by environment
   06a9ea36 script/release.sh: add -a to force rebuild
   91b01682 Update golang.org/x/sys to add linux/ppc support
   ee4612bc CI: enable Go 1.13 again
   e2dd9220 go.mod: demote to Go 1.13
   45f49e8f libcontainer: avoid using t.Cleanup
   1a659bc6 Revert "Makefile: rm go 1.13 workaround"
   abf12ce0 libc/cg: improve Manager docs
   3f659467 libct/cg: make Set accept configs.Resources
   af0710a0 libct/cg/sd/v2: fix Set argument
   850b2c47 libct/cg/fscommon.OpenFile: speed up ro case
   71a8aee8 cgroups/systemd: replace deprecated dbus functions
   47ef9a10 libct/cg/sd: retry on dbus disconnect
   6122bc8b Privatize NewUserSystemDbus
   15fee989 libct/cg/sd: add renew dbus connection
   bacfc2c2 libct/cg/sd: add isDbusError
   cdbed6f0 libct/cg/sd: add dbus manager
   9efd8466 libct/cg/fscommon.OpenFile: reverse checks order
   0bee5e0b libct/cg/fs: add GetStats benchmark
   7e7eb1c3 CI: update Fedora to 34
   d3cee12a cloned_binary: switch from #error to #warning for SYS_memfd_create
   23e3794d checkpoint: validate parent path
   fcd7fe85 libct/cg/fs/freezer: make sure to thaw on failure
   0216716c tests/int: add a case for cgroupv2 mount
   5ffcc568 tests/int: use bfq test with rootless
   ff692f28 Fix cgroup2 mount for rootless case
   3826db19 libct/rootfs/mountCgroupV2: minor refactor
   1e476578 libct/rootfs: introduce and use mountConfig
   deb8a8dd libct/newInitConfig: nit
   2192670a libct/configs/validate: validate mounts
   1f1e91b1 libct/specconv: check mount destination is absolute
   73f22e7f libcontainer/cgroups/systemd: replace use of deprecated dbus.New()
   aa622723 tiny fix iterative checkpoint test case
   ee3b563d Add cfs throttle stats to cgroup v2
   6faed0e4 libct/int: use ok(t, err)
   af3c5699 libct/int: remove unused code
   7b802a7d libct/int: better test container names
   9f3d7534 logging: enable file/line info if --debug is set
   31dd1e49 tests/int: add rootless + host pidns test case
   a2050ea4 runc run: fix start for rootless + host pidns
   0f8d2b6b libct/cg/fs2.Stat: don't look for available controllers
   85416b87 libct/cg/fs2.statPids: fall back directly
   10f9a982 libct/cg/fs2/getPidsWithoutController: optimize
   6121f8b6 libct/cg/fs2.Stat: always call statCpu
   9455395b libct/cg/fs2/memory.Stat: add usage for root cgroup
   a9c47fe7 libct/cg/fs[2]/getMemoryData[V2]: optimize
   b99ca25a libct/cg/fs2/memory: fix swap reporting
   c8e0486f Fix oss-fuzz build

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

2 files changed, 7 insertions, 7 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 163501ae..0090a589 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
@@ -13,16 +13,16 @@ Index: git/src/import/Makefile
 ===================================================================
 --- git.orig/src/import/Makefile
 +++ git/src/import/Makefile
-@@ -21,7 +21,7 @@
+@@ -25,7 +25,7 @@
                 endif
         endif
  endif
--GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
-+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
+-GO_BUILD := $(GO) build -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
++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 $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
+ 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)"
-@@ -38,7 +38,6 @@
+@@ -42,7 +42,6 @@
  
  static:
         $(GO_BUILD_STATIC) -o runc .
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
index f3ff9a86..a0602a2d 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 = "fce58ab2d5c488bc573d02712db476a6daa9a60c"
+SRCREV = "bfcbc947d5d11327f2680047e2e6e94f4ee93d2a"
 SRC_URI = " \
     git://github.com/opencontainers/runc;branch=master \
     file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
     "
-RUNC_VERSION = "1.0.0-rc93"
+RUNC_VERSION = "1.0.0-rc95"
 
 CVE_PRODUCT = "runc"