filebrowser: update to v2.22.4 (#5427)

SynoCommunity · Sep 13, 2022 · e850b6a · e850b6a
1 parent 70624b7
commit e850b6a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/cross/filebrowser/Makefile b/cross/filebrowser/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = filebrowser
-PKG_VERS = 2.20.1
+PKG_VERS = 2.22.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/filebrowser/$(PKG_NAME)/archive
@@ -10,9 +10,7 @@ BUILD_DEPENDS = native/go native/nodejs
 
 HOMEPAGE = https://github.com/filebrowser/filebrowser
 COMMENT  = Web File Browser.
-LICENSE  = Apache-2.0
-
-PATH := $(WORK_DIR)/../../../native/nodejs/work-native/node/bin:$(PATH)
+LICENSE  = Apache 2.0
 
 GO_SRC_DIR = $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)
 GO_BIN_DIR = $(GO_SRC_DIR)/$(PKG_NAME)
@@ -22,6 +20,9 @@ PRE_COMPILE_TARGET = filebrowser_pre_compile
 
 include ../../mk/spksrc.cross-go.mk
 
+ENV += PATH=$(realpath $(WORK_DIR)/../../../native/nodejs/work-native/node/bin):$(realpath $(WORK_DIR)/../../../native/go/work-native/go/bin):$(PATH)
+
 .PHONY: filebrowser_pre_compile
 filebrowser_pre_compile:
+	@sed -i 's/Version = "(untracked)"/Version = "$(PKG_VERS)"/g' -i $(WORK_DIR)/$(PKG_DIR)/version/version.go
 	@$(RUN) $(MAKE) build-frontend
diff --git a/cross/filebrowser/digests b/cross/filebrowser/digests
@@ -1,3 +1,3 @@
-filebrowser-2.20.1.tar.gz SHA1 37e555a0bc2c5a29a224f06cd73a74e5033beecd
-filebrowser-2.20.1.tar.gz SHA256 1b1c8dbfd81024972b5a00f1becc7125eea645d55144b81a89761ddf94245afa
-filebrowser-2.20.1.tar.gz MD5 d02f62ad2b9d16485007a2e1b1cf1fcc
+filebrowser-2.22.4.tar.gz SHA1 70ddd3a668cb1df61e5ad383311e2e288b39e22a
+filebrowser-2.22.4.tar.gz SHA256 511f0e200c4c2c3851f92d1090804a67ed425a8290493a70af49aea93c229d91
+filebrowser-2.22.4.tar.gz MD5 7102e60822b2520fa00074ce8efdbc98
diff --git a/cross/filebrowser/patches/001-remove-goruntime.patch b/cross/filebrowser/patches/001-remove-goruntime.patch
diff --git a/spk/filebrowser/Makefile b/spk/filebrowser/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = filebrowser
-SPK_VERS = 2.20.1
-SPK_REV = 1
+SPK_VERS =  2.22.4
+SPK_REV = 2
 SPK_ICON = src/filebrowser.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -11,8 +11,8 @@ DISPLAY_NAME = File Browser
 DESCRIPTION = filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory.
 HOMEPAGE = https://filebrowser.org/
 HELPURL = https://github.com/filebrowser/filebrowser/issues
-LICENSE = Apache-2.0
-CHANGELOG = "Initial package release."
+LICENSE = Apache 2.0
+CHANGELOG = "1. Update filebrowser to v2.22.4.<br/>2. Built with go v1.18.6 and node v16.15.1."
 
 GROUP = synocommunity
 

diff --git a/spk/filebrowser/src/service-setup.sh b/spk/filebrowser/src/service-setup.sh
@@ -5,6 +5,6 @@ if [ -z "${SYNOPKG_PKGHOME}" ]; then
 fi
 
 export HOME="${SYNOPKG_PKGHOME}"
-SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/filebrowser -a 0.0.0.0 -p ${SERVICE_PORT} -r / -l ${LOG_FILE} -d ${SYNOPKG_PKGHOME}/filebrowser.db"
+SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/filebrowser --address 0.0.0.0 --port ${SERVICE_PORT} --root / --log ${LOG_FILE} --database ${SYNOPKG_PKGHOME}/filebrowser.db"
 SVC_BACKGROUND=y
 SVC_WRITE_PID=y