Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2025-09-17 16:44:37 +08:00
13 changed files with 87 additions and 44 deletions

View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
GO_VERSION_MAJOR_MINOR:=1.25
GO_VERSION_PATCH:=0
GO_VERSION_PATCH:=1
PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@ -21,7 +21,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
PKG_HASH:=4bd01e91297207bfa450ea40d4d5a93b1b531a5e438473b2a06e18e077227225
PKG_HASH:=d010c109cee94d80efe681eab46bdea491ac906bf46583c32e9f0dbb0bd1a594
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause

View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=inih
PKG_VERSION:=61
PKG_VERSION:=62
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/benhoyt/inih
PKG_SOURCE_URL:=https://github.com/benhoyt/inih.git
PKG_SOURCE_VERSION:=r$(PKG_VERSION)
PKG_MIRROR_HASH:=37dadf0ba9177b88c7c721d47bfa3be69297a05a7d8b0b5e743161e3df5a4789
PKG_MIRROR_HASH:=aef911f559895464c9da12b68344a58141af1997eb2c9cc9df4e9b25853e7dab
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=BSD-3-Clause

View File

@ -5,13 +5,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=cloudreve
PKG_VERSION:=4.6.0
PKG_VERSION:=4.8.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git
PKG_SOURCE_VERSION:=$(PKG_VERSION)
PKG_MIRROR_HASH:=5144090786e244a2fd50afae640accf3336e9eca6ab55dd23a601341e2d0c0ae
PKG_MIRROR_HASH:=49f7b95d3ccfde72cc176ab008a50a158602e4fdd5a235acccad355bb2bacbce
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE

View File

@ -1,13 +1,13 @@
#
# Copyright (c) 2016-2024 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2016-2025 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=travelmate
PKG_VERSION:=2.1.3
PKG_RELEASE:=3
PKG_VERSION:=2.1.4
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

View File

@ -1,10 +1,10 @@
#!/bin/sh
# captive portal auto-login script for telekom hotspots (DE)
# Copyright (c) 2021-2022 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2021-2025 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# set (s)hellcheck exceptions
# shellcheck disable=1091,3040,3043,3057
# shellcheck disable=all
. "/lib/functions.sh"
@ -36,7 +36,7 @@ export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
username="$(urlencode "${1}")"
password="$(urlencode "${2}")"
trm_domain="telekom.portal.fon.com"
trm_domain="hotspot.t-mobile.net"
trm_useragent="$(uci_get travelmate global trm_useragent "Mozilla/5.0 (Linux x86_64; rv:90.0) Gecko/20100101 Firefox/90.0")"
trm_captiveurl="$(uci_get travelmate global trm_captiveurl "http://detectportal.firefox.com")"
trm_maxwait="$(uci_get travelmate global trm_maxwait "30")"
@ -50,6 +50,6 @@ redirect_url="$(printf "%s" "${raw_html}" | awk 'match(tolower($0),/<loginurl>.*
# final login request
#
raw_html="$("${trm_fetch}" --user-agent "${trm_useragent}" --referer "https://${trm_domain}" --connect-timeout $((trm_maxwait / 6)) --header "content-type: application/x-www-form-urlencoded" --location --silent --show-error --data "UserName=${username}&Password=${password}&FNAME=0&button=Login&OriginatingServer=http%3A%2F%2F${trm_captiveurl}" "${redirect_url}")"
raw_html="$("${trm_fetch}" --user-agent "${trm_useragent}" --referer "https://${trm_domain}/wlan/rest/freeLogin" --connect-timeout $((trm_maxwait / 6)) --header "content-type: application/x-www-form-urlencoded" --location --silent --show-error --data "UserName=${username}&Password=${password}&FNAME=0&button=Login&OriginatingServer=http%3A%2F%2F${trm_captiveurl}" "${redirect_url}")"
login_url="$(printf "%s" "${raw_html}" | awk 'match(tolower($0),/<logoffurl>.*<\/logoffurl>/){printf "%s",substr($0,RSTART+11,RLENGTH-23)}' 2>/dev/null)"
[ -n "${login_url}" ] && exit 0 || exit 255

View File

@ -1,6 +1,6 @@
#!/bin/sh
# travelmate, a wlan connection manager for travel router
# Copyright (c) 2016-2024 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2016-2025 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# set (s)hellcheck exceptions
@ -624,7 +624,7 @@ f_addsta() {
f_net() {
local err_msg raw json_raw html_raw html_cp js_cp json_ec json_rc json_cp json_ed result="net nok"
raw="$("${trm_fetchcmd}" --user-agent "${trm_useragent}" --referer "http://www.example.com" --header "Cache-Control: no-cache, no-store, must-revalidate, max-age=0" --write-out "%{json}" --silent --max-time $((trm_maxwait / 6)) "${trm_captiveurl}")"
raw="$("${trm_fetchcmd}" --user-agent "${trm_useragent}" --referer "http://www.example.com" --header "Cache-Control: no-cache, no-store, must-revalidate, max-age=0" --write-out "%{json}" --silent --retry 5 --max-time $((trm_maxwait / 6)) "${trm_captiveurl}")"
json_raw="${raw#*\{}"
html_raw="${raw%%\{*}"
if [ -n "${json_raw}" ]; then
@ -916,7 +916,6 @@ f_main() {
for radio in ${trm_radiolist}; do
if ! printf "%s" "${trm_stalist}" | "${trm_grepcmd}" -q "\\-${radio}"; then
if [ "${trm_autoadd}" = "0" ]; then
f_log "info" "no enabled station on radio '${radio}'"
continue
fi
fi

View File

@ -1,13 +1,11 @@
#!/bin/sh
# vpn handler called by travelmate
# Copyright (c) 2020-2023 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2020-2025 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# set (s)hellcheck exceptions
# shellcheck disable=all
# Please note: you have to setup the package 'wireguard' or 'openvpn' before using this script
. "/lib/functions.sh"
export LC_ALL=C
@ -30,7 +28,7 @@ trm_vpnfile="/var/state/travelmate.vpn"
f_net() {
local json_rc
json_rc="$(${trm_fetch} --user-agent "${trm_useragent}" --referer "http://www.example.com" --header "Cache-Control: no-cache, no-store, must-revalidate, max-age=0" --write-out "%{response_code}" --silent --output /dev/null --max-time $((trm_maxwait / 6)) "${trm_captiveurl}")"
json_rc="$(${trm_fetch} --user-agent "${trm_useragent}" --referer "http://www.example.com" --header "Cache-Control: no-cache, no-store, must-revalidate, max-age=0" --write-out "%{response_code}" --silent --retry 5 --output /dev/null --max-time $((trm_maxwait / 6)) "${trm_captiveurl}")"
if [ "${json_rc}" = "200" ] || [ "${json_rc}" = "204" ]; then
json_rc="net ok"
fi

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
PKG_VERSION:=25.9.5
PKG_VERSION:=25.9.11
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=5c215908982635cc507629e1d366f72a3bf42f1237bcab6687c7a1e8f757bc0d
PKG_HASH:=9bccd2681183698bf860b1af5407f97b4b60090324aa3ef1546e446612d44e1f
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0

View File

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=compose
PKG_VERSION:=2.39.2
PKG_VERSION:=2.39.3
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}?
PKG_HASH:=3d082806391381310ba509a106dafa01c435b86b15818de541afe9d6c68a1cee
PKG_HASH:=3888259a6a212ebbdfd8762f394ae5beafb98cc383142cce46eb27cbc36a5d9f
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>

View File

@ -3,14 +3,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=telegraf
PKG_VERSION:=1.35.4
PKG_VERSION:=1.36.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=8f65d493ec0597369cea6fec8a9dfef2fc8833a44cc9291f13397481635f2a6d
PKG_HASH:=2478f4c9543300ed44cc0a3329e5a4c6095d9a6eae86aa2deab4ff9d19c1fdd5
PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
PKG_MAINTAINER:=Niklas Thorild <niklas@thorild.se>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
@ -23,7 +23,7 @@ GO_PKG_BUILD_PKG:=github.com/influxdata/telegraf/cmd/telegraf
GO_PKG_LDFLAGS_X := \
github.com/influxdata/telegraf/internal.Version=$(PKG_VERSION) \
github.com/influxdata/telegraf/internal.Branch=HEAD \
github.com/influxdata/telegraf/internal.Commit=c93eb6a0
github.com/influxdata/telegraf/internal.Commit=cbb7f134
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
TARGET_LDFLAGS += -static

View File

@ -8,6 +8,7 @@ STOP=01
start_service() {
procd_open_instance
procd_set_param command /usr/bin/telegraf --config /etc/telegraf.conf
procd_set_param env HOME=/root
procd_set_param stdout 1
procd_set_param stderr 1
procd_close_instance

View File

@ -1023,10 +1023,10 @@
# # use_pipeline = "{{es_pipeline}}"
# # default_pipeline = "my_pipeline"
# #
# # Custom HTTP headers
# # To pass custom HTTP headers please define it in a given below section
# ## Custom HTTP Headers
# ## To pass custom HTTP headers please define it in a given below section
# # [outputs.elasticsearch.headers]
# # "X-Custom-Header" = "custom-value"
# # "X-Custom-Header" = ["custom-value1", "custom-value2"]
#
# ## Template Index Settings
# ## Overrides the template settings.index section with any provided options.
@ -1646,8 +1646,8 @@
# ## Kafka topic for producer messages
# topic = "telegraf"
#
# ## The value of this tag will be used as the topic. If not set the 'topic'
# ## option is used.
# ## Tag value to be used as the topic. If not set or the tag does not exist,
# ## the 'topic' option is used.
# # topic_tag = ""
#
# ## If true, the 'topic_tag' will be removed from to the metric.
@ -1753,7 +1753,7 @@
# ## OAUTHBEARER, PLAIN, SCRAM-SHA-256, SCRAM-SHA-512, GSSAPI, AWS-MSK-IAM
# # sasl_mechanism = ""
#
# ## used if sasl_mechanism is GSSAPI
# ## Used if sasl_mechanism is GSSAPI
# # sasl_gssapi_service_name = ""
# # ## One of: KRB5_USER_AUTH and KRB5_KEYTAB_AUTH
# # sasl_gssapi_auth_type = "KRB5_USER_AUTH"
@ -1765,7 +1765,7 @@
# ## Access token used if sasl_mechanism is OAUTHBEARER
# # sasl_access_token = ""
#
# ## used if sasl_mechanism is AWS-MSK-IAM
# ## Used if sasl_mechanism is AWS-MSK-IAM
# # sasl_aws_msk_iam_region = ""
# ## for profile based auth
# ## sasl_aws_msk_iam_profile = ""
@ -1780,7 +1780,7 @@
# ## SASL protocol version. When connecting to Azure EventHub set to 0.
# # sasl_version = 1
#
# # Disable Kafka metadata full fetch
# ## Disable Kafka metadata full fetch
# # metadata_full = false
#
# ## Maximum number of retries for metadata operations including
@ -2160,8 +2160,9 @@
# ## Optional NATS 2.0 and NATS NGS compatible user credentials
# # credentials = "/etc/telegraf/nats.creds"
#
# ## NATS subject for producer messages
# ## For jetstream this is also the subject where messages will be published
# ## NATS subject for producer messages.
# ## This field can be a static string or a Go template, see README for details.
# ## Incompatible with `use_batch_format
# subject = "telegraf"
#
# ## Use Transport Layer Security
@ -2174,6 +2175,10 @@
# ## Use TLS but skip chain & host verification
# # insecure_skip_verify = false
#
# ## Use batch serialization instead of per metric. The batch format allows for the
# ## production of batch output formats and may more efficiently encode and write metrics.
# # use_batch_format = false
#
# ## Data format to output.
# ## Each data format has its own unique set of configuration options, read
# ## more about them here:
@ -2183,9 +2188,9 @@
# ## Jetstream specific configuration. If not nil, it will assume Jetstream context.
# ## Since this is a table, it should be present at the end of the plugin section. Else you can use inline table format.
# # [outputs.nats.jetstream]
# ## Name of the stream, required when using jetstream. Telegraf will
# ## use the union of the above subject and below the subjects array.
# ## Name of the stream, required when using jetstream.
# # name = ""
# ## List of subjects to register on the stream
# # subjects = []
#
# ## Use asynchronous publishing for higher throughput, but note that it does not guarantee order within batches.
@ -2213,6 +2218,10 @@
# # allow_rollup_hdrs = false
# # allow_direct = true
# # mirror_direct = false
#
# ## Disable creating the stream but assume the stream is managed externally
# ## and already exists. This will make the plugin fail if the steam does not exist.
# # disable_stream_creation = false
# # Send aggregated metrics to Nebius.Cloud Monitoring
@ -2940,6 +2949,9 @@
# ## Initialization SQL
# # init_sql = ""
#
# ## Send metrics with the same columns and the same table as batches using prepared statements
# # batch_transactions = false
#
# ## Maximum amount of time a connection may be idle. "0s" means connections are
# ## never closed due to idle time.
# # connection_max_idle_time = "0s"
@ -4191,6 +4203,19 @@
# ## processors.converter after this one, specifying the order attribute.
# # Round numerical fields
# [[processors.round]]
# ## Precision to round to.
# ## A positive number indicates rounding to the right of the decimal separator (i.e. the fractional part).
# ## A negative number indicates rounding to the left of the decimal separator.
# # precision = 0
#
# ## Round only numeric fields matching the filter criteria below.
# ## Excludes takes precedence over includes.
# # include_fields = ["*"]
# # exclude_fields = []
# # Add the S2 Cell ID as a tag based on latitude and longitude fields
# [[processors.s2geo]]
# ## The name of the lat and lon fields containing WGS-84 latitude and
@ -6365,6 +6390,9 @@
# ## If true, collect metrics from Go's runtime.metrics. For a full list see:
# ## https://pkg.go.dev/runtime/metrics
# # collect_gostats = false
#
# ## Collect statistics per plugin instance and not per plugin type
# # per_instance = false
# # Monitors internet speed using speedtest.net service
@ -9707,7 +9735,8 @@
# "/etc/ssl/certs/ssl-cert-snakeoil.pem",
# "/etc/mycerts/*.mydomain.org.pem", "file:///path/to/*.pem",
# "jks:///etc/mycerts/keystore.jks",
# "pkcs12:///etc/mycerts/keystore.p12"]
# "pkcs12:///etc/mycerts/keystore.p12",
# "wincertstore://machine:ROOT", "wincertstore://user:CA"]
#
# ## Timeout for SSL connection
# # timeout = "5s"
@ -13726,6 +13755,10 @@
# ## For each combination a field is created.
# ## Its name is created concatenating identifier, sdparam_separator, and parameter name.
# # sdparam_separator = "_"
#
# ## Maximum length allowed for a single message (in bytes when no unit specified)
# ## Only applies to octet-counting framing.
# # max_message_length = "8KiB"
# # Gather information about systemd-unit states
@ -13848,6 +13881,18 @@
# #timeout = 5s
# ## Gather CPU metrics using Turbostat
# [[inputs.turbostat]]
# ## Path to the Turbostat exectuable if not in the PATH
# # path = "/usr/bin/turbostat"
#
# ## Turbostat measurement interval
# # interval = "10s"
#
# ## Use sudo to run the Turbostat executable
# # use_sudo = false
# # Read metrics from the Vault API
# [[inputs.vault]]
# ## URL for the Vault agent

View File

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=yq
PKG_VERSION:=4.47.1
PKG_VERSION:=4.47.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=48ef09b9ffdb80f26ee516fa2fc83f713c1b49f503cedef79a96435509d456af
PKG_HASH:=b1ed327337be9e044d8222c41f1437313b148ca73ec83946b1ff26e4ff785964
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MIT