f45925a951
Glibc 2.33 removed `_STAT_VER`. On host machines, which updated to glibc
2.33, building host-fakeroot breaks:
```
In file included from communicate.h:20,
from libfakeroot.c:60:
libfakeroot.c: In function ‘chown’:
libfakeroot.c:99:40: error: ‘_STAT_VER’ undeclared (first use in this function)
99 | #define INT_NEXT_STAT(a,b) NEXT_STAT64(_STAT_VER,a,b)
```
The issue has been discussed on some package maintainer threads, e.g.:
https://bugs.archlinux.org/task/69572
https://bugzilla.redhat.com/show_bug.cgi?id=1889862#c13
A patch series was prepared by Ilya Lipnitskiy which included two other
patches not related to the glibc 2.33 compatibility issue and submitted as
merge request for upstream:
https://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg57280.html
Upstream accepted the merge request:
https://salsa.debian.org/clint/fakeroot/-/merge_requests/10
Note, that this patch series only contains the necessay patches for glibc
2.33 compatibility.
Tested on my Arch Linux machine, building a UBIFS/OverlayFS-based root
filesystem for an i.MX6ULL target board.
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Tested-by: Bartosz Bilas <b.bilas@grinn-global.com>
[Peter: drop patch numbering (PATCH x/y) as pointed out by check-package]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001
|
|
From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Date: Thu, 11 Feb 2021 21:00:04 -0800
|
|
Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This patch add wrappers for newly exported symbols in glibc 2.33.
|
|
|
|
Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7
|
|
|
|
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
---
|
|
libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 48 insertions(+)
|
|
|
|
diff --git a/libfakeroot.c b/libfakeroot.c
|
|
index 14cdbc4..d75c51f 100644
|
|
--- a/libfakeroot.c
|
|
+++ b/libfakeroot.c
|
|
@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
|
|
#endif /* HAVE_FSTATAT */
|
|
|
|
|
|
+#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
|
|
+/* Glibc 2.33 exports symbols for these functions in the shared lib */
|
|
+ int lstat(const char *file_name, struct stat *statbuf) {
|
|
+ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
|
|
+ }
|
|
+ int stat(const char *file_name, struct stat *st) {
|
|
+ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
|
|
+ }
|
|
+ int fstat(int fd, struct stat *st) {
|
|
+ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
|
|
+ }
|
|
+
|
|
+ #ifdef HAVE_FSTATAT
|
|
+ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
|
|
+ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
|
|
+ }
|
|
+ #endif
|
|
+
|
|
+ #ifdef STAT64_SUPPORT
|
|
+ int lstat64(const char *file_name, struct stat64 *st) {
|
|
+ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
|
|
+ }
|
|
+ int stat64(const char *file_name, struct stat64 *st) {
|
|
+ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
|
|
+ }
|
|
+ int fstat64(int fd, struct stat64 *st) {
|
|
+ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
|
|
+ }
|
|
+
|
|
+ #ifdef HAVE_FSTATAT
|
|
+ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
|
|
+ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
|
|
+ }
|
|
+ #endif
|
|
+ #endif
|
|
+
|
|
+ int mknod(const char *pathname, mode_t mode, dev_t dev) {
|
|
+ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
|
|
+ }
|
|
+
|
|
+ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
|
|
+ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
|
|
+ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
|
|
+ }
|
|
+ #endif
|
|
+#endif /* GLIBC_PREREQ */
|
|
+
|
|
+
|
|
#ifdef FAKEROOT_FAKENET
|
|
pid_t fork(void)
|
|
{
|
|
--
|
|
2.30.1
|
|
|