From 709240d7034c367992c411ce04fe7a67d1f80e21 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 8 Mar 2022 08:13:20 -0500 Subject: lxc: update to 4.0.12 We refresh our wget -> curl patch for context, but otherwise, no other changes are required. Bumping lxc to version lxc-4.0.12-8-g5ba5725cb, which comprises the following commits: 5ba5725cb cgroups: modify cgroup2 attach logic 1e4631641 ttys: ensure container_ttys= env variable is set correctly 8ef019a6c doc: Fix reverse allowlist/denylist in Japanese man page f1c4a17e7 cgroups: log fd of newly created cgroup f7446b4e1 cgroups: check that opened file descriptor is a cgroup filesystem 71ba7f656 doc: Fix reverse allowlist/denylist f314419d1 lxc-checkconfig: Fix bashism ca4c25c6e lxc-net: don't start by default inside lxc 7e37cc96b Release LXC 4.0.12 d678aa61e lxccontainer: allow xdev when creating the container dir bc61d2354 github: Clear default ACL on /home fb0e0b3dd github: add systemd-coredump 53e0d390c github: more detailed compilation instructions db84a8b6b github: log system info e9282b6a6 github: ensure system liblxc is wiped ad8a3bd68 lxccontainer: properly wrap lxcapi_create() bceb81cd2 build: simplify thread local storage handling 919da35b0 build: only enable LTO for regular builds d0a1e9c44 lxccontainer: simplify partial file creation 62b5c0051 lxccontainer: improve create_partial() bfe24cb6a lxccontainer: improve do_lxcapi_create() 1a5c236ac lxccontainer: improve do_lxcapi_save_config() bae0d7196 conf: log termination status 4eb09aaad conf: improve userns_exec_mapped_root() 928943280 github: stop installing gnupg now that it's unused 7c70b0d14 lxc-download: Rely on HTTPS only 199d2077c Update README.md: Fix broken link (403 Forbidden) 0b6b230e3 attach: don't pointlessly call cgroup_init() dbef704fb commands: log command during file descriptor retrieval 733f9c909 lxc-checkconfig.in: CONFIG_NF_NAT_IPV4 was removed from the kernel 2019-03-03 ce392e230 (trivial) Fix error message, failure was connect not bind 5628bff79 seccomp: close seccomp notifier fd in cleanup handler 1f2af83a9 seccomp: only guard seccomp notify behind HAVE_DECL_SECCOMP_NOTIFY_FD 9451303d5 api-extensions: don't advertise seccomp notify support if it's not compiled in 23d07c315 use 2 sysfs instances for sys:mixed 0dd3258bd Revert "api: ->save_config() doesn't need to create container dir" 93edd510a api: ->save_config() doesn't need to create container dir 28b2e04f1 cgroups: fix compiler warning 15515f9a3 Revert "initutils: use vfork() in lxc_container_init()" 41d2530d1 macro: ensure necessary io_uring flags are defined fc4e948c9 autotools: Avoid multiple liblxc.so with --enable-pam a616a311a build: refuse to compile with unsupported liburing version 93be4e512 tests: add lxc.proc.* test d8027e49c tests: add lxc.sysctls.* test 6f580343e test: improve logging helpers a10ff3418 conf: improve logging setting sysctl and /proc// parameters 334cf7beb conf: apply /proc/sys and /proc// parameters 1b74e01ad tests: include config.h c36379431 build: move _FILE_OFFSET_BITS to common option f24c234ee start: log signal name and number 4915c9112 process_utils: add signal_name() helper 78baec37d build: improve liburing support detection 1a102b310 mainloop: make ifdefs easier to follow cf931928f Replace last occurence of 'which' with 'command -v' 1ec5939b4 Replace deprecated backticks with $() construct fdfb4a13d Replace 'which' with 'command -v' in tests too 71743e811 start: check event loop type before closing fd f69e6b4d3 mainloop: make sure that descr->ring is allocated 1a8895855 Replace 'which' with 'command -v' 9219277cc build: add io-uring-event-loop option d04eb166c build: add static libcap to output bc51048b7 confile: don't use path_simplify() on lxc.{execute,init}.cmd 48728e988 conf: add cgroup2, cgroup2:ro, cgroup2:force, cgroup2:ro:force options 4d3aad49d AUTHORS: Update to point to git history e328a988e conf: handle kernels without or not using SMT d40b0deb4 doc: fix typo in English lxc.container.conf(5) 49fab27fc doc: Add lxc.sched.core to Japanese lxc.container.conf(5) 1ad1cab80 doc: add loglevels to ja and ko common options 1505f0780 conf: make it more obvious how auto-mount flags are defined 429233cf0 criu: support restoring containers with pre-created veth devices 48e079bf3 Release LXC 4.0.11 Signed-off-by: Bruce Ashfield --- .../files/templates-use-curl-instead-of-wget.patch | 26 ++++++++++------------ recipes-containers/lxc/lxc_git.bb | 4 ++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch index 4556293a..f06e5969 100644 --- a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch +++ b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch @@ -12,11 +12,11 @@ Signed-off-by: Yanfei Xu templates/lxc-download.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/templates/lxc-download.in b/templates/lxc-download.in -index e8570692a..f7291b0cc 100755 ---- a/templates/lxc-download.in -+++ b/templates/lxc-download.in -@@ -75,9 +75,9 @@ cleanup() { +Index: git/templates/lxc-download.in +=================================================================== +--- git.orig/templates/lxc-download.in ++++ git/templates/lxc-download.in +@@ -59,9 +59,9 @@ fi } @@ -28,18 +28,19 @@ index e8570692a..f7291b0cc 100755 return 0 fi done -@@ -86,8 +86,8 @@ wget_wrapper() { +@@ -70,8 +70,9 @@ } download_file() { - if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then -- if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "http://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then +- if [ "$3" = "noexit" ]; then + if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then + if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "http://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then - if [ "$3" = "noexit" ]; then - return 1 - else -@@ -277,7 +277,7 @@ while :; do ++ if [ "$3" = "noexit" ]; then + return 1 + else + echo "ERROR: Failed to download https://${DOWNLOAD_SERVER}/$1" 1>&2 +@@ -176,7 +177,7 @@ done # Check for required binaries @@ -48,6 +49,3 @@ index e8570692a..f7291b0cc 100755 if ! command -V "${bin}" >/dev/null 2>&1; then echo "ERROR: Missing required tool: ${bin}" 1>&2 exit 1 --- -2.27.0 - diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb index 94a1e1e1..397ff364 100644 --- a/recipes-containers/lxc/lxc_git.bb +++ b/recipes-containers/lxc/lxc_git.bb @@ -50,8 +50,8 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-4.0 \ file://lxc-net \ " -SRCREV = "48e079bf318982ae7d5684feeb7358870fa71c10" -PV = "4.0.11+git${SRCPV}" +SRCREV = "5ba5725cb4a210c25707beeca64fde5f561d1c71" +PV = "4.0.12+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf