update 2023-02-18 16:09:22

aliyundrive-fuse/files/aliyundrive-fuse.config

@@ -2,7 +2,6 @@ config default
     option enable '0'
     option debug '0'
     option refresh_token ''
-    option domain_id ''
     option mount_point '/mnt/aliyundrive'
     option read_buffer_size '10485760'
     option allow_other '1'

aliyundrive-fuse/files/aliyundrive-fuse.init

@@ -17,17 +17,12 @@ start_service() {
   case "$enable" in
     1|on|true|yes|enabled)
       local refresh_token=$(uci_get_by_type default refresh_token)
-      local domain_id=$(uci_get_by_type default domain_id)
       local mount_point=$(uci_get_by_type default mount_point)
       local read_buf_size=$(uci_get_by_type default read_buffer_size 10485760)
       local allow_other=$(uci_get_by_type default allow_other 0)
 
       local extra_options=""
 
-      if [[ ! -z "$domain_id" ]]; then
-        extra_options="$extra_options --domain-id $domain_id"
-      fi
-
       if [ "$allow_other" = "1" ]; then
         extra_options="$extra_options --allow-other"
       fi

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

@@ -114,7 +114,6 @@ if (match(proxy_mode), /tun/) {
 		endpoint_independent_nat = uci.get(uciconfig, uciroutingsetting, 'endpoint_independent_nat') || '1';
 	}
 }
-
 /* UCI config end */
 
 /* Config helper start */
@@ -516,7 +515,6 @@ if (server_enabled === '1')
 			} : null
 		});
 	});
-
 /* Inbound end */
 
 /* Outbound start */
@@ -548,7 +546,6 @@ if (!isEmpty(main_node)) {
 		push(config.outbounds, generate_outbound(main_udp_node_cfg));
 		config.outbounds[length(config.outbounds)-1].tag = 'main-udp-out';
 	}
-
 } else if (!isEmpty(default_outbound))
 	uci.foreach(uciconfig, uciroutingnode, (cfg) => {
 		if (cfg.enabled !== '1')

homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc

@@ -16,7 +16,7 @@ import { init_action } from 'luci.sys';
 
 import {
 	calcStringMD5, CURL, executeCommand, decodeBase64Str,
-	isEmpty, parseURL, removeBlankAttrs, validation,
+	isEmpty, parseURL, validation,
 	HP_DIR, RUN_DIR
 } from 'homeproxy';
 
@@ -59,7 +59,7 @@ function filter_check(name) {
 	if (filter_mode === 'whitelist')
 		ret = !ret;
 
-	return ret
+	return ret;
 }
 /* String helper end */
 

luci-app-aliyundrive-fuse/luasrc/model/cbi/aliyundrive-fuse/client.lua

@@ -20,9 +20,6 @@ read_buffer_size = e:option(Value, "read_buffer_size", translate("Read Buffer Si
 read_buffer_size.default = "10485760"
 read_buffer_size.datatype = "uinteger"
 
-domain_id = e:option(Value, "domain_id", translate("Domain ID"))
-domain_id.description = translate("Input domain_id option will use <a href=\"https://www.aliyun.com/product/storage/pds\" target=\"_blank\">Aliyun PDS</a> instead of <a href=\"https://www.aliyundrive.com\" target=\"_blank\">AliyunDrive</a>")
-
 allow_other = e:option(Flag, "allow_other", translate("Allow Other users Access"))
 allow_other.description = translate("Allow other users to access the drive, enable this if you share with samba")
 allow_other.rmempty = false

luci-app-aliyundrive-fuse/po/zh-cn/aliyundrive-fuse.po

@@ -43,12 +43,6 @@ msgstr "<a href=\"https://github.com/messense/aliyundrive-fuse\" target=\"_blank
 msgid "<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F%96-refresh_token\" target=\"_blank\">How to get refresh token</a>"
 msgstr "<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F%96-refresh_token\" target=\"_blank\">查看获取 refresh token 的方法</a>"
 
-msgid "Domain ID"
-msgstr "阿里云相册与云盘服务 domainId"
-
-msgid "Input domain_id option will use <a href=\"https://www.aliyun.com/product/storage/pds\" target=\"_blank\">Aliyun PDS</a> instead of <a href=\"https://www.aliyundrive.com\" target=\"_blank\">AliyunDrive</a>"
-msgstr "填写此选项将使用<a href=\"https://www.aliyun.com/product/storage/pds\" target=\"_blank\">阿里云相册与网盘服务</a>而不是<a href=\"https://www.aliyundrive.com\" target=\"_blank\">阿里云盘</a>"
-
 msgid "Allow Other users Access"
 msgstr "允许其他用户访问"
 

upx-static/Makefile

@@ -1,73 +0,0 @@
-# Copyright (C) 2020-2022 Hyy2001X <https://github.com/Hyy2001X>
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=upx-static
-PKG_VERSION:=4.0.2
-PKG_RELEASE:=1
-
-ifeq ($(ARCH),x86_64)
-	PKG_ARCH:=amd64
-endif
-ifeq ($(ARCH),i386)
-	PKG_ARCH:=i386
-endif
-ifeq ($(ARCH),mipsel)
-	PKG_ARCH:=mipsel
-endif
-ifeq ($(ARCH),mips)
-	PKG_ARCH:=mips
-endif
-ifeq ($(ARCH),armeb)
-	PKG_ARCH:=armeb
-endif
-ifeq ($(ARCH),arm)
-	PKG_ARCH:=arm
-endif
-ifeq ($(ARCH),arm64)
-	PKG_ARCH:=arm64
-endif
-ifeq ($(ARCH),powerpc)
-	PKG_ARCH:=powerpc
-endif
-ifeq ($(ARCH),powerpc64)
-	PKG_ARCH:=powerpc64le
-endif
-
-PKG_FILE:=upx-$(PKG_VERSION).tar.xz
-PKG_URL:=https://github.com/upx/upx/releases/download/v$(PKG_VERSION)/upx-$(PKG_VERSION)-$(PKG_ARCH)_linux.tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_HASH:=540c512bae2f32995729f74921282b11da2f72e3c0cec2dbd63c91fe9b00b011
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	SUBMENU:=Compression
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=UPX - The Ultimate Packer for eXecutables
-	URL:=https://upx.github.io
-endef
-
-define Package/$(PKG_NAME)/description
-UPX - The Ultimate Packer for eXecutables
-endef
-
-define Build/Prepare
-	if [ ! -f $(DL_DIR)/$(PKG_FILE) ] ; then \
-		wget -q $(PKG_URL) -O $(DL_DIR)/$(PKG_FILE); \
-	fi
-	rm -rf $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)
-	xz -d -c $(DL_DIR)/$(PKG_FILE) | tar -x -C $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upx-$(PKG_VERSION)-$(PKG_ARCH)_linux/upx $(1)/bin/upx
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

upx-static/README.md

@@ -1,20 +0,0 @@
-## UPX - The Ultimate Packer for eXecutables
-------
-
-```
-Usage: upx [-123456789dlthVL] [-qvfk] [-o file] file..
-
-Commands:
-  -1     compress faster                   -9    compress better
-  -d     decompress                        -l    list compressed file
-  -t     test compressed file              -V    display version number
-  -h     give more help                    -L    display software license
-Options:
-  -q     be quiet                          -v    be verbose
-  -oFILE write output to 'FILE'
-  -f     force compression of suspicious files
-  -k     keep backup files
-file..   executables to (de)compress
-
-UPX comes with ABSOLUTELY NO WARRANTY; for details visit https://upx.github.io
-```

upx/Makefile

@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2011-2020 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=upx
-PKG_VERSION:=4.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/upx/upx.git
-PKG_SOURCE_VERSION:=d7ba31cab8ce8d95d2c10e88d2ec787ac52005ef
-PKG_HASH:=540c512bae2f32995729f74921282b11da2f72e3c0cec2dbd63c91fe9b00b011
-
-PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=COPYING LICENSE
-
-HOST_BUILD_DEPENDS:=ucl/host
-MAKE_PATH:=src
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/upx
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libucl +libstdcpp +zlib
-  TITLE:=The Ultimate Packer for eXecutables
-  URL:=https://upx.github.io/
-endef
-
-define Package/upx/description
-UPX is a free, secure, portable, extendable, high-performance
-executable packer for several executable formats.
-endef
-
-define Host/Compile
-	UPX_UCLDIR=$(STAGING_DIR_HOST) \
-	$(MAKE) -C $(HOST_BUILD_DIR)/src \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		CXX="$(HOSTCXX)"
-endef
-
-define Host/Install
-	$(CP) $(HOST_BUILD_DIR)/src/upx.out $(STAGING_DIR_HOST)/bin/upx
-endef
-
-define Host/Clean
-	rm -f $(STAGING_DIR_HOST)/bin/upx
-endef
-
-define Package/upx/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/upx.out $(1)/usr/bin/upx
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,upx))

upx/patches/010-fix-build-with-gcc11.patch

@@ -1,28 +0,0 @@
-From 4121815fb9bc977ab0953558a2a69fa33550c53c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@lge.com>
-Date: Fri, 14 May 2021 02:26:13 -0700
-Subject: [PATCH] MyCom.h: fix build with gcc-11
-
-* fixes:
-  ./../src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.h: In member function 'virtual ULONG NCompress::NLZMA::CEncoder::Release()':
-  ./../src/lzma-sdk/C/7zip/Compress/LZMA/../../../Common/MyCom.h:159:32: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
-    159 | STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
-        |                                ^~
-
-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
----
- src/lzma-sdk/C/Common/MyCom.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/src/lzma-sdk/C/Common/MyCom.h
-+++ b/src/lzma-sdk/C/Common/MyCom.h
-@@ -156,8 +156,7 @@ class CMyUnknownImp
- 
- #define MY_ADDREF_RELEASE \
- STDMETHOD_(ULONG, AddRef)() { return ++__m_RefCount; } \
--STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
--  return __m_RefCount; delete this; return 0; }
-+STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) return __m_RefCount; delete this; return 0; }
- 
- #define MY_UNKNOWN_IMP_SPEC(i) \
-   MY_QUERYINTERFACE_BEGIN \