diff options
Diffstat (limited to 'app-containers')
-rw-r--r-- | app-containers/Manifest.gz | bin | 7723 -> 7724 bytes | |||
-rw-r--r-- | app-containers/crun/Manifest | 1 | ||||
-rw-r--r-- | app-containers/crun/files/crun-1.4.5-glibc-2.36.patch | 79 |
3 files changed, 0 insertions, 80 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz Binary files differindex 1d0eb643a2b4..582d12074640 100644 --- a/app-containers/Manifest.gz +++ b/app-containers/Manifest.gz diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest index 2fce1fb194a0..9f0b16d26b8b 100644 --- a/app-containers/crun/Manifest +++ b/app-containers/crun/Manifest @@ -1,4 +1,3 @@ -AUX crun-1.4.5-glibc-2.36.patch 2631 BLAKE2B 6f37b02f2c87d056af84c1dc146ba5b9915ae95492aea6d1d2f6e708b70bc37d2d48d666fb7d63ce2a07c594dc76cea3dd6892b7356cea56a3568d93d9f5a7d1 SHA512 1f54d6c1bfd3e4fcbd39e0c4651d43d21e7902309d3b844acdb6f908ea3b3d364b01f90b6ecb81bd98ce8f0f035061399fea781a8e76acf07ce32824b72960cc DIST crun-1.8.1.tar.xz 692152 BLAKE2B b5dce1a454641221c591f50ac8519d4e9e9d892ea56232fa3fc9916934c19eba5853019238b1837cd5fb61f0dec5e0e6a11c02f628bece3b69c9c4f5750addae SHA512 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042 DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 EBUILD crun-1.8.1.ebuild 1672 BLAKE2B 388b4daf7cc6fb32e33e9114253cab94281abff7a17d260dcfa255042ba57489e2dff0b95bfa6f5d700fac01066c9d2cb282becc8ac90458ed7c10d5f967aa90 SHA512 69077ea7f94586489abf3b16d0cef1f793569ab2db7a3334c89c7af7e2d4561479de456838da9f5aa1a9eaa5c3f51471436aa66a8595f643ed8a60eda7f8a0eb diff --git a/app-containers/crun/files/crun-1.4.5-glibc-2.36.patch b/app-containers/crun/files/crun-1.4.5-glibc-2.36.patch deleted file mode 100644 index 12990c9dbe65..000000000000 --- a/app-containers/crun/files/crun-1.4.5-glibc-2.36.patch +++ /dev/null @@ -1,79 +0,0 @@ -https://bugs.gentoo.org/863437 -https://github.com/containers/crun/commit/3df14584b84414df77b2079c1b8b48d44d0ceb61 - -From 3df14584b84414df77b2079c1b8b48d44d0ceb61 Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano <gscrivan@redhat.com> -Date: Tue, 26 Jul 2022 15:17:16 +0200 -Subject: [PATCH] linux: fix build with glibc 2.36 - -glibc 2.36 has the new mount API in the <sys/mount.h> file. These -definitions conflict with the definitions in the <linux/mount.h> -file. - -Add a check and include <linux/mount.h> only if it doesn't conflict -with <sys/mount.h>. - -Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2110738 - -Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> ---- a/configure.ac -+++ b/configure.ac -@@ -174,11 +174,21 @@ LIBS="" - AC_MSG_CHECKING([for new mount API (fsconfig)]) - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -+ #include <sys/mount.h> -+ int cmd = FSCONFIG_CMD_CREATE; -+ ]])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE_SYS_MOUNT_H], 1, [Define if FSCONFIG_CMD_CREATE is available in sys/mount.h])], -+ [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[ -+ /* also make sure it doesn't conflict with <sys/mount.h> since it is always used. */ -+ #include <sys/mount.h> - #include <linux/mount.h> - int cmd = FSCONFIG_CMD_CREATE; - ]])], - [AC_MSG_RESULT(yes) -- AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE], 1, [Define if FSCONFIG_CMD_CREATE is available])], -+ AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE_LINUX_MOUNT_H], 1, [Define if FSCONFIG_CMD_CREATE is available in linux/mount.h])], - [AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING([for seccomp notify API]) ---- a/src/libcrun/linux.c -+++ b/src/libcrun/linux.c -@@ -26,9 +26,13 @@ - #include <fcntl.h> - #include <unistd.h> - #include <sys/mount.h> --#ifdef HAVE_FSCONFIG_CMD_CREATE -+#ifdef HAVE_FSCONFIG_CMD_CREATE_LINUX_MOUNT_H - # include <linux/mount.h> - #endif -+#if defined HAVE_FSCONFIG_CMD_CREATE_LINUX_MOUNT_H || defined HAVE_FSCONFIG_CMD_CREATE_SYS_MOUNT_H -+# define HAVE_NEW_MOUNT_API -+#endif -+ - #include <sys/syscall.h> - #include <sys/prctl.h> - #ifdef HAVE_CAP -@@ -990,7 +994,7 @@ open_mount_target (libcrun_container_t *container, const char *target_rel, libcr - static int - fsopen_mount (runtime_spec_schema_defs_mount *mount) - { --#ifdef HAVE_FSCONFIG_CMD_CREATE -+#ifdef HAVE_NEW_MOUNT_API - cleanup_close int fsfd = -1; - int ret; - -@@ -1016,7 +1020,7 @@ fsopen_mount (runtime_spec_schema_defs_mount *mount) - static int - fs_move_mount_to (int fd, int dirfd, const char *name) - { --#ifdef HAVE_FSCONFIG_CMD_CREATE -+#ifdef HAVE_NEW_MOUNT_API - if (name) - return syscall_move_mount (fd, "", dirfd, name, MOVE_MOUNT_F_EMPTY_PATH); - - |