diff --git a/alist/files/alist.init b/alist/files/alist.init index b859a20ce..157aa4792 100755 --- a/alist/files/alist.init +++ b/alist/files/alist.init @@ -5,6 +5,7 @@ START=99 USE_PROCD=1 PROG=/usr/bin/alist +LOG_FILE=/var/log/alist.log get_config() { config_get_bool enabled $1 enabled 1 @@ -84,7 +85,7 @@ start_service() { [ "$mysql" -eq 1 ] && database=$mysql_type || database=sqlite3 set_firewall - true > $temp_dir/alist.log + true > $LOG_FILE # init config json_init @@ -123,7 +124,7 @@ start_service() { json_add_boolean "force_https" "0" json_add_string "cert_file" "$ssl_cert" json_add_string "key_file" "$ssl_key" - json_add_string "unix_file" "/var/run/alist.sock" + json_add_string "unix_file" "" json_add_string "unix_file_perm" "" json_close_object @@ -134,7 +135,7 @@ start_service() { # log json_add_object "log" json_add_boolean "enable" "$log" - json_add_string "name" "$temp_dir/alist.log" + json_add_string "name" "$LOG_FILE" json_add_int "max_size" "10" json_add_int "max_backups" "5" json_add_int "max_age" "28" @@ -187,7 +188,7 @@ start_service() { json_dump > $data_dir/config.json - procd_open_instance + procd_open_instance alist procd_set_param command $PROG procd_append_param command server --data $data_dir procd_set_param stdout 0 @@ -195,7 +196,13 @@ start_service() { procd_set_param respawn procd_set_param limits core="unlimited" procd_set_param limits nofile="200000 200000" - procd_close_instance + procd_close_instance alist +} + +reload_service() { + stop + sleep 3 + start } service_triggers() { diff --git a/gn/Makefile b/gn/Makefile index 229bfe9b3..6bb69dda0 100644 --- a/gn/Makefile +++ b/gn/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2024-06-10 -PKG_SOURCE_VERSION:=b2afae122eeb6ce09c52d63f67dc53fc517dbdc8 -PKG_MIRROR_HASH:=825ead46982a44cc2e82fb8bf88d17efea5810a555601c329ac3eef21ecabef7 +PKG_SOURCE_DATE:=2024-08-13 +PKG_SOURCE_VERSION:=54f5b539df8c4e460b18c62a11132d77b5601136 +PKG_MIRROR_HASH:=ac0d44b2f7162be614ac090ef0618ea0f44760e80f5df7acc43b69a492611e0f PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h index fe29b438c..5a35e52ce 100644 --- a/gn/src/out/last_commit_position.h +++ b/gn/src/out/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2176 -#define LAST_COMMIT_POSITION "2176 (b2afae122eeb)" +#define LAST_COMMIT_POSITION_NUM 2186 +#define LAST_COMMIT_POSITION "2186 (54f5b539df8c)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/mosdns/patches/201-compatible-with-go1.20.patch b/mosdns/patches/201-compatible-with-go1.20.patch deleted file mode 100644 index 9099c694f..000000000 --- a/mosdns/patches/201-compatible-with-go1.20.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 329ba9ca89d25da58d1b51b8107f164beae816bb Mon Sep 17 00:00:00 2001 -From: sbwml -Date: Tue, 19 Sep 2023 21:15:12 +0800 -Subject: [PATCH 1/5] compatible with go1.20 - ---- - go.mod | 6 ++---- - go.sum | 4 ++-- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/go.mod b/go.mod -index 1839776..1b4cc4b 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,6 @@ - module github.com/IrineSistiana/mosdns/v5 - --go 1.21 -- --toolchain go1.21.1 -+go 1.20 - - require ( - github.com/IrineSistiana/go-bytes-pool v0.0.0-20230918115058-c72bd9761c57 -@@ -45,7 +43,7 @@ require ( - github.com/magiconair/properties v1.8.7 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - github.com/mdlayher/netlink v1.7.2 // indirect -- github.com/mdlayher/socket v0.5.0 // indirect -+ github.com/mdlayher/socket v0.4.1 // indirect - github.com/onsi/ginkgo/v2 v2.13.0 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect -diff --git a/go.sum b/go.sum -index 41a59b2..ad95d6d 100644 ---- a/go.sum -+++ b/go.sum -@@ -173,8 +173,8 @@ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvls - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= - github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= - github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= --github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI= --github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI= -+github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= -+github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= - github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= - github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= - github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= --- -2.42.0 - diff --git a/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch b/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch index 463e96cd4..38b7974bf 100644 --- a/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch +++ b/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch @@ -7,11 +7,9 @@ Subject: [PATCH 3/5] add response for bad request in ServeHTTP handler pkg/server/http_handler.go | 1 + 1 file changed, 1 insertion(+) -diff --git a/pkg/server/http_handler.go b/pkg/server/http_handler.go -index 5a41314..8f33b3f 100644 --- a/pkg/server/http_handler.go +++ b/pkg/server/http_handler.go -@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { +@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.R if err != nil { h.warnErr(req, "invalid request", err) w.WriteHeader(http.StatusBadRequest) @@ -19,6 +17,3 @@ index 5a41314..8f33b3f 100644 return } --- -2.42.0 - diff --git a/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch b/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch index f623815b6..fa18e86c1 100644 --- a/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch +++ b/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch @@ -8,8 +8,6 @@ Subject: [PATCH 4/5] black_hole: apply Fisher-Yates shuffle algorithm to plugin/executable/black_hole/black_hole.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/plugin/executable/black_hole/black_hole.go b/plugin/executable/black_hole/black_hole.go -index 775253d..f955019 100644 --- a/plugin/executable/black_hole/black_hole.go +++ b/plugin/executable/black_hole/black_hole.go @@ -27,6 +27,8 @@ import ( @@ -21,7 +19,7 @@ index 775253d..f955019 100644 ) const PluginType = "black_hole" -@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole)(nil) +@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole) type BlackHole struct { ipv4 []netip.Addr ipv6 []netip.Addr @@ -29,7 +27,7 @@ index 775253d..f955019 100644 } // QuickSetup format: [ipv4|ipv6] ... -@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackHole, error) { +@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackH return b, nil } @@ -51,6 +49,3 @@ index 775253d..f955019 100644 if r := b.Response(qCtx.Q()); r != nil { qCtx.SetResponse(r) } --- -2.42.0 - diff --git a/mosdns/patches/205-format-logtime.patch b/mosdns/patches/205-format-logtime.patch index 204bc8e29..1628ad041 100644 --- a/mosdns/patches/205-format-logtime.patch +++ b/mosdns/patches/205-format-logtime.patch @@ -7,8 +7,6 @@ Subject: [PATCH 5/5] format logtime mlog/logger.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) -diff --git a/mlog/logger.go b/mlog/logger.go -index 861f091..1508db0 100644 --- a/mlog/logger.go +++ b/mlog/logger.go @@ -21,9 +21,11 @@ package mlog @@ -24,7 +22,7 @@ index 861f091..1508db0 100644 ) type LogConfig struct { -@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logger, error) { +@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logge out = stderr } @@ -46,6 +44,3 @@ index 861f091..1508db0 100644 } // L is a global logger. --- -2.42.0 -