!35 Update to 1.32.1

From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

backport-add-wrappers-for-new-glibc-2.33+-symbols.patch

@@ -1,69 +0,0 @@
-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
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- 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)
- {

backport-define-_STAT_VER-if-not-already-defined.patch

@@ -1,34 +0,0 @@
-From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Thu, 11 Feb 2021 20:59:25 -0800
-Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
-
-Based on patch from Jan Pazdziora:
-https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- libfakeroot.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libfakeroot.c b/libfakeroot.c
-index 3e80e38..14cdbc4 100644
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -90,6 +90,16 @@
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
- #endif
- 
-+#ifndef _STAT_VER
-+ #if defined (__aarch64__)
-+  #define _STAT_VER 0
-+ #elif defined (__x86_64__)
-+  #define _STAT_VER 1
-+ #else
-+  #define _STAT_VER 3
-+ #endif
-+#endif
-+
- /*
-    These INT_* (which stands for internal) macros should always be used when
-    the fakeroot library owns the storage of the stat variable.

backport-fix-__xmknod-at-pointer-argument.patch

@@ -1,57 +0,0 @@
-From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Sat, 13 Feb 2021 19:32:08 -0800
-Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument
-
-Switch default to assume * and not the absence of *.
-
-On glibc 2.33+, there is no definition for these functions in header
-files, so the compile test doesn't work. But, we can default to using
-the pointer (as is the case with newer glibc), and use the header file
-on older platforms to fail the test and use no pointer.
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- configure.ac | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73415d2..d85566f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
-   ]], [[
-        int __xmknod  ( int ver,
-                        const char *pathname ,
--                       mode_t  mode ,  dev_t dev);
-+                       mode_t  mode ,  dev_t *dev);
-   ]])],[
--   AC_DEFINE(XMKNOD_FRTH_ARG,)
--   AC_MSG_RESULT([no extra *])
--  ],[
-    AC_DEFINE(XMKNOD_FRTH_ARG,[*])
-    AC_MSG_RESULT([needs *])
-+  ],[
-+   AC_DEFINE(XMKNOD_FRTH_ARG,)
-+   AC_MSG_RESULT([no extra *])
- 
-   ])
- 
-@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
-        int __xmknodat  ( int ver,
-                          int dirfd,
-                          const char *pathname ,
--                         mode_t  mode ,  dev_t dev);
-+                         mode_t  mode ,  dev_t *dev);
-   ]])],[
--   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
--   AC_MSG_RESULT([no extra *])
--  ],[
-    AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
-    AC_MSG_RESULT([needs *])
-+  ],[
-+   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
-+   AC_MSG_RESULT([no extra *])
- 
-   ])
- 

backport-fix-compile-error-with-DEBUG-enabled.patch

@@ -1,23 +0,0 @@
-From d074aaa34d6928989308a3870738d6b1c28f2bae Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Thu, 11 Feb 2021 21:00:20 -0800
-Subject: [PATCH] libfakeroot.c: fix compile error with DEBUG enabled
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- libfakeroot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfakeroot.c b/libfakeroot.c
-index d75c51f..31480f8 100644
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta
- 
- #ifdef LIBFAKEROOT_DEBUGGING
-   if (fakeroot_debug) {
--    fprintf(stderr, "statx fd %d\n", fd);
-+    fprintf(stderr, "statx fd %d\n", dirfd);
-   }
- #endif /* LIBFAKEROOT_DEBUGGING */
-   r=INT_NEXT_FSTATAT(dirfd, path, &st, flags);

debian_eglibc-fts-without-LFS.patch

@@ -1,26 +0,0 @@
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -1949,11 +1949,7 @@
-             || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
-     r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
-   if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
--# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
--    SEND_GET_STAT64(r->fts_statp, _STAT_VER);
--# else
-     SEND_GET_STAT(r->fts_statp, _STAT_VER);
--# endif
-   }
- 
-   return r;
-@@ -1972,11 +1968,7 @@
-   first=next_fts_children(ftsp, options);
-   for(r = first; r; r = r->fts_link) {
-     if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
--# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
--      SEND_GET_STAT64(r->fts_statp, _STAT_VER);
--# else
-       SEND_GET_STAT(r->fts_statp, _STAT_VER);
--# endif
-     }
-   }
- 

fakeroot-drop-tartest.patch

@@ -0,0 +1,11 @@
+diff -ruN fakeroot/test/Makefile.am fakeroot-upstream-1.30.1/test/Makefile.am
+--- fakeroot/test/Makefile.am	2022-11-14 03:31:24.548712469 +0800
++++ fakeroot-upstream-1.30.1/test/Makefile.am	2022-11-14 03:42:12.054140860 +0800
+@@ -10,7 +10,6 @@
+   t.no_ld_preload				\
+   t.no_ld_preload_link				\
+   t.option					\
+-  t.tar						\
+   t.touchinstall				\
+   t.truereturn \
+   t.xattr

fakeroot-inttypes.patch

@@ -1,55 +0,0 @@
-diff -up fakeroot-1.20.2/faked.c.inttypes fakeroot-1.20.2/faked.c
---- fakeroot-1.20.2/faked.c.inttypes	2014-10-05 17:16:00.000000000 +0200
-+++ fakeroot-1.20.2/faked.c	2015-06-17 11:29:01.335799421 +0200
-@@ -125,7 +125,7 @@
- #ifdef FAKEROOT_DB_PATH
- # include <dirent.h>
- #endif
--
-+#include <inttypes.h>
- #ifndef FAKEROOT_FAKENET
- # define FAKE_KEY msg_key
- #else /* FAKEROOT_FAKENET */
-@@ -614,10 +614,10 @@ int save_database(const uint32_t remote)
-               (uint64_t) i->buf.mode,(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,
-               (uint64_t) i->buf.nlink,(uint64_t) i->buf.rdev,path);
- #else
--    fprintf(f,"dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
--            (uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode,
--            (uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink,
--            (uint64_t) i->buf.rdev);
-+    fprintf(f,"dev=%" PRIx64 ",ino=%" PRIu64 ",mode=%" PRIo32 ",uid=%" PRIu32 ",gid=%" PRIu32 ",nlink=%" PRIu32",rdev=%" PRIu64 "\n",
-+            i->buf.dev, i->buf.ino, i->buf.mode,
-+            i->buf.uid, i->buf.gid, i->buf.nlink,
-+            i->buf.rdev);
- #endif
-   }
- 
-@@ -655,7 +655,7 @@ int load_database(const uint32_t remote)
-     stdev = path_st.st_dev;
-     stino = path_st.st_ino;
- #else
--    r=scanf("dev=%llx,ino=%llu,mode=%llo,uid=%llu,gid=%llu,nlink=%llu,rdev=%llu\n",
-+    r=scanf("dev=%" PRIx64 ",ino=%" PRIu64 ",mode=%" PRIo64 ",uid=%" PRIu64 ",gid=%"PRIu64 ",nlink=%" PRIu64 ",rdev=%" PRIu64 "\n",
-             &stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev);
-     if (r != 7)
-       break;
-@@ -682,13 +682,13 @@ int load_database(const uint32_t remote)
- /*                               */
- /*********************************/
- void debug_stat(const struct fakestat *st){
--  fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n",
-+  fprintf(stderr,"dev:ino=(%" PRIx64 ":%" PRIx64 "), mode=0%" PRIo32 ", own=(%" PRIi32 ",%" PRIi32 "), nlink=%" PRIi32 ", rdev=%" PRIi64 "\n",
- 	  st->dev,
- 	  st->ino,
--	  (long)st->mode,
--	  (long)st->uid,
--	  (long)st->gid,
--	  (long)st->nlink,
-+	  st->mode,
-+	  st->uid,
-+	  st->gid,
-+	  st->nlink,
- 	  st->rdev);
- }
- 

fakeroot-upstream-1.25.2-sw.patch

@@ -0,0 +1,124 @@
+diff -ruN fakeroot/configure.ac fakeroot-upstream-1.30.1/configure.ac
+--- fakeroot/configure.ac	2022-11-14 03:31:24.575795452 +0800
++++ fakeroot-upstream-1.30.1/configure.ac	2022-11-14 03:42:12.116973388 +0800
+@@ -499,7 +499,7 @@
+ LDPRELOADABS=0
+ LDEXTRAVAR=""
+ case $target_cpu:$target_os in
+-	(alpha*:linux*|ia64*:linux*)
++	(sw_64*:linux|alpha*:linux*|ia64*:linux*)
+ 		libcpath="/lib/libc.so.6.1"
+ 		;;
+ 	(*:linux*)
+@@ -666,6 +666,21 @@
+ ],
+        [AC_MSG_RESULT([no]);])
+         ;;
++esac
++
++case "$target_cpu:$target_os" in
++	(sw_64*:linux*)
++	AH_TEMPLATE([STUPID_ALPHA_HACK], [stat-struct conversion hackery])
++	AC_MSG_CHECKING([if we need to do stat-struct conversion hackery])
++	AC_EGREP_CPP([3:3],[
++#include <sys/stat.h>
++_STAT_VER:_STAT_VER_GLIBC2_3_4
++],
++       [AC_MSG_RESULT([yes]); AC_DEFINE(STUPID_ALPHA_HACK)
++CPPFLAGS="$CPPFLAGS -I\$(srcdir)/statconv/glibc/linux/sw_64"
++],
++       [AC_MSG_RESULT([no]);])
++        ;;
+ esac
+ 
+ dnl AH_TEMPLATE([MACOSX], [is __APPLE__ defined by the compiler])
+diff -ruN fakeroot/statconv/glibc/linux/sw_64/stats.h fakeroot-upstream-1.30.1/statconv/glibc/linux/sw_64/stats.h
+--- fakeroot/statconv/glibc/linux/sw_64/stats.h	1970-01-01 08:00:00.000000000 +0800
++++ fakeroot-upstream-1.30.1/statconv/glibc/linux/sw_64/stats.h	2022-11-14 03:42:12.116973388 +0800
+@@ -0,0 +1,86 @@
++/* Definition of `struct stat' used in the kernel.  */
++struct fakeroot_kernel_stat
++  {
++    unsigned int st_dev;
++    unsigned int st_ino;
++    unsigned int st_mode;
++    unsigned int st_nlink;
++    unsigned int st_uid;
++    unsigned int st_gid;
++    unsigned int st_rdev;
++    long int st_size;
++    unsigned long int st_atime;
++    unsigned long int st_mtime;
++    unsigned long int st_ctime;
++    unsigned int st_blksize;
++    int st_blocks;
++    unsigned int st_flags;
++    unsigned int st_gen;
++  };
++
++/* Definition of `struct stat64' used in the kernel.  */
++struct fakeroot_kernel_stat64
++  {
++    unsigned long   st_dev;
++    unsigned long   st_ino;
++    unsigned long   st_rdev;
++    long            st_size;
++    unsigned long   st_blocks;
++
++    unsigned int    st_mode;
++    unsigned int    st_uid;
++    unsigned int    st_gid;
++    unsigned int    st_blksize;
++    unsigned int    st_nlink;
++    unsigned int    __pad0;
++
++    unsigned long   st_atime;
++    unsigned long   st_atimensec; 
++    unsigned long   st_mtime;
++    unsigned long   st_mtimensec;
++    unsigned long   st_ctime;
++    unsigned long   st_ctimensec;
++    long            __unused[3];
++  };
++
++/* Definition of `struct stat' used by glibc 2.0.  */
++struct fakeroot_glibc2_stat
++  {
++    __dev_t st_dev;
++    __ino_t st_ino;
++    __mode_t st_mode;
++    __nlink_t st_nlink;
++    __uid_t st_uid;
++    __gid_t st_gid;
++    __dev_t st_rdev;
++    __off_t st_size;
++    __time_t st_atime;
++    __time_t st_mtime;
++    __time_t st_ctime;
++    unsigned int st_blksize;
++    int st_blocks;
++    unsigned int st_flags;
++    unsigned int st_gen;
++  };
++
++/* Definition of `struct stat' used by glibc 2.1.  */
++struct fakeroot_glibc21_stat
++  {
++    __dev_t st_dev;
++    __ino64_t st_ino;
++    __mode_t st_mode;
++    __nlink_t st_nlink;
++    __uid_t st_uid;
++    __gid_t st_gid;
++    __dev_t st_rdev;
++    __off_t st_size;
++    __time_t st_atime;
++    __time_t st_mtime;
++    __time_t st_ctime;
++    __blkcnt64_t st_blocks;
++    __blksize_t st_blksize;
++    unsigned int st_flags;
++    unsigned int st_gen;
++    int __pad3;
++    long __unused[4];
++  };

fakeroot.spec

@@ -1,23 +1,21 @@
 %bcond_without autoconf
 Summary:             Gives a fake root environment
 Name:                fakeroot
-Version:             1.25.2
+Version:             1.32.2
-Release:             2
+Release:             1
 License:             GPLv3+ and LGPLv2.1 and MIT and GPL+ 
 URL:                 https://tracker.debian.org/pkg/fakeroot
-Source0:             http://salsa.debian.org/clint/fakeroot/-/archive/upstream/1.25.2/%{name}-upstream-%{version}.tar.gz
+Source0:             https://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz
-Patch0:              debian_eglibc-fts-without-LFS.patch
+Patch1:              debian_fix-shell-in-fakeroot.patch
-Patch2:              debian_fix-shell-in-fakeroot.patch
+Patch2:              fakeroot-multilib.patch
-Patch4:              fakeroot-inttypes.patch
+Patch3:              fakeroot-drop-tartest.patch
-Patch5:              fakeroot-multilib.patch
+%ifarch sw_64
-Patch6000:           backport-define-_STAT_VER-if-not-already-defined.patch
+Patch5001:           fakeroot-upstream-1.25.2-sw.patch
-Patch6001:           backport-add-wrappers-for-new-glibc-2.33+-symbols.patch
+%endif
-Patch6002:           backport-fix-compile-error-with-DEBUG-enabled.patch
-Patch6003:           backport-fix-__xmknod-at-pointer-argument.patch
 %if %{with autoconf}
 BuildRequires:       autoconf automake libtool po4a
 %endif
-BuildRequires:       /usr/bin/getopt  libacl-devel libcap-devel sharutils
+BuildRequires:       /usr/bin/getopt  libacl-devel libcap-devel sharutils make gcc
 Requires:            /usr/bin/getopt fakeroot-libs = %{version}-%{release}
 Requires(post):      /usr/sbin/alternatives
 Requires(post):      /usr/bin/readlink
@@ -35,7 +33,7 @@ Summary:             Gives a fake root environment (libraries)
 This package contains the libraries required by %{name}.
 
 %prep
-%autosetup -p1 -n   %{name}-upstream-%{version}
+%autosetup -p1 -n   %{name}-%{version}
 
 %build
 %if %{with autoconf}
@@ -129,6 +127,21 @@ fi
 %ghost %{_libdir}/libfakeroot/libfakeroot-0.so
 
 %changelog
+* Wed Dec 27 2023 liyanan <liyanan61@h-partners.com> - 1.32.2-1
+- Update to 1.32.2
+
+* Wed Jun 14 2023 liyanan <thistleslyn@163.com> - 1.31-1
+- Update to 1.31
+
+* Sat Nov 12 2022 hua <dchang@zhixundn.com> 1.30.1-1
+- update to 1.30.1
+
+* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 1.25.2-4
+- add sw64 patch
+
+* Tue Jun 21 2022 liyanan <liyanan32@h-partners.com> - 1.25.2-3
+- Skip tar test: the test is unstable and keeps on randomly failing
+
 * Sat Mar 13 2021 shixuantong <shixuantong@huawei.com> - 1.25.2-2
 - Fix error: '_STAT_VER' undeclared