diff --git a/backport-add-wrappers-for-new-glibc-2.33+-symbols.patch b/backport-add-wrappers-for-new-glibc-2.33+-symbols.patch deleted file mode 100644 index 78db6a4..0000000 --- a/backport-add-wrappers-for-new-glibc-2.33+-symbols.patch +++ /dev/null @@ -1,69 +0,0 @@ -From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -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 ---- - 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) - { diff --git a/backport-define-_STAT_VER-if-not-already-defined.patch b/backport-define-_STAT_VER-if-not-already-defined.patch index bfeb4ac..e186728 100644 --- a/backport-define-_STAT_VER-if-not-already-defined.patch +++ b/backport-define-_STAT_VER-if-not-already-defined.patch @@ -1,22 +1,8 @@ -From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -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 ---- - 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) +diff -ruN fakeroot/libfakeroot.c fakeroot-upstream-1.30.1/libfakeroot.c +--- fakeroot/libfakeroot.c 2022-11-14 03:31:24.576878771 +0800 ++++ fakeroot-upstream-1.30.1/libfakeroot.c 2022-11-14 03:42:12.074723929 +0800 +@@ -117,6 +117,16 @@ + #endif #endif +#ifndef _STAT_VER diff --git a/backport-fix-__xmknod-at-pointer-argument.patch b/backport-fix-__xmknod-at-pointer-argument.patch deleted file mode 100644 index 42ff746..0000000 --- a/backport-fix-__xmknod-at-pointer-argument.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -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 ---- - 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 *]) - - ]) - diff --git a/backport-fix-compile-error-with-DEBUG-enabled.patch b/backport-fix-compile-error-with-DEBUG-enabled.patch deleted file mode 100644 index 8ca798e..0000000 --- a/backport-fix-compile-error-with-DEBUG-enabled.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d074aaa34d6928989308a3870738d6b1c28f2bae Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Thu, 11 Feb 2021 21:00:20 -0800 -Subject: [PATCH] libfakeroot.c: fix compile error with DEBUG enabled - -Signed-off-by: Ilya Lipnitskiy ---- - 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); diff --git a/debian_eglibc-fts-without-LFS.patch b/debian_eglibc-fts-without-LFS.patch deleted file mode 100644 index 5ba45fd..0000000 --- a/debian_eglibc-fts-without-LFS.patch +++ /dev/null @@ -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 - } - } - diff --git a/debian_fix-shell-in-fakeroot.patch b/debian_fix-shell-in-fakeroot.patch index ce5d23f..df5626e 100644 --- a/debian_fix-shell-in-fakeroot.patch +++ b/debian_fix-shell-in-fakeroot.patch @@ -1,10 +1,6 @@ -Description: Fix shell in fakeroot.in - Use /bin/sh instead of @SHELL@ in fakeroot.in -Author: Juan Picca -Last-Update: 2016-06-27 ---- ---- a/scripts/fakeroot.in -+++ b/scripts/fakeroot.in +diff -ruN fakeroot/scripts/fakeroot.in fakeroot-upstream-1.30.1/scripts/fakeroot.in +--- fakeroot/scripts/fakeroot.in 2022-11-14 03:31:24.546545830 +0800 ++++ fakeroot-upstream-1.30.1/scripts/fakeroot.in 2022-11-14 03:42:11.985891734 +0800 @@ -1,4 +1,4 @@ -#!@SHELL@ +#!/bin/sh diff --git a/fakeroot-drop-tartest.patch b/fakeroot-drop-tartest.patch index a8a16e8..2cfbf41 100644 --- a/fakeroot-drop-tartest.patch +++ b/fakeroot-drop-tartest.patch @@ -1,20 +1,7 @@ -From ed8560719c6246182a77aca14c31ac736ff4d08a Mon Sep 17 00:00:00 2001 -From: si-gui -Date: Mon, 31 May 2021 14:44:03 +0800 -Subject: [PATCH] fakeroot drop tartest -This patch comes from opensuse -(https://build.opensuse.org/package/view_file/openSUSE:Factory/fakeroot/fakeroot-drop-tartest.patch) -Skip tar test: the test is unstable and keeps on randomly failing. - ---- - test/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index 5ea4d72..93ce76e 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -9,7 +9,6 @@ TESTS = \ +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 \ @@ -22,6 +9,3 @@ index 5ea4d72..93ce76e 100644 t.touchinstall \ t.truereturn \ t.xattr --- -2.30.0 - diff --git a/fakeroot-inttypes.patch b/fakeroot-inttypes.patch index 1c645dc..86bc868 100644 --- a/fakeroot-inttypes.patch +++ b/fakeroot-inttypes.patch @@ -1,7 +1,7 @@ -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 @@ +diff -ruN fakeroot/faked.c fakeroot-upstream-1.30.1/faked.c +--- fakeroot/faked.c 2022-11-14 03:31:24.575795452 +0800 ++++ fakeroot-upstream-1.30.1/faked.c 2022-11-14 03:42:12.011891401 +0800 +@@ -130,7 +130,7 @@ #ifdef FAKEROOT_DB_PATH # include #endif @@ -10,7 +10,7 @@ diff -up fakeroot-1.20.2/faked.c.inttypes fakeroot-1.20.2/faked.c #ifndef FAKEROOT_FAKENET # define FAKE_KEY msg_key #else /* FAKEROOT_FAKENET */ -@@ -614,10 +614,10 @@ int save_database(const uint32_t remote) +@@ -619,10 +619,10 @@ (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 @@ -25,7 +25,7 @@ diff -up fakeroot-1.20.2/faked.c.inttypes fakeroot-1.20.2/faked.c #endif } -@@ -655,7 +655,7 @@ int load_database(const uint32_t remote) +@@ -660,7 +660,7 @@ stdev = path_st.st_dev; stino = path_st.st_ino; #else @@ -34,7 +34,7 @@ diff -up fakeroot-1.20.2/faked.c.inttypes fakeroot-1.20.2/faked.c &stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev); if (r != 7) break; -@@ -682,13 +682,13 @@ int load_database(const uint32_t remote) +@@ -687,13 +687,13 @@ /* */ /*********************************/ void debug_stat(const struct fakestat *st){ diff --git a/fakeroot-multilib.patch b/fakeroot-multilib.patch index 82dcc79..21fc7a9 100644 --- a/fakeroot-multilib.patch +++ b/fakeroot-multilib.patch @@ -1,7 +1,7 @@ -diff -up fakeroot-1.25.2/scripts/fakeroot.in.multilib fakeroot-1.25.2/scripts/fakeroot.in ---- fakeroot-1.25.2/scripts/fakeroot.in.multilib 2020-10-05 21:34:34.584490563 +0200 -+++ fakeroot-1.25.2/scripts/fakeroot.in 2020-10-05 21:35:33.264201406 +0200 -@@ -35,7 +35,7 @@ FAKEROOT_BINDIR=@bindir@ +diff -ruN fakeroot/scripts/fakeroot.in fakeroot-upstream-1.30.1/scripts/fakeroot.in +--- fakeroot/scripts/fakeroot.in 2022-11-14 03:31:24.546545830 +0800 ++++ fakeroot-upstream-1.30.1/scripts/fakeroot.in 2022-11-14 03:42:12.032474470 +0800 +@@ -35,7 +35,7 @@ USEABSLIBPATH=@LDPRELOADABS@ FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@ diff --git a/fakeroot-upstream-1.25.2-sw.patch b/fakeroot-upstream-1.25.2-sw.patch index 5719394..61fbd87 100755 --- a/fakeroot-upstream-1.25.2-sw.patch +++ b/fakeroot-upstream-1.25.2-sw.patch @@ -1,7 +1,7 @@ -diff -Naur fakeroot-upstream-1.25.2.org/configure.ac fakeroot-upstream-1.25.2.sw/configure.ac ---- fakeroot-upstream-1.25.2.org/configure.ac 2022-04-28 17:01:46.991888440 +0800 -+++ fakeroot-upstream-1.25.2.sw/configure.ac 2022-04-28 17:04:38.291888440 +0800 -@@ -430,7 +430,7 @@ +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 @@ -10,7 +10,7 @@ diff -Naur fakeroot-upstream-1.25.2.org/configure.ac fakeroot-upstream-1.25.2.sw libcpath="/lib/libc.so.6.1" ;; (*:linux*) -@@ -577,6 +577,21 @@ +@@ -666,6 +666,21 @@ ], [AC_MSG_RESULT([no]);]) ;; @@ -32,9 +32,9 @@ diff -Naur fakeroot-upstream-1.25.2.org/configure.ac fakeroot-upstream-1.25.2.sw esac dnl AH_TEMPLATE([MACOSX], [is __APPLE__ defined by the compiler]) -diff -Naur fakeroot-upstream-1.25.2.org/statconv/glibc/linux/sw_64/stats.h fakeroot-upstream-1.25.2.sw/statconv/glibc/linux/sw_64/stats.h ---- fakeroot-upstream-1.25.2.org/statconv/glibc/linux/sw_64/stats.h 1970-01-01 08:00:00.000000000 +0800 -+++ fakeroot-upstream-1.25.2.sw/statconv/glibc/linux/sw_64/stats.h 2022-04-28 17:04:03.311888440 +0800 +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 diff --git a/fakeroot-upstream-1.25.2.tar.gz b/fakeroot-upstream-1.25.2.tar.gz deleted file mode 100644 index d854156..0000000 Binary files a/fakeroot-upstream-1.25.2.tar.gz and /dev/null differ diff --git a/fakeroot-upstream-1.30.1.tar.gz b/fakeroot-upstream-1.30.1.tar.gz new file mode 100644 index 0000000..41d7042 Binary files /dev/null and b/fakeroot-upstream-1.30.1.tar.gz differ diff --git a/fakeroot.spec b/fakeroot.spec index e1a728b..2d0468a 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,22 +1,18 @@ %bcond_without autoconf Summary: Gives a fake root environment Name: fakeroot -Version: 1.25.2 -Release: 4 +Version: 1.30.1 +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 -Patch0: debian_eglibc-fts-without-LFS.patch -Patch2: debian_fix-shell-in-fakeroot.patch -Patch4: fakeroot-inttypes.patch -Patch5: fakeroot-multilib.patch -Patch6: fakeroot-drop-tartest.patch -Patch6000: backport-define-_STAT_VER-if-not-already-defined.patch -Patch6001: backport-add-wrappers-for-new-glibc-2.33+-symbols.patch -Patch6002: backport-fix-compile-error-with-DEBUG-enabled.patch -Patch6003: backport-fix-__xmknod-at-pointer-argument.patch +Source0: http://salsa.debian.org/clint/fakeroot/-/archive/upstream/1.30.1/%{name}-upstream-%{version}.tar.gz +Patch1: debian_fix-shell-in-fakeroot.patch +Patch2: fakeroot-inttypes.patch +Patch3: fakeroot-multilib.patch +Patch4: fakeroot-drop-tartest.patch +Patch5000: backport-define-_STAT_VER-if-not-already-defined.patch %ifarch sw_64 -Patch6004: fakeroot-upstream-1.25.2-sw.patch +Patch5001: fakeroot-upstream-1.25.2-sw.patch %endif %if %{with autoconf} BuildRequires: autoconf automake libtool po4a @@ -133,6 +129,9 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Sat Nov 12 2022 hua 1.30.1-1 +- update to 1.30.1 + * Wed Oct 19 2022 wuzx - 1.25.2-4 - add sw64 patch