From 7d58e295dc3575f75cccabb10425905b5c5914e1 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sat, 15 Feb 2025 10:15:56 +0100
Subject: [PATCH] synocli-file: fix file guesser command 'file' (#6452)

- fixes #6451
- version of cross/file and native/file must match to create compatible magic.mgc data file
---
 cross/file/Makefile       | 2 +-
 native/file/Makefile      | 4 ++--
 native/file/digests       | 6 +++---
 spk/synocli-file/Makefile | 6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cross/file/Makefile b/cross/file/Makefile
index fb347281f22..1cc331453f4 100644
--- a/cross/file/Makefile
+++ b/cross/file/Makefile
@@ -1,4 +1,5 @@
 PKG_NAME = file
+# IMPORTANT: native/file must be of the same version
 PKG_VERS = 5.46
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
@@ -20,4 +21,3 @@ NATIVE_FILE = $(abspath $(WORK_DIR)/../../../native/file/work-native/install/usr
 ENV += NATIVE_FILE=$(NATIVE_FILE)
 
 include ../../mk/spksrc.cross-cc.mk
-
diff --git a/native/file/Makefile b/native/file/Makefile
index d468db10740..b55bc2dc776 100644
--- a/native/file/Makefile
+++ b/native/file/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = file
-PKG_VERS = 5.45
+PKG_VERS = 5.46
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://ftp.astron.com/pub/file
@@ -14,7 +14,7 @@ LICENSE  = https://github.com/file/file/blob/master/COPYING
 GNU_CONFIGURE = 1
 # force build of static version
 # otherwise magic.mgc fails to build with error:
-# Compiled magic version [545] does not match with shared library magic version [539]
+# Compiled magic version [546] does not match with shared library magic version [544]
 CONFIGURE_ARGS += --enable-static --disable-shared
 
 include ../../mk/spksrc.native-cc.mk
diff --git a/native/file/digests b/native/file/digests
index 3eedd482019..d55d5e07755 100644
--- a/native/file/digests
+++ b/native/file/digests
@@ -1,3 +1,3 @@
-file-5.45.tar.gz SHA1 e8ee39339e5d3d68b7da9c45580f2ca5faf0db54
-file-5.45.tar.gz SHA256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
-file-5.45.tar.gz MD5 26b2a96d4e3a8938827a1e572afd527a
+file-5.46.tar.gz SHA1 af74daeac411a665b071a71ec89d3a3020647309
+file-5.46.tar.gz SHA256 c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088
+file-5.46.tar.gz MD5 459da2d4b534801e2e2861611d823864
diff --git a/spk/synocli-file/Makefile b/spk/synocli-file/Makefile
index b8d9281c8c9..2633300121f 100644
--- a/spk/synocli-file/Makefile
+++ b/spk/synocli-file/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = synocli-file
-SPK_VERS = 4.0
-SPK_REV = 26
+SPK_VERS = 4.0.1
+SPK_REV = 27
 SPK_ICON = src/synocli-file.png
 
 # cross/libblkid must be built before cross/e2fsprogs or cross/libext2fs
@@ -183,5 +183,3 @@ endif
 synocli-file_extra_install:
 	@$(MSG) "Set library runpath in rhash executable."
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rhash
-
-