diff options
| -rw-r--r-- | system/fakeroot/APKBUILD | 4 | ||||
| -rw-r--r-- | system/fakeroot/also-wrap-stat-library-call.patch | 63 |
2 files changed, 1 insertions, 66 deletions
diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index 0bb278cf7..2cf450535 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -19,7 +19,6 @@ source="https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/ xstatjunk.patch fix-prototype-generation.patch - also-wrap-stat-library-call.patch " build() { @@ -52,5 +51,4 @@ sha512sums="dad193b283b48a25806c5bcd06d1f5bbd183ccd40a3fc25f3e7bb88fd6579024f958 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch 5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88 xstatjunk.patch -63db66b0d883495151f817c4e57bdaaff992667416f2f5b03c9b66b65f1fba1762f709dd5153717aa4008d7be0fbc58bf1f41eb2b35dc61047b0cc0b762e145b fix-prototype-generation.patch -0c391ac657518a17af776d804a93efb82e950900e084822c3c04acfcf46a4b1321dbdc878343b68742882a2088a9542889bab561a64efc4638c5a6ec5948081d also-wrap-stat-library-call.patch" +63db66b0d883495151f817c4e57bdaaff992667416f2f5b03c9b66b65f1fba1762f709dd5153717aa4008d7be0fbc58bf1f41eb2b35dc61047b0cc0b762e145b fix-prototype-generation.patch" diff --git a/system/fakeroot/also-wrap-stat-library-call.patch b/system/fakeroot/also-wrap-stat-library-call.patch deleted file mode 100644 index 40c830a36..000000000 --- a/system/fakeroot/also-wrap-stat-library-call.patch +++ /dev/null @@ -1,63 +0,0 @@ -Subject: Also wrap the "stat" library call -Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> -Date: 2021-12-20 -Bug-Debian: https://bugs.debian.org/1001961 -Forwarded: Yes - - Seems changes in glibc 2.33 caused the stat() function to be mapped - into a stat() library call instead of __xstat() as it used to be. - - However, fakeroot does not wrap this, causing files to be reported - with the real owner, not 0 as expected. - - The fix for this got a bit ugly as the abstraction in configure.ac - would not allow wrapping both "stat" and "__xstat". So enhance the - search list capabilities with an optional symbol how the wrapped - function is named internally. Also hack the parser so "stat" gets - actually probed and not mistaken for __xstat. - - Using "realstat" as a symbol is not the best choice as it might be - confusing, but "statstat" seemed even worse. - ---- a/configure.ac -+++ b/configure.ac -@@ -353,9 +353,13 @@ - - :>fakerootconfig.h.tmp - --for SEARCH in %stat f%stat l%stat f%statat %stat64 f%stat64 l%stat64 f%statat64 %mknod %mknodat; do -- FUNC=`echo $SEARCH|sed -e 's/.*%//'` -+for SEARCH in %stat s%tat@realstat f%stat l%stat f%statat %stat64 f%stat64 l%stat64 f%statat64 %mknod %mknodat; do -+ FUNC=`echo $SEARCH|sed -e 's/.*%// ; s/@.*//'` - PRE=`echo $SEARCH|sed -e 's/%.*//'` -+ SYMBOL=`echo $SEARCH|sed -e 's/.*@//'` -+ if test "$SYMBOL" = "$SEARCH" ; then -+ SYMBOL="${PRE}${FUNC}" -+ fi - FOUND= - for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do - AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED) -@@ -366,8 +370,8 @@ - dnl for WRAPPED in _${PRE}${FUNC}; do - dnl FOUND=$WRAPPED - if test -n "$FOUND"; then -- PF=[`echo ${PRE}${FUNC}| tr '[a-z]' '[A-Z]'`] -- DEFINE_WRAP=[`echo wrap_${PRE}${FUNC}| tr '[a-z]' '[A-Z]'`] -+ PF=[`echo $SYMBOL | tr '[a-z]' '[A-Z]'`] -+ DEFINE_WRAP=[`echo wrap_${SYMBOL}| tr '[a-z]' '[A-Z]'`] - DEFINE_NEXT=[`echo wrap_${FOUND}| tr '[a-z]' '[A-Z]'`] - DEFINE_ARG=[`echo wrap_${FOUND}| tr '[a-z]' '[A-Z]'`] - AC_DEFINE_UNQUOTED(WRAP_${PF}, $FOUND) -@@ -509,6 +513,12 @@ - #define TMP_STAT __astat - #define NEXT_STAT_NOARG next___astat - -+#define WRAP_REALSTAT __astat -+#define WRAP_REALSTAT_QUOTE __astat -+#define WRAP_REALSTAT_RAW __astat -+#define TMP_REALSTAT __astat -+#define NEXT_REALSTAT_NOARG next___astat -+ - #define WRAP_LSTAT_QUOTE __astat - #define WRAP_LSTAT __astat - #define WRAP_LSTAT_RAW __astat |