diff --git a/root-packages/lxc/build.sh b/root-packages/lxc/build.sh index c2a367092..b380ee67b 100644 --- a/root-packages/lxc/build.sh +++ b/root-packages/lxc/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://linuxcontainers.org/ TERMUX_PKG_DESCRIPTION="Linux Containers" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=3.1.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.2.1 TERMUX_PKG_SRCURL=https://linuxcontainers.org/downloads/lxc-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5 +TERMUX_PKG_SHA256=5f903986a4b17d607eea28c0aa56bf1e76e8707747b1aa07d31680338b1cc3d4 TERMUX_PKG_DEPENDS="dirmngr, gnupg, libcap, libseccomp, rsync, wget" TERMUX_PKG_BREAKS="lxc-dev" TERMUX_PKG_REPLACES="lxc-dev" @@ -18,6 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-seccomp --enable-capabilities --disable-examples +--disable-werror " termux_step_pre_configure() { diff --git a/root-packages/lxc/src-lxc-cgroups-cgfsng.c.patch b/root-packages/lxc/src-lxc-cgroups-cgfsng.c.patch index 593b78f08..3d66cd723 100644 --- a/root-packages/lxc/src-lxc-cgroups-cgfsng.c.patch +++ b/root-packages/lxc/src-lxc-cgroups-cgfsng.c.patch @@ -1,43 +1,25 @@ -diff -uNr lxc-3.1.0/src/lxc/cgroups/cgfsng.c lxc-3.1.0.mod/src/lxc/cgroups/cgfsng.c ---- lxc-3.1.0/src/lxc/cgroups/cgfsng.c 2018-12-14 01:13:51.000000000 +0200 -+++ lxc-3.1.0.mod/src/lxc/cgroups/cgfsng.c 2019-07-13 20:47:37.511164109 +0300 -@@ -395,7 +395,7 @@ +diff -uNr lxc-3.2.1/src/lxc/cgroups/cgfsng.c lxc-3.2.1.mod/src/lxc/cgroups/cgfsng.c +--- lxc-3.2.1/src/lxc/cgroups/cgfsng.c 2019-07-23 01:34:33.000000000 +0300 ++++ lxc-3.2.1.mod/src/lxc/cgroups/cgfsng.c 2019-09-19 16:28:18.220151406 +0300 +@@ -403,7 +403,7 @@ } oldv = *lastslash; *lastslash = '\0'; - fpath = must_make_path(path, "cpuset.cpus", NULL); + fpath = must_make_path(path, "cpus", NULL); + *lastslash = oldv; posscpus = read_file(fpath); if (!posscpus) { - SYSERROR("Failed to read file \"%s\"", fpath); -@@ -412,7 +412,7 @@ - DEBUG("The path \""__ISOL_CPUS"\" to read isolated cpus from does not exist"); - cpulist = posscpus; - /* No isolated cpus but we weren't already initialized by -- * someone. We should simply copy the parents cpuset.cpus -+ * someone. We should simply copy the parents cpus - * values. - */ - if (!am_initialized) { -@@ -434,7 +434,7 @@ - TRACE("No isolated cpus detected"); - cpulist = posscpus; - /* No isolated cpus but we weren't already initialized by -- * someone. We should simply copy the parents cpuset.cpus -+ * someone. We should simply copy the parents cpus - * values. - */ - if (!am_initialized) { -@@ -491,7 +491,7 @@ +@@ -509,7 +509,7 @@ + copy_parent: - *lastslash = oldv; - free(fpath); -- fpath = must_make_path(path, "cpuset.cpus", NULL); -+ fpath = must_make_path(path, "cpus", NULL); - ret = lxc_write_to_file(fpath, cpulist, strlen(cpulist), false, 0666); - if (ret < 0) { - SYSERROR("Failed to write cpu list to \"%s\"", fpath); -@@ -606,7 +606,7 @@ + if (!am_initialized) { +- fpath = must_make_path(path, "cpuset.cpus", NULL); ++ fpath = must_make_path(path, "cpus", NULL); + ret = lxc_write_to_file(fpath, cpulist, strlen(cpulist), false, + 0666); + if (ret < 0) { +@@ -605,7 +605,7 @@ return false; } @@ -45,19 +27,19 @@ diff -uNr lxc-3.1.0/src/lxc/cgroups/cgfsng.c lxc-3.1.0.mod/src/lxc/cgroups/cgfsn + /* Make sure any isolated cpus are removed from cpus. */ if (!cg_legacy_filter_and_set_cpus(cgpath, v == '1')) { SYSERROR("Failed to remove isolated cpus"); - free(clonechildrenpath); -@@ -623,8 +623,8 @@ - } + return false; +@@ -616,8 +616,8 @@ + TRACE("\"cgroup.clone_children\" was already set to \"1\""); /* copy parent's settings */ - if (!copy_parent_file(cgpath, "cpuset.mems")) { - SYSERROR("Failed to copy \"cpuset.mems\" settings"); + if (!copy_parent_file(cgpath, "mems")) { + SYSERROR("Failed to copy \"mems\" settings"); - free(cgpath); - free(clonechildrenpath); return false; -@@ -742,7 +742,7 @@ + } + +@@ -731,7 +731,7 @@ * verify /sys/fs/cgroup/ in this field. */ if (strncmp(p, "/sys/fs/cgroup/", 15) != 0) {