Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lxc for openSUSE:Factory checked in
at 2022-11-08 13:24:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxc (Old)
and /work/SRC/openSUSE:Factory/.lxc.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc"
Tue Nov 8 13:24:40 2022 rev:104 rq:1034505 version:5.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2022-10-30 18:29:38.830647381
+0100
+++ /work/SRC/openSUSE:Factory/.lxc.new.1597/lxc.changes 2022-11-08
13:24:41.548476154 +0100
@@ -1,0 +2,8 @@
+Mon Nov 7 09:43:54 UTC 2022 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Add patch to fix build on Arm:
+ * UPSTREAM-4187.patch
+- Refresh
OPENSUSE-0005-build-fix-handling-of-dependancies-to-fix-build-on-o.patch
+ due to the new patch
+
+-------------------------------------------------------------------
New:
----
UPSTREAM-4187.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxc.spec ++++++
--- /var/tmp/diff_new_pack.wFRpPZ/_old 2022-11-08 13:24:42.312479963 +0100
+++ /var/tmp/diff_new_pack.wFRpPZ/_new 2022-11-08 13:24:42.320480003 +0100
@@ -34,6 +34,8 @@
Source2: %{name}.keyring
Source3: lxc-createconfig.in
Source90: openSUSE-apparmor.conf
+# PATCH-FIX-UPSTREAM - https://github.com/lxc/lxc/pull/4187
+Patch1: UPSTREAM-4187.patch
# Backport of <https://github.com/lxc/lxc/pull/4215>.
Patch10: OPENSUSE-0001-meson.build-allow-explicit-distrosysconfdir.patch
Patch11:
OPENSUSE-0002-build-detect-where-struct-mount_attr-is-declared.patch
++++++ OPENSUSE-0005-build-fix-handling-of-dependancies-to-fix-build-on-o.patch
++++++
--- /var/tmp/diff_new_pack.wFRpPZ/_old 2022-11-08 13:24:42.368480242 +0100
+++ /var/tmp/diff_new_pack.wFRpPZ/_new 2022-11-08 13:24:42.372480262 +0100
@@ -46,15 +46,6 @@
srcconf.set10('HAVE_LIBURING', true)
else
-@@ -289,7 +294,7 @@ if not want_sd_bus.disabled()
- has_sd_bus = false
- endif
-
-- if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include
<systemd/sd-bus.h>', dependencies: libsystemd)
-+ if not cc.has_function('sd_bus_call_method_asyncv', prefix: '#include
<systemd/sd-bus.h>', dependencies: libsystemd)
- if not sd_bus_optional
- error('libsystemd misses required sd_bus_call_method_asyncv
function')
- endif
@@ -297,6 +302,13 @@ if not want_sd_bus.disabled()
has_sd_bus = false
endif
++++++ UPSTREAM-4187.patch ++++++
>From b0abedf60b40adf0f2fb3cf9dfee4bc601f7b39f Mon Sep 17 00:00:00 2001
From: Chen Qi <qi.c...@windriver.com>
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.
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
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 21955a0504..f8bdcf4e83 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
<systemd/sd-bus.h>', dependencies: libsystemd)
+ if not cc.has_function('sd_bus_call_method_async', prefix: '#include
<systemd/sd-bus.h>', 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 8a3615893f..d90e5385e1 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));
