From ade5ccad131cb5d0b560f8d1e918b06eebd02acb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 16 2018 15:45:37 +0000 Subject: import runc-1.0.0-37.rc5.dev.gitad0f525.el7 --- diff --git a/.gitignore b/.gitignore index 90cf556..4634831 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/runc-4bb1fe4.tar.gz +SOURCES/runc-ad0f525.tar.gz diff --git a/.runc.metadata b/.runc.metadata index 7813385..6ad09fb 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -a4a4160775f6831926262c8a8a3aff0346aeaeba SOURCES/runc-4bb1fe4.tar.gz +fbc062e2b0cfe3b3acb1c934714672656fa92c89 SOURCES/runc-ad0f525.tar.gz diff --git a/SOURCES/bz1616112.patch b/SOURCES/bz1616112.patch new file mode 100644 index 0000000..1dcf669 --- /dev/null +++ b/SOURCES/bz1616112.patch @@ -0,0 +1,33 @@ +From 26ec8a9783cc5503a3a8928fa6eba5dd3e86ced1 Mon Sep 17 00:00:00 2001 +From: Mrunal Patel +Date: Tue, 14 Aug 2018 15:50:04 -0700 +Subject: [PATCH] Revert "libcontainer/rootfs_linux: minor cleanup" + +This reverts commit 1b27db67f13bccaaa325f8372069e15575988eb9. + +Signed-off-by: Mrunal Patel +--- + libcontainer/rootfs_linux.go | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go +index 7f852efce..cf715d664 100644 +--- a/libcontainer/rootfs_linux.go ++++ b/libcontainer/rootfs_linux.go +@@ -46,6 +46,7 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) { + return newSystemErrorWithCause(err, "preparing rootfs") + } + ++ setupDev := needsSetupDev(config) + for _, m := range config.Mounts { + for _, precmd := range m.PremountCmds { + if err := mountCmd(precmd); err != nil { +@@ -64,8 +65,6 @@ func prepareRootfs(pipe io.ReadWriter, iConfig *initConfig) (err error) { + } + } + +- setupDev := needsSetupDev(config) +- + if setupDev { + if err := createDevices(config); err != nil { + return newSystemErrorWithCause(err, "creating device nodes") diff --git a/SOURCES/change-default-root.patch b/SOURCES/change-default-root.patch index 733522d..5fe5f51 100644 --- a/SOURCES/change-default-root.patch +++ b/SOURCES/change-default-root.patch @@ -12,23 +12,27 @@ index 0313d8c..328798b 100644 EXAMPLE 1: To list containers created via the default "--root": diff --git a/main.go b/main.go -index 4642335..d58ccb4 100644 +index 278399a..0f49fce 100644 --- a/main.go +++ b/main.go -@@ -62,11 +62,11 @@ func main() { +@@ -62,7 +62,7 @@ func main() { v = append(v, fmt.Sprintf("spec: %s", specs.Version)) app.Version = strings.Join(v, "\n") - root := "/run/runc" + root := "/run/runc-ctrs" - if os.Geteuid() != 0 { + rootless, err := isRootless(nil) + if err != nil { + fatal(err) +@@ -70,7 +70,7 @@ func main() { + if rootless { runtimeDir := os.Getenv("XDG_RUNTIME_DIR") if runtimeDir != "" { - root = runtimeDir + "/runc" + root = runtimeDir + "/runc-ctrs" - } - } - + // According to the XDG specification, we need to set anything in + // XDG_RUNTIME_DIR to have a sticky bit if we don't want it to get + // auto-pruned. diff --git a/man/runc-list.8.md b/man/runc-list.8.md index f737424..107220e 100644 --- a/man/runc-list.8.md diff --git a/SPECS/runc.spec b/SPECS/runc.spec index dda07a5..914eb0a 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -1,18 +1,11 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 %global with_debug 1 -%global with_check 1 -%global with_unit_test 1 -%else %global with_devel 0 %global with_bundled 1 -%global with_debug 1 %global with_check 0 %global with_unit_test 0 -%endif %if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} @@ -30,12 +23,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://github.com/opencontainers/runc -%global commit0 4bb1fe4ace1a32d3676bb98f5d3b6a4e32bf6c58 +%global commit0 ad0f5255060d36872be04de22f8731f38ef2d7b1 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} Version: 1.0.0 -Release: 27.rc5.dev.git%{shortcommit0}%{?dist} +Release: 37.rc5.dev.git%{shortcommit0}%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: http//%{provider_prefix} @@ -43,11 +36,16 @@ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: 99-containers.conf Patch0: change-default-root.patch Patch1: 0001-Revert-Apply-cgroups-earlier.patch +Patch2: bz1616112.patch Requires: criu Requires(pre): container-selinux >= 2:2.2-2 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2 +%if 0%{?rhel} > 7 +BuildRequires: go-toolset-7-golang-bin +BuildRequires: go-toolset-7-runtime +%endif BuildRequires: git BuildRequires: go-md2man BuildRequires: libseccomp-devel @@ -159,6 +157,11 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +# Go Toolset +%if 0%{?rhel} > 7 +%{?enable_gotoolset7} +%endif + %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -286,6 +289,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Tue Aug 14 2018 Lokesh Mandvekar - 2:1.0.0-37.gitad0f525 +- Resolves: #1616112 + +* Fri Jun 15 2018 Dan Walsh - 2:1.0.0-36.gitb222ea4 +- Better handling of user namespace + +* Tue May 1 2018 Dan Walsh - 2:1.0.0-31.rc5.git0cbfd83 +- Fix issues between SELinux and UserNamespace + * Tue Apr 17 2018 Frantisek Kluknavsky - 1.0.0-27.rc5.dev.git4bb1fe4 - rebuilt, placed missing changelog entry back