Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package glibc for openSUSE:Factory checked
in at 2022-08-27 11:47:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glibc (Old)
and /work/SRC/openSUSE:Factory/.glibc.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc"
Sat Aug 27 11:47:42 2022 rev:263 rq:996258 version:2.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2022-07-19
17:18:53.540329083 +0200
+++ /work/SRC/openSUSE:Factory/.glibc.new.2083/glibc.changes 2022-08-27
11:47:43.997532450 +0200
@@ -1,0 +2,40 @@
+Mon Aug 15 09:21:34 UTC 2022 - Andreas Schwab <sch...@suse.de>
+
+- glibcextract-compile-c-snippet.patch: glibcextract.py: Add
+ compile_c_snippet
+- sys-mount-kernel-definition.patch: linux: Mimic kernel definition for
+ BLOCK_SIZE
+- sys-mount-usage.patch: linux: Fix sys/mount.h usage with kernel headers
+
+-------------------------------------------------------------------
+Tue Aug 2 07:41:38 UTC 2022 - Andreas Schwab <sch...@suse.de>
+
+- Update to glibc 2.36
+ Major new features:
+ * Support for DT_RELR relative relocation format has been added to
+ glibc
+ * On Linux, the pidfd_open, pidfd_getfd, and pidfd_send_signal functions
+ have been added
+ * On Linux, the process_madvise function has been added
+ * On Linux, the process_mrelease function has been added
+ * The ???no-aaaa??? DNS stub resolver option has been added
+ * On Linux, the fsopen, fsmount, move_mount, fsconfig, fspick, open_tree,
+ and mount_setattr have been added
+ * localedef now accepts locale definition files encoded in UTF-8
+ * Support for the mbrtoc8 and c8rtomb multibyte/UTF-8 character conversion
+ functions has been added per the ISO C2X N2653 and C++20 P0482R6 proposals
+ * The functions arc4random, arc4random_buf, and arc4random_uniform have been
+ added
+ Deprecated and removed features, and other changes affecting compatibility:
+ * Support for prelink will be removed in the next release
+ * The Linux kernel version check has been removed along with the
+ LD_ASSUME_KERNEL environment variable
+ * On Linux, The LD_LIBRARY_VERSION environment variable has been removed
+- get-nprocs-sched-uninit-read.patch, get-nprocs-inaccurate.patch,
+ strcmp-rtm-fallback.path, pt-load-invalid-hole.patch,
+ localedef-ld-monetary.patch, nptl-spurious-eintr.patch,
+ strncpy-power9-vsx.patch, nptl-cleanup-async-restore.patch,
+ read-chk-cancel.patch, wcrtomb-fortify.patch,
+ nptl-cleanup-async-restore-2.patch: Removed
+
+-------------------------------------------------------------------
Old:
----
get-nprocs-inaccurate.patch
get-nprocs-sched-uninit-read.patch
glibc-2.35.tar.xz
glibc-2.35.tar.xz.sig
localedef-ld-monetary.patch
nptl-cleanup-async-restore-2.patch
nptl-cleanup-async-restore.patch
nptl-spurious-eintr.patch
pt-load-invalid-hole.patch
read-chk-cancel.patch
strcmp-rtm-fallback.path
strncpy-power9-vsx.patch
wcrtomb-fortify.patch
New:
----
glibc-2.36.tar.xz
glibc-2.36.tar.xz.sig
glibcextract-compile-c-snippet.patch
sys-mount-kernel-definition.patch
sys-mount-usage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.sAbCMG/_old 2022-08-27 11:47:45.365535812 +0200
+++ /var/tmp/diff_new_pack.sAbCMG/_new 2022-08-27 11:47:45.369535822 +0200
@@ -93,43 +93,6 @@
%define name_suffix -%{flavor}-src
%endif
-Name: glibc%{name_suffix}
-Summary: Standard Shared Libraries (from the GNU C Library)
-License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
WITH GCC-exception-2.0
-Group: System/Libraries
-BuildRequires: audit-devel
-BuildRequires: bison
-BuildRequires: fdupes
-BuildRequires: libcap-devel
-BuildRequires: libselinux-devel
-BuildRequires: makeinfo
-BuildRequires: python3-base
-BuildRequires: shadow
-BuildRequires: systemd-rpm-macros
-BuildRequires: systemtap-headers
-BuildRequires: xz
-%if %{build_testsuite}
-BuildRequires: gcc-c++
-BuildRequires: gdb
-BuildRequires: glibc-devel-static
-BuildRequires: libidn2-0
-BuildRequires: libstdc++-devel
-BuildRequires: python3-pexpect
-%endif
-%if %{build_utils}
-BuildRequires: gd-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-%endif
-%if %{build_cross}
-BuildRequires: cross-%{cross_arch}-gcc%{gcc_version}-bootstrap
-BuildRequires: cross-%{cross_arch}-linux-glibc-devel
-%endif
-%if "%flavor" == "i686"
-ExclusiveArch: i586 i686
-BuildArch: i686
-%endif
-
%define __filter_GLIBC_PRIVATE 1
%ifarch i686
# For i686 let's only build what's different from i586, so
@@ -170,10 +133,14 @@
%define enablekernel 4.15
%endif
-Version: 2.35
+Name: glibc%{name_suffix}
+Summary: Standard Shared Libraries (from the GNU C Library)
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later
WITH GCC-exception-2.0
+Group: System/Libraries
+Version: 2.36
Release: 0
%if !%{build_snapshot}
-%define git_id f94f6d8a35
+%define git_id c804cd1c00
%define libversion %version
%else
%define git_id %(echo %version | sed 's/.*\.g//')
@@ -181,11 +148,9 @@
%endif
URL: https://www.gnu.org/software/libc/libc.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if !%{build_snapshot}
Source: https://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz
+%if !%{build_snapshot}
Source1: https://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig
-%else
-Source: glibc-%{version}.tar.xz
%endif
Source2:
http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring
Source4: manpages.tar.bz2
@@ -228,7 +193,38 @@
Requires: glibc = %{version}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#
+BuildRequires: audit-devel
+BuildRequires: bison
+BuildRequires: fdupes
+BuildRequires: libcap-devel
+BuildRequires: libselinux-devel
+BuildRequires: makeinfo
+BuildRequires: python3-base
+BuildRequires: shadow
+BuildRequires: systemd-rpm-macros
+BuildRequires: systemtap-headers
+BuildRequires: xz
+%if %{build_testsuite}
+BuildRequires: gcc-c++
+BuildRequires: gdb
+BuildRequires: glibc-devel-static
+BuildRequires: libidn2-0
+BuildRequires: libstdc++-devel
+BuildRequires: python3-pexpect
+%endif
+%if %{build_utils}
+BuildRequires: gd-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+%endif
+%if %{build_cross}
+BuildRequires: cross-%{cross_arch}-gcc%{gcc_version}-bootstrap
+BuildRequires: cross-%{cross_arch}-linux-glibc-devel
+%endif
+%if "%flavor" == "i686"
+ExclusiveArch: i586 i686
+BuildArch: i686
+%endif
###
# Patches are ordered in the following groups:
@@ -283,28 +279,12 @@
###
# Patches from upstream
###
-# PATCH-FIX-UPSTREAM linux: __get_nprocs_sched: do not feed CPU_COUNT_S with
garbage (BZ #28850)
-Patch1000: get-nprocs-sched-uninit-read.patch
-# PATCH-FIX-UPSTREAM linux: fix accuracy of get_nprocs and get_nprocs_conf (BZ
#28865)
-Patch1001: get-nprocs-inaccurate.patch
-# PATCH-FIX-UPSTREAM x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case
(BZ #28896)
-Patch1002: strcmp-rtm-fallback.path
-# PATCH-FIX-UPSTREAM elf: Check invalid hole in PT_LOAD segments (BZ #28838)
-Patch1003: pt-load-invalid-hole.patch
-# PATCH-FIX-UPSTREAM localedef: Update LC_MONETARY handling (BZ #28845)
-Patch1004: localedef-ld-monetary.patch
-# PATCH-FIX-UPSTREAM nptl: Handle spurious EINTR when thread cancellation is
disabled (BZ #29029)
-Patch1005: nptl-spurious-eintr.patch
-# PATCH-FIX-UPSTREAM powerpc: Fix VSX register number on __strncpy_power9 (BZ
#29197)
-Patch1006: strncpy-power9-vsx.patch
-# PATCH-FIX-UPSTREAM nptl: Fix __libc_cleanup_pop_restore asynchronous restore
(BZ #29214)
-Patch1007: nptl-cleanup-async-restore.patch
-# PATCH-FIX-UPSTREAM debug: make __read_chk a cancellation point (BZ #29274)
-Patch1008: read-chk-cancel.patch
-# PATCH-FIX-UPSTREAM wcrtomb: Make behavior POSIX compliant
-Patch1009: wcrtomb-fortify.patch
-# PATCH-FIX-UPSTREAM nptl: Fix ___pthread_unregister_cancel_restore
asynchronous restore (BZ #29214)
-Patch1010: nptl-cleanup-async-restore-2.patch
+# PATCH-FIX-OPENSUSE glibcextract.py: Add compile_c_snippet
+Patch1000: glibcextract-compile-c-snippet.patch
+# PATCH-FIX-OPENSUSE linux: Mimic kernel definition for BLOCK_SIZE
+Patch1001: sys-mount-kernel-definition.patch
+# PATCH-FIX-OPENSUSE linux: Fix sys/mount.h usage with kernel headers
+Patch1002: sys-mount-usage.patch
###
# Patches awaiting upstream approval
@@ -528,17 +508,11 @@
%patch304 -p1
%patch306 -p1
+%if !%{build_snapshot}
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
-%patch1003 -p1
-%patch1004 -p1
-%patch1005 -p1
-%patch1006 -p1
-%patch1007 -p1
-%patch1008 -p1
-%patch1009 -p1
-%patch1010 -p1
+%endif
%patch2000 -p1
%patch2001 -p1
++++++ glibc-2.35.tar.xz -> glibc-2.36.tar.xz ++++++
/work/SRC/openSUSE:Factory/glibc/glibc-2.35.tar.xz
/work/SRC/openSUSE:Factory/.glibc.new.2083/glibc-2.36.tar.xz differ: char 26,
line 1
++++++ glibcextract-compile-c-snippet.patch ++++++
>From 841afa116e32b3c7195475769c26bf46fd870d32 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zane...@linaro.org>
Date: Wed, 10 Aug 2022 16:24:06 -0300
Subject: [PATCH] glibcextract.py: Add compile_c_snippet
It might be used on tests to check if a snippet build with the provided
compiler and flags.
Reviewed-by: Florian Weimer <fwei...@redhat.com>
---
scripts/glibcextract.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/scripts/glibcextract.py b/scripts/glibcextract.py
index 43ab58ffe2..36d204c9b0 100644
--- a/scripts/glibcextract.py
+++ b/scripts/glibcextract.py
@@ -17,6 +17,7 @@
# License along with the GNU C Library; if not, see
# <https://www.gnu.org/licenses/>.
+import collections
import os.path
import re
import subprocess
@@ -173,3 +174,21 @@ def compare_macro_consts(source_1, source_2, cc, macro_re,
exclude_re=None,
if not allow_extra_2:
ret = 1
return ret
+
+CompileResult = collections.namedtuple("CompileResult", "returncode output")
+
+def compile_c_snippet(snippet, cc, extra_cc_args=''):
+ """Compile and return whether the SNIPPET can be build with CC along
+ EXTRA_CC_ARGS compiler flags. Return a CompileResult with RETURNCODE
+ being 0 for success, or the failure value and the compiler output.
+ """
+ with tempfile.TemporaryDirectory() as temp_dir:
+ c_file_name = os.path.join(temp_dir, 'test.c')
+ obj_file_name = os.path.join(temp_dir, 'test.o')
+ with open(c_file_name, 'w') as c_file:
+ c_file.write(snippet + '\n')
+ cmd = cc.split() + extra_cc_args.split() + ['-c', '-o', obj_file_name,
+ c_file_name]
+ r = subprocess.run(cmd, check=False, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
+ return CompileResult(r.returncode, r.stdout)
--
2.37.2
++++++ sys-mount-kernel-definition.patch ++++++
>From c68b6044bc7945716431f1adc091b17c39b80a06 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zane...@linaro.org>
Date: Wed, 10 Aug 2022 14:24:45 -0300
Subject: [PATCH] linux: Mimic kernel defition for BLOCK_SIZE
To avoid possible warnings if the kernel header is included before
sys/mount.h.
Reviewed-by: Florian Weimer <fwei...@redhat.com>
---
sysdeps/unix/sysv/linux/sys/mount.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h
b/sysdeps/unix/sysv/linux/sys/mount.h
index f965986ba8..df6b0dbb42 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -27,8 +27,8 @@
#include <stddef.h>
#include <sys/ioctl.h>
-#define BLOCK_SIZE 1024
#define BLOCK_SIZE_BITS 10
+#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
/* These are the fs-independent mount-flags: up to 16 flags are
--
2.37.2
++++++ sys-mount-usage.patch ++++++
>From 774058d72942249f71d74e7f2b639f77184160a6 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zane...@linaro.org>
Date: Wed, 10 Aug 2022 14:24:47 -0300
Subject: [PATCH] linux: Fix sys/mount.h usage with kernel headers
Now that kernel exports linux/mount.h and includes it on linux/fs.h,
its definitions might clash with glibc exports sys/mount.h. To avoid
the need to rearrange the Linux header to be always after glibc one,
the glibc sys/mount.h is changed to:
1. Undefine the macros also used as enum constants. This covers prior
inclusion of <linux/mount.h> (for instance MS_RDONLY).
2. Include <linux/mount.h> based on the usual __has_include check
(needs to use __has_include ("linux/mount.h") to paper over GCC
bugs.
3. Define enum fsconfig_command only if FSOPEN_CLOEXEC is not defined.
(FSOPEN_CLOEXEC should be a very close proxy.)
4. Define struct mount_attr if MOUNT_ATTR_SIZE_VER0 is not defined.
(Added in the same commit on the Linux side.)
This patch also adds some tests to check if including linux/fs.h and
linux/mount.h after and before sys/mount.h does work.
Checked on x86_64-linux-gnu.
Reviewed-by: Florian Weimer <fwei...@redhat.com>
---
sysdeps/unix/sysv/linux/Makefile | 8 +++
sysdeps/unix/sysv/linux/sys/mount.h | 71 +++++++++++++++++---
sysdeps/unix/sysv/linux/tst-mount-compile.py | 66 ++++++++++++++++++
3 files changed, 137 insertions(+), 8 deletions(-)
create mode 100755 sysdeps/unix/sysv/linux/tst-mount-compile.py
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 3f31c19e4a..60e4cb1521 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -265,6 +265,14 @@ $(objpfx)tst-mount-consts.out:
../sysdeps/unix/sysv/linux/tst-mount-consts.py
< /dev/null > $@ 2>&1; $(evaluate-test)
$(objpfx)tst-mount-consts.out: $(sysdeps-linux-python-deps)
+tests-special += $(objpfx)tst-mount-compile.out
+$(objpfx)tst-mount-compile.out: ../sysdeps/unix/sysv/linux/tst-mount-compile.py
+ $(sysdeps-linux-python) \
+ ../sysdeps/unix/sysv/linux/tst-mount-compile.py \
+ $(sysdeps-linux-python-cc) \
+ < /dev/null > $@ 2>&1; $(evaluate-test)
+$(objpfx)tst-mount-compile.out: $(sysdeps-linux-python-deps)
+
tst-rseq-disable-ENV = GLIBC_TUNABLES=glibc.pthread.rseq=0
endif # $(subdir) == misc
diff --git a/sysdeps/unix/sysv/linux/sys/mount.h
b/sysdeps/unix/sysv/linux/sys/mount.h
index df6b0dbb42..2e3fd6a7fe 100644
--- a/sysdeps/unix/sysv/linux/sys/mount.h
+++ b/sysdeps/unix/sysv/linux/sys/mount.h
@@ -27,6 +27,13 @@
#include <stddef.h>
#include <sys/ioctl.h>
+#ifdef __has_include
+# if __has_include ("linux/mount.h")
+# include "linux/mount.h"
+# endif
+#endif
+
+
#define BLOCK_SIZE_BITS 10
#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
@@ -35,69 +42,98 @@
supported */
enum
{
+#undef MS_RDONLY
MS_RDONLY = 1, /* Mount read-only. */
#define MS_RDONLY MS_RDONLY
+#undef MS_NOSUID
MS_NOSUID = 2, /* Ignore suid and sgid bits. */
#define MS_NOSUID MS_NOSUID
+#undef MS_NODEV
MS_NODEV = 4, /* Disallow access to device special
files. */
#define MS_NODEV MS_NODEV
+#undef MS_NOEXEC
MS_NOEXEC = 8, /* Disallow program execution. */
#define MS_NOEXEC MS_NOEXEC
+#undef MS_SYNCHRONOUS
MS_SYNCHRONOUS = 16, /* Writes are synced at once. */
#define MS_SYNCHRONOUS MS_SYNCHRONOUS
+#undef MS_REMOUNT
MS_REMOUNT = 32, /* Alter flags of a mounted FS. */
#define MS_REMOUNT MS_REMOUNT
+#undef MS_MANDLOCK
MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
#define MS_MANDLOCK MS_MANDLOCK
+#undef MS_DIRSYNC
MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
#define MS_DIRSYNC MS_DIRSYNC
+#undef MS_NOSYMFOLLOW
MS_NOSYMFOLLOW = 256, /* Do not follow symlinks. */
#define MS_NOSYMFOLLOW MS_NOSYMFOLLOW
+#undef MS_NOATIME
MS_NOATIME = 1024, /* Do not update access times. */
#define MS_NOATIME MS_NOATIME
+#undef MS_NODIRATIME
MS_NODIRATIME = 2048, /* Do not update directory access
times. */
#define MS_NODIRATIME MS_NODIRATIME
+#undef MS_BIND
MS_BIND = 4096, /* Bind directory at different place. */
#define MS_BIND MS_BIND
+#undef MS_MOVE
MS_MOVE = 8192,
#define MS_MOVE MS_MOVE
+#undef MS_REC
MS_REC = 16384,
#define MS_REC MS_REC
+#undef MS_SILENT
MS_SILENT = 32768,
#define MS_SILENT MS_SILENT
+#undef MS_POSIXACL
MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
#define MS_POSIXACL MS_POSIXACL
+#undef MS_UNBINDABLE
MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
#define MS_UNBINDABLE MS_UNBINDABLE
+#undef MS_PRIVATE
MS_PRIVATE = 1 << 18, /* Change to private. */
#define MS_PRIVATE MS_PRIVATE
+#undef MS_SLAVE
MS_SLAVE = 1 << 19, /* Change to slave. */
#define MS_SLAVE MS_SLAVE
+#undef MS_SHARED
MS_SHARED = 1 << 20, /* Change to shared. */
#define MS_SHARED MS_SHARED
+#undef MS_RELATIME
MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
#define MS_RELATIME MS_RELATIME
+#undef MS_KERNMOUNT
MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
#define MS_KERNMOUNT MS_KERNMOUNT
+#undef MS_I_VERSION
MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
#define MS_I_VERSION MS_I_VERSION
+#undef MS_STRICTATIME
MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
#define MS_STRICTATIME MS_STRICTATIME
+#undef MS_LAZYTIME
MS_LAZYTIME = 1 << 25, /* Update the on-disk [acm]times lazily. */
#define MS_LAZYTIME MS_LAZYTIME
+#undef MS_ACTIVE
MS_ACTIVE = 1 << 30,
#define MS_ACTIVE MS_ACTIVE
+#undef MS_NOUSER
MS_NOUSER = 1 << 31
#define MS_NOUSER MS_NOUSER
};
/* Flags that can be altered by MS_REMOUNT */
+#undef MS_RMT_MASK
#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION \
|MS_LAZYTIME)
/* Magic mount flag number. Has to be or-ed to the flag values. */
+#undef MS_MGC_VAL
#define MS_MGC_VAL 0xc0ed0000 /* Magic flag number to indicate "new" flags */
#define MS_MGC_MSK 0xffff0000 /* Magic flag number mask */
@@ -106,20 +142,35 @@ enum
is probably as bad and I don't want to create yet another include
file. */
+#undef BLKROSET
#define BLKROSET _IO(0x12, 93) /* Set device read-only (0 = read-write). */
+#undef BLKROGET
#define BLKROGET _IO(0x12, 94) /* Get read-only status (0 = read_write). */
+#undef BLKRRPART
#define BLKRRPART _IO(0x12, 95) /* Re-read partition table. */
+#undef BLKGETSIZE
#define BLKGETSIZE _IO(0x12, 96) /* Return device size. */
+#undef BLKFLSBUF
#define BLKFLSBUF _IO(0x12, 97) /* Flush buffer cache. */
+#undef BLKRASET
#define BLKRASET _IO(0x12, 98) /* Set read ahead for block device. */
+#undef BLKRAGET
#define BLKRAGET _IO(0x12, 99) /* Get current read ahead setting. */
+#undef BLKFRASET
#define BLKFRASET _IO(0x12,100) /* Set filesystem read-ahead. */
+#undef BLKFRAGET
#define BLKFRAGET _IO(0x12,101) /* Get filesystem read-ahead. */
+#undef BLKSECTSET
#define BLKSECTSET _IO(0x12,102) /* Set max sectors per request. */
+#undef BLKSECTGET
#define BLKSECTGET _IO(0x12,103) /* Get max sectors per request. */
+#undef BLKSSZGET
#define BLKSSZGET _IO(0x12,104) /* Get block device sector size. */
+#undef BLKBSZGET
#define BLKBSZGET _IOR(0x12,112,size_t)
+#undef BLKBSZSET
#define BLKBSZSET _IOW(0x12,113,size_t)
+#undef BLKGETSIZE64
#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size. */
@@ -157,6 +208,7 @@ enum
#define MOUNT_ATTR_NOSYMFOLLOW 0x00200000 /* Do not follow symlinks. */
+#ifndef MOUNT_ATTR_SIZE_VER0
/* For mount_setattr. */
struct mount_attr
{
@@ -165,6 +217,7 @@ struct mount_attr
uint64_t propagation;
uint64_t userns_fd;
};
+#endif
#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */
@@ -185,26 +238,28 @@ struct mount_attr
#define FSPICK_EMPTY_PATH 0x00000008
+#ifndef FSOPEN_CLOEXEC
/* The type of fsconfig call made. */
enum fsconfig_command
{
FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
-#define FSCONFIG_SET_FLAG FSCONFIG_SET_FLAG
+# define FSCONFIG_SET_FLAG FSCONFIG_SET_FLAG
FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
-#define FSCONFIG_SET_STRING FSCONFIG_SET_STRING
+# define FSCONFIG_SET_STRING FSCONFIG_SET_STRING
FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob
value */
-#define FSCONFIG_SET_BINARY FSCONFIG_SET_BINARY
+# define FSCONFIG_SET_BINARY FSCONFIG_SET_BINARY
FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by
path */
-#define FSCONFIG_SET_PATH FSCONFIG_SET_PATH
+# define FSCONFIG_SET_PATH FSCONFIG_SET_PATH
FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by
(empty) path */
-#define FSCONFIG_SET_PATH_EMPTY FSCONFIG_SET_PATH_EMPTY
+# define FSCONFIG_SET_PATH_EMPTY FSCONFIG_SET_PATH_EMPTY
FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd
*/
-#define FSCONFIG_SET_FD FSCONFIG_SET_FD
+# define FSCONFIG_SET_FD FSCONFIG_SET_FD
FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
-#define FSCONFIG_CMD_CREATE FSCONFIG_CMD_CREATE
+# define FSCONFIG_CMD_CREATE FSCONFIG_CMD_CREATE
FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
-#define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE
+# define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE
};
+#endif
/* open_tree flags. */
#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the
clone */
diff --git a/sysdeps/unix/sysv/linux/tst-mount-compile.py
b/sysdeps/unix/sysv/linux/tst-mount-compile.py
new file mode 100755
index 0000000000..0ec74d4e0b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-mount-compile.py
@@ -0,0 +1,66 @@
+#!/usr/bin/python3
+# Check if glibc provided sys/mount.h can be used along related kernel
+# headers.
+# Copyright (C) 2022 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+#
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
+
+import argparse
+import sys
+
+import glibcextract
+
+
+def main():
+ """The main entry point."""
+ parser = argparse.ArgumentParser(
+ description='Check if glibc provided sys/mount.h can be '
+ ' used along related kernel headers.')
+ parser.add_argument('--cc', metavar='CC',
+ help='C compiler (including options) to use')
+ args = parser.parse_args()
+
+ if glibcextract.compile_c_snippet(
+ '#include <linux/mount.h>',
+ args.cc).returncode != 0:
+ sys.exit (77)
+
+ def check(testname, snippet):
+ # Add -Werror to catch macro redefinitions and _ISOMAC to avoid
+ # internal glibc definitions.
+ r = glibcextract.compile_c_snippet(snippet, args.cc,
+ '-Werror -D_ISOMAC')
+ if r.returncode != 0:
+ print('error: test {}:\n{}'.format(testname, r.output.decode()))
+ return r.returncode
+
+ status = max(
+ check("sys/mount.h + linux/mount.h",
+ "#include <sys/mount.h>\n"
+ "#include <linux/mount.h>"),
+ check("sys/mount.h + linux/fs.h",
+ "#include <sys/mount.h>\n"
+ "#include <linux/fs.h>"),
+ check("linux/mount.h + sys/mount.h",
+ "#include <linux/mount.h>\n"
+ "#include <sys/mount.h>"),
+ check("linux/fs.h + sys/mount.h",
+ "#include <linux/fs.h>\n"
+ "#include <sys/mount.h>"))
+ sys.exit(status)
+
+if __name__ == '__main__':
+ main()
--
2.37.2
