From 51a891439b51d99e83a997ccd42754ad5fb1fc82 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 19 Jan 2023 15:19:59 -0500 Subject: lxc: update to v5.0.2 We drop a patch that has been merged upsream, and also bump the version to lxc-5.0.2, which comprises the following commits: d57173681 Release LXC 5.0.2 17c85aac6 Fix build error on sparc64 caused by using the gold linker b7dfb1312 lxc-default-cgns apparmor profile: allow overlay mounts 5cde898f4 lxc_user_nic: fix get_mtu() error handling 80553b5b4 Patching an incoming CVE (CVE-2022-47952) 1089f49c5 build: force linking against liblxc 0d2a03118 checkconfig: Fix filesystem capability check e17429580 checkconfig: Tweak cgroup handling 4ab76611d checkconfig: Tweak layout 0bca9bb18 checkconfig: Hide version if no lxc-start 957e0a5d9 checkconfig: Fix mixed tabs/spaces 4916a16bd src/lxc/meson.build: fix build without apparmor a330126b4 build: use cc.get_define to detect FS_CONFIG_* symbols c89be8325 cgroups: fix cgroup layout detection in __initialize_cgroups 7802f3647 state: additional check in lxc_wait to prevent OOB 4b434bf52 cgroups: check snprintf retval in unpriv_systemd_create_scope 0eca8d2ea cgroups: fix buffer out-of-bounds access in enable_controllers_delegation 4ce8345d6 network: always initialize struct nl_handler 28a1591cd apparmor: properly check lxc_strmmap ret value bd56c89ea github: fix coverity (add libpam-dev) a1ead0dcc github: fix coverity build 9e35b3ecd conf: ensure mount tunnel is a dependent mount 2ff447445 apparmor: allow shared mounts in start-container.in 58e878209 conf: create separate peer group for container's root 06b4612ee cgroups: only allocate user namespace if we have to 2662959b8 cgroups: use userns_exec_full() during cgroup removal 4dcc84c6b README: remove lgtm 748720ceb tests: lxc-test-reboot: Fix build on ia64 5749e2e20 Unroll IN_SET since the max usage is 2 elements check 495b1bbf4 tests: lxc-test-checkpoint-restore: use trap to do cleanup 77e08b887 tools: lxc-destroy: update help message for --force 9165ff1ed lxc/attach: Detect EACCES from execvp and convert to 126 exit status 011faff36 lxc-attach: Fix lost return codes of spawned processes that are killed 931693945 Update README.md a6287882e conf: allow cross-device links 8fa6d765a build(deps): bump actions/checkout from 2 to 3 e08c1b740 Update cifuzz.yml 0e9e64db8 fix error message when use tools with -? option f1a61a5f0 use sd_bus_call_method_async to replace the asyncv one ca863bd72 tree-wide: split open helpers into open_utils.h 02900160c build: prevent the inclusion of linux/mount.h with a hack 51b8763b0 mount_utils: remove conf.h include 460243f40 mount: move mount utilities from syscall_wrappers.h into mount_utils.h d5d7e2036 tree-wide: minimize liburing.h inclusion e2b8776bb meson: fix docbook2x detection d1dfce9c5 tree-wide: use struct open_how directly c9bca3326 tree-wide: use struct clone_args directly 497479ea3 tree-wide: wipe direct or indirect linux/mount.h inclusion 02f4bd00f build: check for FS_CONFIG_* header symbol in sys/mount.h c222fb567 gitignore: Simplify 22e8a7941 meson.build: strip newline for variable assignments d5600cf76 meson.build: strip newlines from git output 7d6b53438 src/lxc/meson.build: fix the static library path 1d5c7e771 build: drop build-time systemd dependency 59f69162c build: only build init.lxc.static if libcap is statically linkable 062c2d980 build: fix handling of dependancies to fix build on openSUSE 2a9743bba cgroups: fix -Waddress warning e510d6bd8 build: detect sys/pidfd.h availability b7b269680 build: detect where struct mount_attr is declared 5313e5048 meson.build: allow explicit distrosysconfdir 0539095ac Release LXC 5.0.1 a1329fefe README: update security mails 315d4cec6 meson.build: fix build without stack-protector aba631cd4 meson.build: fix build with -Dcapabilities=false c2ee9b440 src/lxc/log.h: fix STRERROR_R_CHAR_P d441ee585 meson: add remaining still-in-use config checks 00a79876b Store mount options in correct variable da0f35646 Fix off-by-one error constructing mount options 31bff905a add check for statvfs 242289b6b start: fix namespace sharing 41f602361 conf: fix append_ttyname() ea4fd7f85 start: record inherited namespaces earlier to make it available for idmapped rootfs setup e74fd55bc start: don't overwrite file descriptors during namespace preservation dcfd75bb4 conf: log file descriptors on error during idmapped mount setup c3e648700 fix for issue 4026: set broadcast to 0.0.0.0 for /31 and /32 cfcbdb75f use systemd dbus StartTransientUnit for unpriv cgroup2 28726f215 Fix uninitialized read in parse_cap when libcap is not used d663495ee meson: Generate compile commands by iterating over an array Signed-off-by: Bruce Ashfield --- ...call_method_async-to-replace-the-asyncv-o.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 recipes-containers/lxc/files/0001-use-sd_bus_call_method_async-to-replace-the-asyncv-o.patch (limited to 'recipes-containers/lxc/files/0001-use-sd_bus_call_method_async-to-replace-the-asyncv-o.patch') diff --git a/recipes-containers/lxc/files/0001-use-sd_bus_call_method_async-to-replace-the-asyncv-o.patch b/recipes-containers/lxc/files/0001-use-sd_bus_call_method_async-to-replace-the-asyncv-o.patch deleted file mode 100644 index ef87a0ce..00000000 --- a/recipes-containers/lxc/files/0001-use-sd_bus_call_method_async-to-replace-the-asyncv-o.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 25 Aug 2022 05:45:53 -0700 -Subject: [PATCH] use sd_bus_call_method_async to replace the asyncv one - -The sd_bus_call_method_asyncv's 10th parameter is of type -va_list and supplying NULL when invoking it causes compilation -error. Just replace it with the async one. - -Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/4187] - -Signed-off-by: Chen Qi ---- - meson.build | 4 ++-- - src/lxc/cgroups/cgfsng.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 21955a050..f8bdcf4e8 100644 ---- a/meson.build -+++ b/meson.build -@@ -295,9 +295,9 @@ if not want_sd_bus.disabled() - has_sd_bus = false - endif - -- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include ', dependencies: libsystemd) -+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include ', dependencies: libsystemd) - if not sd_bus_optional -- error('libsystemd misses required sd_bus_call_method_asyncv function') -+ error('libsystemd misses required sd_bus_call_method_async function') - endif - - has_sd_bus = false -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 8a3615893..d90e5385e 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -1232,7 +1232,7 @@ static int unpriv_systemd_create_scope(struct cgroup_ops *ops, struct lxc_conf * - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to connect to user bus: %s", strerror(-r)); - -- r = sd_bus_call_method_asyncv(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL, NULL); -+ r = sd_bus_call_method_async(bus, NULL, DESTINATION, PATH, INTERFACE, "Subscribe", NULL, NULL, NULL); - if (r < 0) - return log_error(SYSTEMD_SCOPE_FAILED, "Failed to subscribe to signals: %s", strerror(-r)); - --- -2.37.1 - -- cgit v1.2.3-54-g00ecf