From e7124be19fbdca28b2de144c3e779f24632f74fb Mon Sep 17 00:00:00 2001 From: zhangzhangxin Date: Mon, 10 Jul 2023 17:37:09 +0800 Subject: [PATCH] sync:libfakeroot.c: define _STAT_VER if not already defined Signed-off-by: zhangzhangxin --- ....c-define-_STAT_VER-if-not-already-d.patch | 34 +++++++++++++++++++ fakeroot.spec | 7 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-sync-libfakeroot.c-define-_STAT_VER-if-not-already-d.patch diff --git a/0001-sync-libfakeroot.c-define-_STAT_VER-if-not-already-d.patch b/0001-sync-libfakeroot.c-define-_STAT_VER-if-not-already-d.patch new file mode 100644 index 0000000..b40c90b --- /dev/null +++ b/0001-sync-libfakeroot.c-define-_STAT_VER-if-not-already-d.patch @@ -0,0 +1,34 @@ +From 4c17564b4d26d59659347f7b02403a4ff3285b6f Mon Sep 17 00:00:00 2001 +From: zhangzhangxin +Date: Mon, 10 Jul 2023 17:30:13 +0800 +Subject: [PATCH] sync:libfakeroot.c: define _STAT_VER if not already defined + +Signed-off-by: zhangzhangxin +--- + libfakeroot.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libfakeroot.c b/libfakeroot.c +index badb723..88a2290 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. +-- +2.40.0.windows.1 + diff --git a/fakeroot.spec b/fakeroot.spec index 16ff51d..2c4bce6 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -2,7 +2,7 @@ Summary: Gives a fake root environment Name: fakeroot Version: 1.25.2 -Release: 3 +Release: 4 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 @@ -11,6 +11,8 @@ Patch2: debian_fix-shell-in-fakeroot.patch Patch4: fakeroot-inttypes.patch Patch5: fakeroot-multilib.patch Patch6: fakeroot-drop-tartest.patch +Patch7: 0001-sync-libfakeroot.c-define-_STAT_VER-if-not-already-d.patch + %if %{with autoconf} BuildRequires: autoconf automake libtool po4a %endif @@ -131,6 +133,9 @@ fi %{_mandir}/man1/fakeroot.1* %changelog +* Mon Jul 10 2023 zhangxin - 1.25.2-4 +- libfakeroot.c: define _STAT_VER if not already defined + * Mon Jun 7 2021 lingsheng - 1.25.2-3 - Fix file confilct with old version -- Gitee