[packages/glibc] - OPEN_TREE_* macros fix from git, release 6

[qboosh]

commit cf89b716d79967cd0a36729000425a217af8eaaf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 31 17:50:02 2026 +0200

    - OPEN_TREE_* macros fix from git, release 6

 glibc-OPEN_TREE-macros.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 glibc.spec                   |  6 +++---
 2 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 632d3fa..6792fd7 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -57,7 +57,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	5
+Release:	6
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -78,7 +78,7 @@ Patch0:		%{name}-git.patch
 # against GNU TP (libc domain)
 #Patch1: %{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
-
+Patch3:		%{name}-OPEN_TREE-macros.patch
 Patch4:		%{name}-no-bash-nls.patch
 Patch6:		%{name}-paths.patch
 
@@ -890,7 +890,7 @@ exit 1
 %patch -P0 -p1
 
 %patch -P2 -p1
-
+%patch -P3 -p1
 %{!?with_bash_nls:%patch -P4 -p1}
 
 %patch -P6 -p1
diff --git a/glibc-OPEN_TREE-macros.patch b/glibc-OPEN_TREE-macros.patch
new file mode 100644
index 0000000..6297c08
--- /dev/null
+++ b/glibc-OPEN_TREE-macros.patch
@@ -0,0 +1,44 @@
+From d12b017cddfeb9fe9920ba054ae3dfcb8e9238b8 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer at redhat.com>
+Date: Wed, 4 Mar 2026 18:32:36 +0100
+Subject: [PATCH] Linux: Only define OPEN_TREE_* macros in <sys/mount.h> if
+ undefined (bug 33921)
+
+There is a conditional inclusion of <linux/mount.h> earlier in the file.
+If that defines the macros, do not redefine them.  This addresses build
+problems as the token sequence used by the UAPI macro definitions
+changes between Linux versions.
+
+Reviewed-by: Adhemerval Zanella  <adhemerval.zanella at linaro.org>
+---
+ sysdeps/unix/sysv/linux/sys/mount.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h
+index 5e496caf2f..0c5ebed33a 100644
+--- a/sysdeps/unix/sysv/linux/sys/mount.h
++++ b/sysdeps/unix/sysv/linux/sys/mount.h
+@@ -264,14 +264,16 @@ enum fsconfig_command
+ #define FSOPEN_CLOEXEC          0x00000001
+ 
+ /* open_tree flags.  */
+-#define OPEN_TREE_CLONE    1         /* Clone the target tree and attach the clone */
++#ifndef OPEN_TREE_CLONE
++# define OPEN_TREE_CLONE    1 /* Clone the target tree and attach the clone */
++#endif
+ #ifndef O_CLOEXEC
+ # include <bits/cloexec.h>
+ # define O_CLOEXEC __O_CLOEXEC
+ #endif
+-#undef  OPEN_TREE_CLOEXEC
+-#define OPEN_TREE_CLOEXEC  O_CLOEXEC /* Close the file on execve() */
+-
++#ifndef OPEN_TREE_CLOEXEC
++# define OPEN_TREE_CLOEXEC  O_CLOEXEC /* Close the file on execve() */
++#endif
+ 
+ __BEGIN_DECLS
+ 
+-- 
+2.43.7
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/cf89b716d79967cd0a36729000425a217af8eaaf