update-10.07

aliyundrive-webdav/files/aliyundrive-webdav.config

@@ -9,3 +9,4 @@ config server
     option read_buffer_size '10485760'
     option cache_size '1000'
     option root '/'
+    option no_trash '0'

aliyundrive-webdav/files/aliyundrive-webdav.init

@@ -24,9 +24,18 @@ start_service() {
       local host=$(uci_get_by_type server host 127.0.0.1)
       local port=$(uci_get_by_type server port 8080)
       local root=$(uci_get_by_type server root /)
+      local no_trash=$(uci_get_by_type server no_trash 0)
+
+      local extra_options="-I"
+      case "$no_trash" in
+        1|on|true|yes|enabled)
+          extra_options="$extra_options --no-trash"
+          ;;
+        *) ;;
+      esac
 
       procd_open_instance
-      procd_set_param command /bin/sh -c "/usr/bin/$NAME -I --host $host --port $port --root $root -S $read_buf_size --cache-size $cache_size --workdir /var/run/$NAME >>/var/log/$NAME.log 2>&1"
+      procd_set_param command /bin/sh -c "/usr/bin/$NAME $extra_options --host $host --port $port --root $root -S $read_buf_size --cache-size $cache_size --workdir /var/run/$NAME >>/var/log/$NAME.log 2>&1"
       procd_set_param pidfile /var/run/$NAME.pid
       procd_set_param env REFRESH_TOKEN="$refresh_token"
       [[ ! -z "$auth_user" ]] && procd_append_param env WEBDAV_AUTH_USER="$auth_user"

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

@@ -39,6 +39,9 @@ cache_size = e:option(Value, "cache_size", translate("Cache Size"))
 cache_size.default = "1000"
 cache_size.datatype = "uinteger"
 
+no_trash = e:option(Flag, "no_trash", translate("Delete file permanently instead of trashing"))
+no_trash.rmempty = false
+
 debug = e:option(Flag, "debug", translate("Debug Mode"))
 debug.rmempty = false
 

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

@@ -60,3 +60,6 @@ msgstr "<a href=\"https://github.com/messense/aliyundrive-webdav#%E8%8E%B7%E5%8F
 
 msgid "Restrict access to a folder of aliyundrive, defaults to / which means no restrictions"
 msgstr "限制只能访问该云盘目录，默认为 / 表示不限制，注意这个参数不是本地磁盘路径"
+
+msgid "Delete file permanently instead of trashing"
+msgstr "删除文件不放入回收站"

openwrt-upx/README.md

@@ -0,0 +1,42 @@
+# openwrt-upx
+
+UPX pacakage for OpenWrt
+
+## Build Guide
+
+- Download and unzip [OpenWrt SDK](https://downloads.openwrt.org/snapshots/targets/)
+
+- In SDK directory, download Makefiles with git:
+
+```sh
+  git clone https://github.com/kuoruan/openwrt-upx.git package/openwrt-upx
+```
+
+- Build pakcage
+
+```sh
+./scripts/feeds update -a
+./scripts/feeds install -a
+
+make defconfig # or make menuconfig
+
+make package/upx/{clean,compile} V=s
+```
+
+## For Packages that Need UPX Compress
+
+- Add ```upx/host``` to ```PKG_BUILD_DEPENDS```:
+
+```wiki
+PKG_BUILD_DEPENDS:=... upx/host
+```
+
+- In ```Build/Compile``` stage:
+
+```makefile
+define Build/Compile
+  ...
+  $(STAGING_DIR_HOST)/bin/upx --lzma --best ... # bin files to be compressed
+  ...
+endef
+```

openwrt-upx/ucl/Makefile

@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2019-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:=ucl
+PKG_VERSION:=1.03
+PKG_RELEASE:=3
+
+PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download
+PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+HOST_FIXUP:=autoreconf
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
+
+HOST_CFLAGS += -std=gnu89
+TARGET_CFLAGS += -std=gnu89
+
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared \
+	--disable-asm
+
+define Package/libucl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Portable lossless data compression library
+  URL:=http://www.oberhumer.com/opensource/ucl/
+endef
+
+define Package/libucl/description
+UCL is a portable lossless data compression library written in ANSI C. UCL
+implements a number of compression algorithms that achieve an excellent
+compression ratio while allowing *very* fast decompression. Decompression
+requires no additional memory.
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ucl
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libucl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libucl))

openwrt-upx/ucl/patches/001-autoconf-compat.patch

@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ AC_CANONICAL_TARGET
+ AM_MAINTAINER_MODE
+ 
+ if test -z "$ac_abs_top_srcdir"; then
+-    _AC_SRCPATHS(.)
++    _AC_SRCDIRS(.)
+ fi
+ if test -r .Conf.settings1; then
+     . ./.Conf.settings1

openwrt-upx/upx/Makefile

@@ -0,0 +1,66 @@
+#
+# 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_RELEASE:=1
+
+PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING LICENSE
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-23
+PKG_SOURCE_VERSION:=2dae2a39972bc7c562dd3b02444336050a0b242e
+PKG_SOURCE_URL:=https://github.com/upx/upx.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
+
+HOST_BUILD_DEPENDS:=ucl/host
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Host/Compile
+	UPX_UCLDIR=$(STAGING_DIR_HOST) \
+	$(MAKE) -C $(HOST_BUILD_DIR)/src \
+		CXXFLAGS_WERROR="" 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
+  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, portable, extendable, high-performance executable packer for
+several different executable formats. It achieves an excellent compression ratio
+and offers very fast decompression. Your executables suffer no memory overhead
+or other drawbacks for most of the formats supported, because of in-place
+decompression.
+endef
+
+MAKE_PATH := src
+
+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))