From 758bef4243631707d1e4206d3a1cdee699602207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Date: Sat, 28 Mar 2020 09:30:00 +0100 Subject: main/lxc: upgrade to 4.0.0 remove patches, they are not needed with upgraded version --- main/lxc/APKBUILD | 8 +- main/lxc/cgroups-initialize-cpuset-properly.patch | 33 -------- ...k-restore-ability-to-move-nl80211-devices.patch | 91 ---------------------- 3 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 main/lxc/cgroups-initialize-cpuset-properly.patch delete mode 100644 main/lxc/network-restore-ability-to-move-nl80211-devices.patch diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 3b958ef3b8..0834a7257c 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka # Maintainer: Natanael Copa pkgname=lxc -pkgver=3.2.1 +pkgver=4.0.0 _pkgver=${pkgver/_rc/.rc} pkgrel=2 pkgdesc="Userspace interface for the Linux kernel containment features" @@ -39,8 +39,6 @@ subpackages=" " source="https://linuxcontainers.org/downloads/lxc/lxc-$_pkgver.tar.gz - cgroups-initialize-cpuset-properly.patch - network-restore-ability-to-move-nl80211-devices.patch lxc.initd lxc.confd " @@ -166,8 +164,6 @@ bashcomp() { rmdir "$pkgdir"/etc/bash_completion.d } -sha512sums="4b3046fc6c4aa497fb26bd45839e60de503184af86d3966e796d14e619203536b9a9ed67bdcd8a108cf1a548f8d095fb46dff53094a08abd8d268c866db685c0 lxc-3.2.1.tar.gz -2bebe6cc24987354b6e7dc9003c3a4df450ca10263e6dc0e9313977fdfc2eb57c0d68560da4d1071c8de2f8e3e394ed3ca17af445bea524daa5f8ae8955b3ba6 cgroups-initialize-cpuset-properly.patch -d302b7296918680901d034dc12ae0687dbbc65766800a9f7256e661f638d3dcad66bcc737aec2c6de8c27d3b9c08833e00420c2064f356d6d73efda9ae9bd707 network-restore-ability-to-move-nl80211-devices.patch +sha512sums="8d167488b877cbece553e33ac55bd098e2addfce144b241419870b30eb1d9b40bca31b1e2c68f9b150c1d44666e1e2fe848c533cf207c29c2aa2c58fb3e1b95b lxc-4.0.0.tar.gz b74ffe7c3e8f193265a90ffeb6e5743b1212bc1416b898e5a7e59ddd7f06fc77dc34e2dcbb3614038ac6222a95e2b9beb9f03ab734c991837203ab626b1b091f lxc.initd 91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467 lxc.confd" diff --git a/main/lxc/cgroups-initialize-cpuset-properly.patch b/main/lxc/cgroups-initialize-cpuset-properly.patch deleted file mode 100644 index 4096ba4a56..0000000000 --- a/main/lxc/cgroups-initialize-cpuset-properly.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b31d62b847a3ee013613795094cce4acc12345ef Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Sun, 28 Jul 2019 23:13:26 +0200 -Subject: [PATCH] cgroups: initialize cpuset properly - -Closes #3108. -Signed-off-by: Christian Brauner ---- - src/lxc/cgroups/cgfsng.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c -index 7b8fe6736f..c29c0958e9 100644 ---- a/src/lxc/cgroups/cgfsng.c -+++ b/src/lxc/cgroups/cgfsng.c -@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized) - } - - if (!flipped_bit) { -- DEBUG("No isolated or offline cpus present in cpuset"); -- return true; -+ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); -+ TRACE("No isolated or offline cpus present in cpuset"); -+ } else { -+ cpulist = move_ptr(posscpus); -+ TRACE("Removed isolated or offline cpus from cpuset"); - } -- DEBUG("Removed isolated or offline cpus from cpuset"); -- -- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); - if (!cpulist) { - ERROR("Failed to create cpu list"); - return false; diff --git a/main/lxc/network-restore-ability-to-move-nl80211-devices.patch b/main/lxc/network-restore-ability-to-move-nl80211-devices.patch deleted file mode 100644 index 965ef89498..0000000000 --- a/main/lxc/network-restore-ability-to-move-nl80211-devices.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 3dd7829433f63b2ec1323a1f237efa7d67ea6e2b Mon Sep 17 00:00:00 2001 -From: Christian Brauner -Date: Fri, 26 Jul 2019 08:20:02 +0200 -Subject: [PATCH] network: restore ability to move nl80211 devices - -Closes #3105. -Signed-off-by: Christian Brauner ---- - src/lxc/network.c | 31 +++++++++++++++++-------------- - 1 file changed, 17 insertions(+), 14 deletions(-) - -diff --git a/src/lxc/network.c b/src/lxc/network.c -index 9755116ba1..7684f95918 100644 ---- a/src/lxc/network.c -+++ b/src/lxc/network.c -@@ -1248,22 +1248,21 @@ static int lxc_netdev_rename_by_name_in_netns(pid_t pid, const char *old, - static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid, - const char *newname) - { -- char *cmd; -+ __do_free char *cmd = NULL; - pid_t fpid; -- int err = -1; - - /* Move phyN into the container. TODO - do this using netlink. - * However, IIUC this involves a bit more complicated work to talk to - * the 80211 module, so for now just call out to iw. - */ - cmd = on_path("iw", NULL); -- if (!cmd) -- goto out1; -- free(cmd); -+ if (!cmd) { -+ return -1; -+ } - - fpid = fork(); - if (fpid < 0) -- goto out1; -+ return -1; - - if (fpid == 0) { - char pidstr[30]; -@@ -1274,21 +1273,18 @@ static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid, - } - - if (wait_for_pid(fpid)) -- goto out1; -+ return -1; - -- err = 0; - if (newname) -- err = lxc_netdev_rename_by_name_in_netns(pid, ifname, newname); -+ return lxc_netdev_rename_by_name_in_netns(pid, ifname, newname); - --out1: -- free(physname); -- return err; -+ return 0; - } - - int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char* newname) - { -+ __do_free char *physname = NULL; - int index; -- char *physname; - - if (!ifname) - return -EINVAL; -@@ -3279,13 +3275,20 @@ int lxc_network_move_created_netdev_priv(struct lxc_handler *handler) - return 0; - - lxc_list_for_each(iterator, network) { -+ __do_free char *physname = NULL; - int ret; - struct lxc_netdev *netdev = iterator->elem; - - if (!netdev->ifindex) - continue; - -- ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL); -+ if (netdev->type == LXC_NET_PHYS) -+ physname = is_wlan(netdev->link); -+ -+ if (physname) -+ ret = lxc_netdev_move_wlan(physname, netdev->link, pid, NULL); -+ else -+ ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL); - if (ret) { - errno = -ret; - SYSERROR("Failed to move network device \"%s\" with ifindex %d to network namespace %d", -- cgit v1.2.3