update 2023-03-07 23:14:24

baidupcs-web/Makefile

@@ -1,55 +1,85 @@
-# SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2022 ImmortalWrt.org
+# Copyright (C) 2019 OpenWrt.org
+#
+# KFERMercer <KFER.Mercer@gmail.com>
+#
+# This is free software, licensed under the GNU General Public License v3.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baidupcs-web
-PKG_VERSION:=3.7.4-nnew
+PKG_VERSION:=3.7.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/Erope/BaiduPCS-Go/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6efd1c5e4cf5cf876204bed246c70ea0212ad078d4eb7703d7f1179b39551d1d
-PKG_BUILD_DIR:=$(BUILD_DIR)/BaiduPCS-Go-$(PKG_VERSION)
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=golang/host go-rice/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/Erope/BaiduPCS-Go
-GO_PKG_LDFLAGS_X:=main.Version=v$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/baidupcs-web
   SECTION:=net
   CATEGORY:=Network
-  SUBMENU:=Download Manager
+  TITLE:=BaiduPCS-Web is a web controller for BaiduPCS-Go
-  TITLE:=A web controller for BaiduPCS-Go
+  URL:=https://github.com/Erope/baidupcs-web
-  URL:=https://github.com/Erope/BaiduPCS-Go
+endef
-  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
+
+define Package/$(PKG_NAME)/description
+BaiduPCS-Web is a web controller for BaiduPCS-Go
+endef
+
+# 禁止OpenWrt对二进制文件进行strip
+STRIP:=true
+
+ifeq ($(ARCH),i386)
+	PKG_ARCH_BAIDUPCS-WEB:=386
+endif
+
+ifeq ($(ARCH),x86_64)
+	PKG_ARCH_BAIDUPCS-WEB:=amd64
+endif
+
+ifeq ($(ARCH),mipsel)
+	PKG_ARCH_BAIDUPCS-WEB:=mipsle
+endif
+
+ifeq ($(ARCH),mips)
+	PKG_ARCH_BAIDUPCS-WEB:=mipsle
+endif
+
+ifeq ($(ARCH),arm)
+ifeq ($(BOARD),bcm53xx)
+	PKG_ARCH_BAIDUPCS-WEB:=armv5
+else ifeq ($(BOARD),kirkwood)
+	PKG_ARCH_BAIDUPCS-WEB:=armv5
+else
+	PKG_ARCH_BAIDUPCS-WEB:=armv7
+endif
+endif
+
+ifeq ($(ARCH),aarch64)
+	PKG_ARCH_BAIDUPCS-WEB:=arm64
+endif
+
+PKG_SOURCE:=BaiduPCS-Go-v$(PKG_VERSION)-linux-$(PKG_ARCH_BAIDUPCS-WEB).zip
+PKG_SOURCE_URL:=https://github.com/coolsnowwolf/baidupcs-web/raw/master/
+
+UNZIP_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)-unzip
+
+PKG_HASH:=skip
+
+define Build/Prepare
+	mkdir -vp $(UNZIP_DIR)
+	unzip -od $(UNZIP_DIR) $(DL_DIR)/$(PKG_SOURCE)
+endef
+
+define Build/Configure
 endef
 
 define Build/Compile
-	( \
-		pushd "$(PKG_BUILD_DIR)/internal/pcsweb" ; \
-		rice embed-go ; \
-		popd ; \
-		$(call GoPackage/Build/Compile) ; \
-	)
 endef
 
 define Package/baidupcs-web/install
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/BaiduPCS-Go $(1)/usr/bin/baidupcs-web
+	$(INSTALL_BIN) $(UNZIP_DIR)/*/BaiduPCS-Go $(1)/usr/bin/baidupcs-web
+	chmod 755 $(1)/usr/bin/baidupcs-web
 endef
 
-$(eval $(call GoBinPackage,baidupcs-web))
 $(eval $(call BuildPackage,baidupcs-web))

chinadns-ng/Makefile

@@ -1,18 +1,16 @@
 # SPDX-License-Identifier: GPL-3.0-only
 #
-# Copyright (C) 2021 ImmortalWrt.org
+# Copyright (C) 2023 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chinadns-ng
-PKG_VERSION:=2023.03.22
+PKG_VERSION:=2023.03.06
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git
+PKG_SOURCE_URL:=https://codeload.github.com/zfl9/chinadns-ng/tar.gz/$(PKG_VERSION)?
-PKG_SOURCE_DATE:=2023.03.02
+PKG_HASH:=skip
-PKG_SOURCE_VERSION:=a2ceae6b3530217e3339fb502d30daac7315b83e
-PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=AGPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE

homeproxy/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-homeproxy
-PKG_VERSION:=1.0-usertesting-0222
+PKG_VERSION:=usertesting-0337
 
 LUCI_TITLE:=The modern ImmortalWrt proxy platform for ARM64/AMD64
 LUCI_PKGARCH:=all

homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js

@@ -127,8 +127,8 @@ return view.extend({
 		var proxy_nodes = {};
 		uci.sections(data[0], 'node', (res) => {
 			proxy_nodes[res['.name']] =
-			String.format('[%s] %s', res.type, res.label || (stubValidator.apply('ip6addr', res.address || '') ?
+				String.format('[%s] %s', res.type, res.label || (stubValidator.apply('ip6addr', res.address || '') ?
-				String.format('[%s]', res.address) : res.address) + ':' + res.port);
+					String.format('[%s]', res.address) : res.address) + ':' + res.port);
 		});
 
 		s = m.section(form.NamedSection, 'config', 'homeproxy');

homeproxy/htdocs/luci-static/resources/view/homeproxy/server.js

@@ -202,6 +202,12 @@ return view.extend({
 		o.validate = hp.validateUUID;
 		o.modalonly = true;
 
+		o = s.option(form.ListValue, 'vless_flow', _('Flow'));
+		o.value('', _('None'));
+		o.value('xtls-rprx-vision');
+		o.depends('type', 'vless');
+		o.modalonly = true;
+
 		o = s.option(form.Value, 'vmess_alterid', _('Alter ID'),
 			_('Legacy protocol support (VMess MD5 Authentication) is provided for compatibility purposes only, use of alterId > 1 is not recommended.'));
 		o.datatype = 'uinteger';

homeproxy/root/etc/homeproxy/scripts/generate_sing-box.uc

@@ -481,8 +481,9 @@ if (server_enabled === '1')
 					auth: (cfg.hysteria_auth_type === 'base64') ? cfg.hysteria_auth_payload : null,
 					auth_str: (cfg.hysteria_auth_type === 'string') ? cfg.hysteria_auth_payload : null,
 
-					/* VMess */
+					/* VLESS / VMess */
 					uuid: cfg.uuid,
+					flow: cfg.vless_flow,
 					alterId: strToInt(cfg.vmess_alterid)
 				}
 			] : null,

luci-app-quickstart/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for quickstart
 LUCI_DEPENDS:=+quickstart +luci-app-store
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.6.8-1
+PKG_VERSION:=0.6.9-1
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 

quickstart/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_quickstart:=$(ARCH)
 
 PKG_NAME:=quickstart
-PKG_VERSION:=0.6.8
+PKG_VERSION:=0.6.9
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://fw.koolcenter.com/binary/quickstart/
-PKG_HASH:=8c946ed53a3b8040ba75971cb74128b097ca28e1d4095d8711c5b2a13592f6cf
+PKG_HASH:=17a38ee346170fb5912dde5e6ee677bb78af310d426b78cb23cf7f3529675d59
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)