From cd2984a92c5c4f52e440b7497efe7696bb03ab45 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Jan 2024 08:03:11 +0000 Subject: [PATCH] import CS xfsdump-3.1.8-7.el8 --- ...rap-define-UUID_STR_LEN-36-in-ifndef.patch | 38 +++++++++++++++++++ SPECS/xfsdump.spec | 4 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0004-v3.1.9-common-types.h-Wrap-define-UUID_STR_LEN-36-in-ifndef.patch diff --git a/SOURCES/0004-v3.1.9-common-types.h-Wrap-define-UUID_STR_LEN-36-in-ifndef.patch b/SOURCES/0004-v3.1.9-common-types.h-Wrap-define-UUID_STR_LEN-36-in-ifndef.patch new file mode 100644 index 0000000..c6edb47 --- /dev/null +++ b/SOURCES/0004-v3.1.9-common-types.h-Wrap-define-UUID_STR_LEN-36-in-ifndef.patch @@ -0,0 +1,38 @@ +From 6ff49bf7951e5951bd8f938fc3662c896a1bf9e8 Mon Sep 17 00:00:00 2001 +From: Jan Tulak +Date: Thu, 6 Dec 2018 17:10:00 -0600 +Subject: [PATCH] common/types.h: Wrap #define UUID_STR_LEN 36 in #ifndef + +Current Fedora 28 has the constant it in uuid/uuid.h where it belongs (per +comment next to the define), so we should treat the define as a +backward-compatibility workaround, rather than enforcing it for all. + +Signed-off-by: Jan Tulak +[sandeen: tweak comment to match] +Reviewed-by: Eric Sandeen +Signed-off-by: Eric Sandeen +Signed-off-by: Pavel Reichl +--- + common/types.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/common/types.h b/common/types.h +index 50c841e..b619667 100644 +--- a/common/types.h ++++ b/common/types.h +@@ -33,9 +33,11 @@ + #define XFSDUMP_DIRPATH inv_basepath() + + /* +- * Should be, but isn't, defined in uuid/uuid.h ++ * If not defined in uuid/uuid.h + */ ++#ifndef UUID_STR_LEN + #define UUID_STR_LEN 36 ++#endif + + /* fundamental page size - probably should not be hardwired, but + * for now we will +-- +2.41.0 + diff --git a/SPECS/xfsdump.spec b/SPECS/xfsdump.spec index 17555ed..dcd3f35 100644 --- a/SPECS/xfsdump.spec +++ b/SPECS/xfsdump.spec @@ -1,7 +1,7 @@ Summary: Administrative utilities for the XFS filesystem Name: xfsdump Version: 3.1.8 -Release: 5%{?dist} +Release: 7%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. License: GPL+ @@ -11,6 +11,7 @@ Source0: http://kernel.org/pub/linux/utils/fs/xfs/%{name}/%{name}-%{version}.tar Patch0: 0001-xfsdump-Revert-xfsdump-handle-bind-mount-targets.patch Patch1: 0002-xfsdump-intercept-bind-mount-targets.patch Patch2: 0003-for-next-xfsrestore-fix-rootdir-due-to-xfsdump-bulkstat-misus.patch +Patch3: 0004-v3.1.9-common-types.h-Wrap-define-UUID_STR_LEN-36-in-ifndef.patch Patch4: 0005-v3.1.12-xfsrestore-fix-on-media-inventory-media-unpacking.patch Patch5: 0006-v3.1.12-xfsrestore-fix-on-media-inventory-stream-unpacking.patch Patch6: 0007-v3.1.12-xfsdump-fix-on-media-inventory-stream-packing.patch @@ -43,6 +44,7 @@ subtrees may be restored from full or partial backups. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1