Browse Source

lxc: update to 4.0.10

Remove getline patch. It seems to be for uClibc, which is no longer in
the tree.

Remove commands patch. Issue was fixed upstream. Same with the tests
patch.

Remove gpg patch. It's an upstream backport.

Refreshed others.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 3 years ago
parent
commit
3df43e2f66
7 changed files with 5 additions and 126 deletions
  1. +3
    -3
      utils/lxc/Makefile
  2. +1
    -1
      utils/lxc/patches/010-Remove-distro-check.patch
  3. +0
    -15
      utils/lxc/patches/015-getline.patch
  4. +1
    -1
      utils/lxc/patches/025-remove-unsupported-option.patch
  5. +0
    -34
      utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch
  6. +0
    -43
      utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch
  7. +0
    -29
      utils/lxc/patches/040-gpg.patch

+ 3
- 3
utils/lxc/Makefile View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=lxc 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:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
PKG_HASH:=af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4
PKG_HASH:=a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0


+ 1
- 1
utils/lxc/patches/010-Remove-distro-check.patch View File

@ -10,7 +10,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -64,34 +64,6 @@ fi
@@ -78,34 +78,6 @@ esac
LT_INIT LT_INIT
AC_SUBST([LIBTOOL_DEPS]) AC_SUBST([LIBTOOL_DEPS])


+ 0
- 15
utils/lxc/patches/015-getline.patch View File

@ -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)
{

+ 1
- 1
utils/lxc/patches/025-remove-unsupported-option.patch View File

@ -1,6 +1,6 @@
--- a/templates/lxc-download.in --- a/templates/lxc-download.in
+++ b/templates/lxc-download.in +++ b/templates/lxc-download.in
@@ -505,20 +505,7 @@ fi
@@ -512,20 +512,7 @@ fi
# Unpack the rootfs # Unpack the rootfs
echo "Unpacking the rootfs" echo "Unpacking the rootfs"


+ 0
- 34
utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch View File

@ -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,
};

+ 0
- 43
utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch View File

@ -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>]])
], [], [])

+ 0
- 29
utils/lxc/patches/040-gpg.patch View File

@ -1,29 +0,0 @@
From 3efa0cf3455cbe330b4e79a647a57ad8e9cf3476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
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 <stgraber@ubuntu.com>
---
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

Loading…
Cancel
Save