4 files changed, 14 insertions, 183 deletions

diff --git a/recipes-containers/lxc/files/0001-lxc-test-usernic-drop-cgroup-handling.patch b/recipes-containers/lxc/files/0001-lxc-test-usernic-drop-cgroup-handling.patch
deleted file mode 100644
index 162e8f9d..00000000
--- a/recipes-containers/lxc/files/0001-lxc-test-usernic-drop-cgroup-handling.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ec85e5ca4953292c4341497704ce738669a79b64 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge@hallyn.com>
-Date: Fri, 2 Feb 2024 10:41:11 -0600
-Subject: [PATCH] lxc-test-usernic: drop cgroup handling
-
-This stuff is not needed in a modern systemd based system, and in fact
-breaks.  It would probably be better to detect such a system so that a
-non-systemd box can still run this test.  But I'm not sure what would be
-reliable.
-
-Upstream-Status: Backport from
-[https://github.com/lxc/lxc/commit/ec85e5ca4953292c4341497704ce738669a79b64]
-
-Signed-off-by: Serge Hallyn <serge@hallyn.com>
-Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
----
- src/tests/lxc-test-usernic.in | 28 ----------------------------
- 1 file changed, 28 deletions(-)
-
-diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
-index 9af8678f3..49fd5e3f7 100755
---- a/src/tests/lxc-test-usernic.in
-+++ b/src/tests/lxc-test-usernic.in
-@@ -80,34 +80,6 @@ lxc.idmap = u 0 910000 10000
- lxc.idmap = g 0 910000 10000
- EOF
- 
--if command -v cgm >/dev/null 2>&1; then
--       cgm create all usernic-user
--       cgm chown all usernic-user $(id -u usernic-user) $(id -g usernic-user)
--       cgm movepid all usernic-user $$
--elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
--       for d in $(cut -d : -f 2 /proc/self/cgroup); do
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
--                       string:$d string:usernic-user >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
--                       string:$d string:usernic-user int32:$(id -u usernic-user) int32:$(id -g usernic-user) >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
--                       string:$d string:usernic-user int32:$$ >/dev/null
--       done
--else
--       for d in /sys/fs/cgroup/*; do
--               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
--               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
--               [ ! -d $d/lxctest ] && mkdir $d/lxctest
--               chown -R usernic-user: $d/lxctest
--               echo $$ > $d/lxctest/tasks
--       done
--fi
--
- mkdir -p /run/user/$(id -u usernic-user)
- chown -R usernic-user: /run/user/$(id -u usernic-user) /home/usernic-user
- 
--- 
-2.35.5
-
diff --git a/recipes-containers/lxc/files/0001-tests-remove-old-and-broken-cgroup-handling-code-fro.patch b/recipes-containers/lxc/files/0001-tests-remove-old-and-broken-cgroup-handling-code-fro.patch
deleted file mode 100644
index bf8df795..00000000
--- a/recipes-containers/lxc/files/0001-tests-remove-old-and-broken-cgroup-handling-code-fro.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8f9733d756361ff8f8d8d589f286c0e064b1195d Mon Sep 17 00:00:00 2001
-From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
-Date: Thu, 15 Feb 2024 18:13:05 +0100
-Subject: [PATCH] tests: remove old and broken cgroup handling code from tests
-
-We have removed the same piece of code in
-ec85e5ca495 ("lxc-test-usernic: drop cgroup handling")
-let's do the same for two other tests.
-
-This fixes autopkgtests.
-
-Upstream-Status: Backport from
-[https://github.com/lxc/lxc/commit/8f9733d756361ff8f8d8d589f286c0e064b1195d]
-
-Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
-Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
----
- src/tests/lxc-test-apparmor-mount | 29 -----------------------------
- src/tests/lxc-test-unpriv         | 28 ----------------------------
- 2 files changed, 57 deletions(-)
-
-diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
-index 7c9d9ad50..ddf783d4b 100755
---- a/src/tests/lxc-test-apparmor-mount
-+++ b/src/tests/lxc-test-apparmor-mount
-@@ -119,35 +119,6 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
- 
- cd $HDIR
- 
--if command -v cgm >/dev/null 2>&1; then
--       cgm create all $TUSER
--       cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
--       cgm movepid all $TUSER $$
--elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
--       for d in $(cut -d : -f 2 /proc/self/cgroup); do
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
--                       string:$d string:$TUSER >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
--                       string:$d string:$TUSER int32:$(id -u $TUSER) int32:$(id -g $TUSER) >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
--                       string:$d string:$TUSER int32:$$ >/dev/null
--       done
--else
--       for d in /sys/fs/cgroup/*; do
--               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
--               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
--               [ ! -d $d/lxctest ] && mkdir $d/lxctest
--               chown -R $TUSER: $d/lxctest
--               echo $$ > $d/lxctest/tasks
--       done
--fi
--
--
- run_cmd lxc-create -t busybox -n $cname
- 
- echo "test default confined container"
-diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
-index 8fb9106d6..426add9da 100755
---- a/src/tests/lxc-test-unpriv
-+++ b/src/tests/lxc-test-unpriv
-@@ -130,34 +130,6 @@ chown -R $TUSER: /run/user/$(id -u $TUSER)
- 
- cd $HDIR
- 
--if command -v cgm >/dev/null 2>&1; then
--       cgm create all $TUSER
--       cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
--       cgm movepid all $TUSER $$
--elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
--       for d in $(cut -d : -f 2 /proc/self/cgroup); do
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
--                       string:$d string:$TUSER >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Chown \
--                       string:$d string:$TUSER int32:$(id -u $TUSER) int32:$(id -g $TUSER) >/dev/null
--
--               dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
--                       --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.MovePid \
--                       string:$d string:$TUSER int32:$$ >/dev/null
--       done
--else
--       for d in /sys/fs/cgroup/*; do
--               [ "$d" = "/sys/fs/cgroup/unified" ] && continue
--               [ -f $d/cgroup.clone_children ] && echo 1 > $d/cgroup.clone_children
--               [ ! -d $d/lxctest ] && mkdir $d/lxctest
--               chown -R $TUSER: $d/lxctest
--               echo $$ > $d/lxctest/tasks
--       done
--fi
--
- run_cmd lxc-create -t busybox -n c1 -l trace -o "${UNPRIV_LOG}"
- 
- # Make sure we can start it - twice
--- 
-2.35.5
-
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 e9af8335..76704bb3 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
@@ -14,11 +14,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  templates/lxc-download.in | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/templates/lxc-download.in b/templates/lxc-download.in
-index a62ddf482..690307338 100755
---- a/templates/lxc-download.in
-+++ b/templates/lxc-download.in
-@@ -59,9 +59,9 @@ cleanup() {
+Index: git/templates/lxc-download.in
+===================================================================
+--- git.orig/templates/lxc-download.in
++++ git/templates/lxc-download.in
+@@ -45,9 +45,9 @@
    fi
  }
  
@@ -30,16 +30,16 @@ index a62ddf482..690307338 100755
        return 0
      fi
    done
-@@ -70,7 +70,7 @@ wget_wrapper() {
- }
- 
- download_file() {
+@@ -59,7 +59,7 @@
+   if [ "${DOWNLOAD_VERBOSE}" = "true" ]; then
+     echo "Download file: https://${DOWNLOAD_SERVER}$1"
+   fi
 -  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 ! curl_wrapper -L --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then
      if [ "$3" = "noexit" ]; then
        return 1
      else
-@@ -176,7 +176,7 @@ while :; do
+@@ -167,7 +167,7 @@
  done
  
  # Check for required binaries
@@ -48,6 +48,3 @@ index a62ddf482..690307338 100755
    if ! command -V "${bin}" >/dev/null 2>&1; then
      echo "ERROR: Missing required tool: ${bin}" 1>&2
      exit 1
--- 
-2.25.1
-
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 550f910e..09d5a05e 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
                     file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 "
 
-DEPENDS = "libxml2 libcap"
+DEPENDS = "libxml2 libcap dbus"
 RDEPENDS:${PN} = " \
                 rsync \
                 curl \
@@ -36,7 +36,7 @@ RDEPENDS:${PN}-ptest += "file make gmp nettle gnutls bash libgcc"
 
 RDEPENDS:${PN}-networking += "iptables"
 
-SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-5.0;protocol=https \
+SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
         file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \
         file://run-ptest \
         file://templates-actually-create-DOWNLOAD_TEMP-directory.patch \
@@ -47,12 +47,10 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-5.0;protocol=https \
         file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \
         file://dnsmasq.conf \
         file://lxc-net \
-        file://0001-lxc-test-usernic-drop-cgroup-handling.patch \
-        file://0001-tests-remove-old-and-broken-cgroup-handling-code-fro.patch \
         "
 
-SRCREV = "cb8e38aca27a23964941f0f011a8919aab8bebab"
-PV = "5.0.3+git"
+SRCREV = "3dee5fb88c6f77496dbcab46f31bcd891c9ee4e0"
+PV = "6.0.0+git"
 
 S = "${WORKDIR}/git"