From 50327baeca88b873b11dd21f3bdd4ed3a403acb0 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:37:21 +0800
Subject: [PATCH] update 2024-09-10 10:37:21

---
 alist/Makefile                                  | 17 +++++++++++------
 ...le-delete-of-temp-directory-at-startup.patch | 15 ---------------
 mihomo/Makefile                                 |  6 +++---
 redsocks2/Makefile                              |  9 ++++-----
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 alist/patches/001-disable-delete-of-temp-directory-at-startup.patch

diff --git a/alist/Makefile b/alist/Makefile
index 2eeb07410..414ee0589 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -1,3 +1,4 @@
+
 #
 # Copyright (C) 2015-2016 OpenWrt.org
 #
@@ -32,10 +33,13 @@ PKG_USE_MIPS16:=0
 PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=github.com/alist-org/alist
-GO_PKG_LDFLAGS:=-w -s
-GO_PKG_LDFLAGS_X:= \
-	$(GO_PKG)/v3/internal/conf.Version=v$(PKG_VERSION)-$(ARCH) \
-	$(GO_PKG)/v3/internal/conf.WebVersion=$(PKG_WEB_VERSION)
+GO_PKG_LDFLAGS:= \
+	-X '$(GO_PKG)/v3/internal/conf.BuiltAt=$(shell date '+%Y-%m-%d %H:%M:%S %z')' \
+	-X '$(GO_PKG)/v3/internal/conf.GoVersion=$(shell $(STAGING_DIR_HOSTPKG)/bin/go version | sed 's/go version //')' \
+	-X '$(GO_PKG)/v3/internal/conf.GitAuthor=Xhofe <i@nn.ci>' \
+	-X '$(GO_PKG)/v3/internal/conf.GitCommit=tarball/$(shell echo $(PKG_HASH) | cut -c 1-7)' \
+	-X '$(GO_PKG)/v3/internal/conf.Version=v$(PKG_VERSION) (OpenWrt $(ARCH_PACKAGES))' \
+	-X '$(GO_PKG)/v3/internal/conf.WebVersion=$(PKG_WEB_VERSION)'
 
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
@@ -72,10 +76,10 @@ endif
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-	$(eval $(call Download,$(PKG_NAME)-web))
 	$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public/dist -xzf $(DL_DIR)/$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz
+	$(SED) 's_https://jsd.nn.ci/gh/alist-org/logo@main/logo.png_/assets/logo.png_g' $(PKG_BUILD_DIR)/public/dist/index.html
 ifneq ($(CONFIG_ARCH_64BIT),y)
-	$(RM) -rf $(PKG_BUILD_DIR)/{drivers/lark.go,drivers/lark}
+	$(RM) -rf $(PKG_BUILD_DIR)/drivers/{lark,lark.go}
 endif
 endef
 
@@ -89,4 +93,5 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DATA) $(CURDIR)/files/data.db $(1)/etc/alist/data.db
 endef
 
+$(eval $(call Download,$(PKG_NAME)-web))
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch b/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch
deleted file mode 100644
index 071ec6e89..000000000
--- a/alist/patches/001-disable-delete-of-temp-directory-at-startup.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/internal/bootstrap/config.go
-+++ b/internal/bootstrap/config.go
-@@ -68,11 +68,7 @@ func InitConfig() {
- 		}
- 		conf.Conf.TempDir = absPath
- 	}
--	err := os.RemoveAll(filepath.Join(conf.Conf.TempDir))
--	if err != nil {
--		log.Errorln("failed delete temp file:", err)
--	}
--	err = os.MkdirAll(conf.Conf.TempDir, 0o777)
-+	err := os.MkdirAll(conf.Conf.TempDir, 0o777)
- 	if err != nil {
- 		log.Fatalf("create temp dir error: %+v", err)
- 	}
diff --git a/mihomo/Makefile b/mihomo/Makefile
index 7071b9110..aae47a456 100644
--- a/mihomo/Makefile
+++ b/mihomo/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git
-PKG_SOURCE_DATE:=2024-09-07
-PKG_SOURCE_VERSION:=ade4234615e7747ff79e98b27ff117a05c8110fa
-PKG_MIRROR_HASH:=b68d0af02c4f06672deee7abbf96078975c710dc73a02a3eeb3ff5c67e5d74e5
+PKG_SOURCE_DATE:=2024-09-09
+PKG_SOURCE_VERSION:=7c8f451892258afe80e211867a118cd1d6aba63c
+PKG_MIRROR_HASH:=97d7d7ecfe9b5782cb430edff39d5463b997fae128c302f18fc91be2fdb746a5
 
 PKG_LICENSE:=MIT
 PKG_MAINTAINER:=Joseph Mory <morytyann@gmail.com>
diff --git a/redsocks2/Makefile b/redsocks2/Makefile
index 854639894..c0a7047ef 100644
--- a/redsocks2/Makefile
+++ b/redsocks2/Makefile
@@ -9,11 +9,10 @@ PKG_NAME:=redsocks2
 PKG_VERSION:=0.70
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/semigodking/redsocks.git
-PKG_SOURCE_DATE:=2024-09-07
-PKG_SOURCE_VERSION:=2ca40529962f78ad228a2d81f0645e9b804b7e8e
-PKG_MIRROR_HASH:=096646ec389397e05b5b90c39af2b891a1d45b420bd7648162113a355ed7cb26
+PKG_SOURCE:=redsocks-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/semigodking/redsocks/tar.gz/release-$(PKG_VERSION)?
+PKG_HASH:=2f0536132b744801a135e89c17ee8d51c1893371df8646c0b8e8504d33edb23c
+PKG_BUILD_DIR:=$(BUILD_DIR)/redsocks-release-$(PKG_VERSION)
 
 PKG_MAINTAINER:=semigodking <semigodking@gmail.com>
 PKG_LICENSE:=Apache-2.0