diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 2713eaf26..209fc8b72 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc -PKG_VERSION:=4.0.5 -PKG_RELEASE:=3 +PKG_VERSION:=4.0.10 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ -PKG_HASH:=af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4 +PKG_HASH:=a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 PKG_MAINTAINER:=Marko Ratkaj PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 diff --git a/utils/lxc/patches/010-Remove-distro-check.patch b/utils/lxc/patches/010-Remove-distro-check.patch index 5e6edfa1e..44610f08c 100644 --- a/utils/lxc/patches/010-Remove-distro-check.patch +++ b/utils/lxc/patches/010-Remove-distro-check.patch @@ -10,7 +10,7 @@ Signed-off-by: Robert Marko --- a/configure.ac +++ b/configure.ac -@@ -64,34 +64,6 @@ fi +@@ -78,34 +78,6 @@ esac LT_INIT AC_SUBST([LIBTOOL_DEPS]) diff --git a/utils/lxc/patches/015-getline.patch b/utils/lxc/patches/015-getline.patch deleted file mode 100644 index f15aa90bd..000000000 --- a/utils/lxc/patches/015-getline.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/lxc/utils.h -+++ b/src/lxc/utils.h -@@ -36,11 +36,7 @@ __hidden extern int mkdir_p(const char * - __hidden extern char *get_rundir(void); - - /* Define getline() if missing from the C library */ --#ifndef HAVE_GETLINE --#ifdef HAVE_FGETLN --#include <../include/getline.h> --#endif --#endif -+#include "../include/getline.h" - - static inline int lxc_set_cloexec(int fd) - { diff --git a/utils/lxc/patches/025-remove-unsupported-option.patch b/utils/lxc/patches/025-remove-unsupported-option.patch index 2141c7514..747e78d03 100644 --- a/utils/lxc/patches/025-remove-unsupported-option.patch +++ b/utils/lxc/patches/025-remove-unsupported-option.patch @@ -1,6 +1,6 @@ --- a/templates/lxc-download.in +++ b/templates/lxc-download.in -@@ -505,20 +505,7 @@ fi +@@ -512,20 +512,7 @@ fi # Unpack the rootfs echo "Unpacking the rootfs" diff --git a/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch b/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch deleted file mode 100644 index a02107aa0..000000000 --- a/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a342b11fedb3010630de4909ca707ebdc0862060 Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Fri, 25 Dec 2020 13:54:14 -0300 -Subject: [PATCH 1/2] commands: fix check for seccomp notify support - -Use HAVE_SECCOMP_NOTIFY instead of HAVE_DECL_SECCOMP_NOTIFY_FD. -Currently the latter will be true if the declaration is found by -configure, even if 'configure --disable-seccomp' is used. - -HAVE_SECCOMP_NOTIFY is defined in lxcseccomp.h if both HAVE_SECCOMP and -HAVE_DECL_SECCOMP_NOTIFY_FD are true, which is the correct behavior. - -Signed-off-by: Eneas U de Queiroz - ---- a/src/lxc/commands.c -+++ b/src/lxc/commands.c -@@ -498,7 +498,7 @@ static int lxc_cmd_get_devpts_fd_callbac - - int lxc_cmd_get_seccomp_notify_fd(const char *name, const char *lxcpath) - { --#if HAVE_DECL_SECCOMP_NOTIFY_FD -+#ifdef HAVE_SECCOMP_NOTIFY - int ret, stopped; - struct lxc_cmd_rr cmd = { - .req = { -@@ -523,7 +523,7 @@ static int lxc_cmd_get_seccomp_notify_fd - struct lxc_handler *handler, - struct lxc_epoll_descr *descr) - { --#if HAVE_DECL_SECCOMP_NOTIFY_FD -+#ifdef HAVE_SECCOMP_NOTIFY - struct lxc_cmd_rsp rsp = { - .ret = 0, - }; diff --git a/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch b/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch deleted file mode 100644 index 2a455bcee..000000000 --- a/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 67cd8bde2d46983df8fa9f647e9fc0b96370ec29 Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Sat, 16 Jan 2021 13:54:07 -0300 -Subject: [PATCH 2/2] configure: skip libseccomp tests if it is disabled - -Move the block checking for libseccomp api compatibility inside -AM_COND_IF([ENABLE_SECCOMP] ... ). - -Signed-off-by: Eneas U de Queiroz - ---- a/configure.ac -+++ b/configure.ac -@@ -284,6 +284,14 @@ AM_COND_IF([ENABLE_SECCOMP], - AC_CHECK_LIB([seccomp], [seccomp_init],[],[AC_MSG_ERROR([You must install the seccomp development package in order to compile lxc])]) - AC_SUBST([SECCOMP_LIBS], [-lseccomp]) - ]) -+ # HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $SECCOMP_CFLAGS" -+ AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include ]]) -+ AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include ]]) -+ AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include ]]) -+ AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include ]]) -+ CFLAGS="$OLD_CFLAGS" - ]) - - AC_MSG_CHECKING(for static libcap) -@@ -331,15 +339,6 @@ AM_COND_IF([ENABLE_CAP], - AC_CHECK_LIB(cap,cap_get_file, AC_DEFINE(LIBCAP_SUPPORTS_FILE_CAPABILITIES,1,[Have cap_get_file]),[],[]) - AC_SUBST([CAP_LIBS], [-lcap])]) - --# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 --OLD_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $SECCOMP_CFLAGS" --AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include ]]) --AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include ]]) --AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include ]]) --AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include ]]) --CFLAGS="$OLD_CFLAGS" -- - AC_CHECK_HEADERS([linux/bpf.h], [ - AC_CHECK_TYPES([struct bpf_cgroup_dev_ctx], [], [], [[#include ]]) - ], [], []) diff --git a/utils/lxc/patches/040-gpg.patch b/utils/lxc/patches/040-gpg.patch deleted file mode 100644 index a08c8b8b0..000000000 --- a/utils/lxc/patches/040-gpg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3efa0cf3455cbe330b4e79a647a57ad8e9cf3476 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= -Date: Sun, 27 Jun 2021 23:42:52 -0400 -Subject: [PATCH] lxc-download: Switch GPG server -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stéphane Graber ---- - templates/lxc-download.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/templates/lxc-download.in -+++ b/templates/lxc-download.in -@@ -55,11 +55,11 @@ LXC_PATH= - LXC_ROOTFS= - - if [ -z "${DOWNLOAD_KEYSERVER:-}" ]; then -- DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net" -+ DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com" - - # Deal with GPG over http proxy - if [ -n "${http_proxy:-}" ]; then -- DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80" -+ DOWNLOAD_KEYSERVER="hkp://keyserver.ubuntu.com:80" - DOWNLOAD_GPG_PROXY="--keyserver-options http-proxy=\"${http_proxy}\"" - fi - fi