diff --git a/Linux-Fix-enum-fsconfig_command-detection-in-sys-mou.patch b/Linux-Fix-enum-fsconfig_command-detection-in-sys-mou.patch new file mode 100644 index 0000000..4f7dfaa --- /dev/null +++ b/Linux-Fix-enum-fsconfig_command-detection-in-sys-mou.patch @@ -0,0 +1,42 @@ +From 2955ef4b7c9b56fcd7abfeddef7ee83c60abff98 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 16 Aug 2022 09:25:23 +0200 +Subject: [PATCH] Linux: Fix enum fsconfig_command detection in + +The #ifdef FSOPEN_CLOEXEC check did not work because the macro +was always defined in this header prior to the check, so that +the contents did not matter. + +Fixes commit 774058d72942249f71d74e7f2b639f77184160a6 +("linux: Fix sys/mount.h usage with kernel headers"). +--- + sysdeps/unix/sysv/linux/sys/mount.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h +index 2e3fd6a7fe6..19841d07385 100644 +--- a/sysdeps/unix/sysv/linux/sys/mount.h ++++ b/sysdeps/unix/sysv/linux/sys/mount.h +@@ -188,9 +188,6 @@ enum + }; + + +-/* fsopen flags. */ +-#define FSOPEN_CLOEXEC 0x00000001 +- + /* fsmount flags. */ + #define FSMOUNT_CLOEXEC 0x00000001 + +@@ -261,6 +258,9 @@ enum fsconfig_command + }; + #endif + ++/* fsopen flags. */ ++#define FSOPEN_CLOEXEC 0x00000001 ++ + /* open_tree flags. */ + #define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */ + #define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */ +-- +2.23.0.windows.1 + diff --git a/glibc.spec b/glibc.spec index 92f0351..1a71c92 100644 --- a/glibc.spec +++ b/glibc.spec @@ -65,7 +65,7 @@ ############################################################################## Name: glibc Version: 2.36 -Release: 4 +Release: 5 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -86,6 +86,7 @@ Source8: testsuite_whitelist Patch0: glibc-1070416.patch Patch1: linux-Mimic-kernel-defition-for-BLOCK_SIZE.patch Patch2: linux-Fix-sys-mount.h-usage-with-kernel-headers.patch +Patch3: Linux-Fix-enum-fsconfig_command-detection-in-sys-mou.patch Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch Patch9001: locale-delete-no-hard-link-to-avoid-all_language-pac.patch @@ -1260,6 +1261,9 @@ fi %endif %changelog +* Tue Aug 16 2022 Qingqing Li - 2.36-5 +- linux: Fix enum fsconfig_command detection in + * Mon Aug 15 2022 Qingqing Li - 2.36-4 - linux: Fix sys/mount.h usage with kernel headers