Skip to content

Commit

Permalink
update@20230310
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Mar 10, 2023
1 parent 85dc90e commit b591e2f
Show file tree
Hide file tree
Showing 202 changed files with 37,635 additions and 20,727 deletions.
64 changes: 0 additions & 64 deletions GoQuiet/Makefile

This file was deleted.

6 changes: 3 additions & 3 deletions adguardhome/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=adguardhome
PKG_VERSION:=0.107.21
PKG_VERSION:=0.107.25
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
PKG_MIRROR_HASH:=b7a5e666471f44e405088c5719c6bd030058a80ede1832c246cd70c10dc3993e
PKG_MIRROR_HASH:=609e991f0d03c1541e02fc656f8abea686e64ed350729b85ea87fe25640dd03a

PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE.txt
Expand Down Expand Up @@ -56,7 +56,7 @@ endef
define Build/Compile
( \
pushd $(PKG_BUILD_DIR) ; \
make js-deps js-build ; \
NODE_OPTIONS=--openssl-legacy-provider make js-deps js-build ; \
popd ; \
$(call GoPackage/Build/Compile) ; \
)
Expand Down
2 changes: 1 addition & 1 deletion aliyundrive-webdav/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=aliyundrive-webdav
PKG_VERSION:=1.10.6
PKG_VERSION:=2.0.4
PKG_RELEASE:=1

PKG_LICENSE:=MIT
Expand Down
2 changes: 0 additions & 2 deletions aliyundrive-webdav/files/aliyundrive-webdav.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ config server
option cache_ttl '600'
option root '/'
option no_trash '0'
option domain_id ''
option read_only '0'
option tls_cert ''
option tls_key ''
option skip_upload_same_size '0'
option prefer_http_download '0'
option no_redirect '0'
60 changes: 24 additions & 36 deletions aliyundrive-webdav/files/aliyundrive-webdav.init
Original file line number Diff line number Diff line change
Expand Up @@ -26,50 +26,38 @@ 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 domain_id=$(uci_get_by_type server domain_id)
local tls_cert=$(uci_get_by_type server tls_cert)
local tls_key=$(uci_get_by_type server tls_key)

local extra_options="--auto-index"

if [[ ! -z "$domain_id" ]]; then
extra_options="$extra_options --domain-id $domain_id"
else
case "$(uci_get_by_type server no_trash 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --no-trash"
;;
*) ;;
esac

case "$(uci_get_by_type server read_only 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --read-only"
;;
*) ;;
esac
case "$(uci_get_by_type server no_trash 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --no-trash"
;;
*) ;;
esac

case "$(uci_get_by_type server skip_upload_same_size 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --skip-upload-same-size"
;;
*) ;;
esac
case "$(uci_get_by_type server read_only 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --read-only"
;;
*) ;;
esac

case "$(uci_get_by_type server prefer_http_download 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --prefer-http-download"
;;
*) ;;
esac
case "$(uci_get_by_type server skip_upload_same_size 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --skip-upload-same-size"
;;
*) ;;
esac

case "$(uci_get_by_type server no_redirect 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --no-redirect"
;;
*) ;;
esac
fi
case "$(uci_get_by_type server prefer_http_download 0)" in
1|on|true|yes|enabled)
extra_options="$extra_options --prefer-http-download"
;;
*) ;;
esac

if [[ ! -z "$tls_cert" && ! -z "$tls_key" ]]; then
extra_options="$extra_options --tls-cert $tls_cert --tls-key $tls_key"
Expand Down
4 changes: 2 additions & 2 deletions brook/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=brook
PKG_VERSION:=20230101
PKG_VERSION:=20230122
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=d131b408102ef6865c64a7cf9d7417308ef3109c79dc627e01bfd665cf80e47c
PKG_HASH:=52643df51144b4b1afbacb51156f92ba61adbcff77dd8f76e3278ce70644f237

PKG_MAINTAINER:=Tianling Shen <[email protected]>
PKG_LICENSE:=GPL-3.0
Expand Down
12 changes: 5 additions & 7 deletions chinadns-ng/Makefile
Original file line number Diff line number Diff line change
@@ -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:=1.0-beta.25
PKG_VERSION:=2023.03.08
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng.git
PKG_SOURCE_DATE:=2021-05-08
PKG_SOURCE_VERSION:=14cc6348d67b09cae37d9bce554c89c2c0e0b265
PKG_MIRROR_HASH:=3b66fc0888d9488e3b8e39df3016d51fae1b43325d292381e94aa3c7d2318282
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zfl9/chinadns-ng/tar.gz/$(PKG_VERSION)?
PKG_HASH:=9404a20c7241f4102dfa3fc197877ddbdb38f87d6044c98f62256078895732df

PKG_LICENSE:=AGPL-3.0-only
PKG_LICENSE_FILES:=LICENSE
Expand Down
48 changes: 0 additions & 48 deletions chinadns/Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion ddns-scripts_aliyun/update_aliyun_com.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ enable_domain() {
# 获取子域名解析记录列表
describe_domain() {
local count value; local ret=0
aliyun_transfer "Action=DescribeSubDomainRecords" "SubDomain=${__HOST}.${__DOMAIN}" "DomainName=${__DOMAIN}" || write_log 14 "服务器通信失败"
aliyun_transfer "Action=DescribeSubDomainRecords" "SubDomain=${__HOST}.${__DOMAIN}" "DomainName=${__DOMAIN}" "Line=default" || write_log 14 "服务器通信失败"
write_log 7 "获取到解析记录: $(cat "$DATFILE" 2> /dev/null)"
json_cleanup; json_load "$(cat "$DATFILE" 2> /dev/null)" >/dev/null 2>&1
json_get_var count "TotalCount"
Expand Down
2 changes: 1 addition & 1 deletion gost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/ginuerzh/gost/tar.gz/v$(PKG_VERSION)
PKG_HASH:=aa3211282fce695584795fac20da77a2ac68d3e08602118afb0747bd64c1eac4

PKG_LICENSE:=MIT
PKG_LICENSE_FILE:=LICENSE
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Tianling Shen <[email protected]>

PKG_BUILD_DEPENDS:=golang/host
Expand Down
4 changes: 2 additions & 2 deletions hysteria/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=hysteria
PKG_VERSION:=1.3.2
PKG_VERSION:=1.3.3
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=1014287f6cca7cb3fa0e4ad36b33cf8f28c800fb9f99d431997036baef8240fa
PKG_HASH:=11ca9df98a8a17a348dcdac92a19fef0e25dde8e536a9778705f765ac208a202

PKG_LICENSE:=MIT
PKG_LICENSE_FILE:=LICENSE
Expand Down
4 changes: 2 additions & 2 deletions lua-neturl/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# SPDX-License-Identifier: GPL-3.0-only
#
# Copyright (C) 2022 ImmortalWrt.org
# Copyright (C) 2022-2023 ImmortalWrt.org

include $(TOPDIR)/rules.mk

PKG_NAME:=neturl
PKG_VERSION:=1.1-1
PKG_RELEASE:=1
PKG_RELEASE:=3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/golgote/neturl/tar.gz/v$(PKG_VERSION)?
Expand Down
9 changes: 9 additions & 0 deletions lua-neturl/patches/010-userinfo-regex.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,12 @@
self.user = userinfo
else
-- incorrect userinfo
@@ -369,7 +369,7 @@ function M.parse(url)
comp.fragment = v
return ''
end)
- url =url:gsub('^([%w][%w%+%-%.]*)%:', function(v)
+ url =url:gsub('^([%w][%w%+%-%_%.]*)%:', function(v)
comp.scheme = v:lower()
return ''
end)
Loading

0 comments on commit b591e2f

Please sign in to comment.