Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

synocli-file: fix file guesser command 'file' #6452

Merged
merged 1 commit into from
Feb 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cross/file/Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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

4 changes: 2 additions & 2 deletions native/file/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions native/file/digests
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions spk/synocli-file/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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


Loading