From 00bcfc318ea29c17749a6e25f0cc4db222d69ae6 Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@iopsys.eu>
Date: Sun, 27 Jun 2021 17:04:19 +0200
Subject: [PATCH] lxc: 4.0.9
---
utils/lxc/Makefile | 4 +-
...fix-check-for-seccomp-notify-support.patch | 34 ---------------
...p-libseccomp-tests-if-it-is-disabled.patch | 43 -------------------
3 files changed, 2 insertions(+), 79 deletions(-)
delete mode 100644 utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch
delete mode 100644 utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch
diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 7cdc8abe2b..863208299e 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_VERSION:=4.0.9
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
-PKG_HASH:=af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4
+PKG_HASH:=1fcf0610e9140eceb4be2334eb537bb9c5a213faea77c793ab3c62b86f37e52b
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0
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 a02107aa08..0000000000
--- 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 <cotequeiroz@gmail.com>
-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 <cotequeiroz@gmail.com>
-
---- 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 2a455bceec..0000000000
--- 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 <cotequeiroz@gmail.com>
-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 <cotequeiroz@gmail.com>
-
---- 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 <seccomp.h>]])
-+ AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include <seccomp.h>]])
-+ AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include <seccomp.h>]])
-+ AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include <seccomp.h>]])
-+ 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 <seccomp.h>]])
--AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include <seccomp.h>]])
--AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include <seccomp.h>]])
--AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include <seccomp.h>]])
--CFLAGS="$OLD_CFLAGS"
--
- AC_CHECK_HEADERS([linux/bpf.h], [
- AC_CHECK_TYPES([struct bpf_cgroup_dev_ctx], [], [], [[#include <linux/bpf.h>]])
- ], [], [])
--
GitLab