From 3a6f81dea5a725d5e251576436b2be290c0f8ea6 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 May 2024 03:16:06 -0500
Subject: user/squashfs-tools: Update to 4.6.1

Also, move tools to /usr/sbin because lzo/lz4 are in /usr/lib.
---
 user/squashfs-tools/fix-compat.patch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'user/squashfs-tools/fix-compat.patch')

diff --git a/user/squashfs-tools/fix-compat.patch b/user/squashfs-tools/fix-compat.patch
index e93b6b827..adc7e420d 100644
--- a/user/squashfs-tools/fix-compat.patch
+++ b/user/squashfs-tools/fix-compat.patch
@@ -1,6 +1,6 @@
---- squashfs-tools/action.c
-+++ squashfs-tools/action.c
-@@ -2236,6 +2236,9 @@
+--- a/squashfs-tools/action.c
++++ b/squashfs-tools/action.c
+@@ -2562,6 +2562,9 @@
  	return 1;
  }
  
@@ -10,21 +10,21 @@
  
  TEST_FN(name, ACTION_ALL_LNK, \
  	return fnmatch(atom->argv[0], action_data->name,
---- squashfs-tools/mksquashfs.c
-+++ squashfs-tools/mksquashfs.c
-@@ -4665,6 +4665,9 @@
- 	return paths;
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -4557,6 +4557,9 @@
+ 	return source;
  }
  
 +#ifndef FNM_EXTMATCH
 +#define FNM_EXTMATCH 0
 +#endif
  
- int excluded_match(char *name, struct pathname *path, struct pathnames **new)
- {
---- squashfs-tools/unsquashfs.c
-+++ squashfs-tools/unsquashfs.c
-@@ -1457,6 +1457,9 @@
+ static struct dir_info *add_source(struct dir_info *sdir, char *source,
+ 		char *subpath, char *file, char **prefix,
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -1450,6 +1450,9 @@
  	free(paths);
  }
  
@@ -32,5 +32,5 @@
 +#define FNM_EXTMATCH 0
 +#endif
  
- int matches(struct pathnames *paths, char *name, struct pathnames **new)
- {
+ struct pathname *add_path(struct pathname *paths, int type, char *target,
+ 							char *alltarget)
-- 
cgit v1.2.3-60-g2f50