package/filesystem/xfsprogs/hotfix-noattr.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/xfsprogs/hotfix-noattr.patch
   3 # Copyright (C) 2024 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 --- xfsprogs-6.10.1/io/Makefile.vanilla 2024-09-30 21:27:37.706000000 +0100
  15 +++ xfsprogs-6.10.1/io/Makefile 2024-09-30 21:28:33.695000000 +0100
  16 @@ -20,7 +20,6 @@
  17         fiemap.c \
  18         file.c \
  19         freeze.c \
  20 -       fsproperties.c \
  21         fsuuid.c \
  22         fsync.c \
  23         getrusage.c \
  24 @@ -51,6 +50,11 @@
  25         truncate.c \
  26         utimes.c
  27
  28 +ifeq ($(HAVE_LIBATTR),yes)
  29 +       CFILES+=fsproperties.c
  30 +       CFLAGS += -DHAVE_LIBATTR
  31 +endif
  32 +
  33  LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUUID)
  34  LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG)
  35  LLDFLAGS = -static-libtool-libs
  36 --- xfsprogs-6.10.1/io/init.c.vanilla   2024-09-30 21:28:55.115000000 +0100
  37 +++ xfsprogs-6.10.1/io/init.c   2024-09-30 21:29:47.044000000 +0100
  38 @@ -89,7 +89,9 @@
  39         utimes_init();
  40         crc32cselftest_init();
  41         exchangerange_init();
  42 +#ifdef HAVE_LIBATTR
  43         fsprops_init();
  44 +#endif
  45  }
  46
  47  /*
  48 --- xfsprogs-6.10.1/scrub/phase1.c.vanilla      2024-09-30 21:30:06.969000000 +0100
  49 +++ xfsprogs-6.10.1/scrub/phase1.c      2024-09-30 21:36:07.175000000 +0100
  50 @@ -141,6 +141,7 @@
  51  mode_from_autofsck(
  52         struct scrub_ctx        *ctx)
  53  {
  54 +#ifdef HAVE_LIBATTR
  55         struct fsprops_handle   fph = { };
  56         char                    valuebuf[FSPROP_MAX_VALUELEN + 1] = { 0 };
  57         size_t                  valuelen = FSPROP_MAX_VALUELEN;
  58 @@ -177,6 +178,9 @@
  59         }
  60
  61         fsprops_free_handle(&fph);
  62 +#else
  63 +       goto no_property;
  64 +#endif
  65
  66  summarize:
  67         switch (ctx->mode) {