diff --git a/lang/python/python-jsonschema-specifications/Makefile b/lang/python/python-jsonschema-specifications/Makefile index 88cc0ba32..c33f57e0a 100644 --- a/lang/python/python-jsonschema-specifications/Makefile +++ b/lang/python/python-jsonschema-specifications/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-jsonschema-specifications -PKG_VERSION:=2023.7.1 +PKG_VERSION:=2023.11.2 PKG_RELEASE:=1 PYPI_NAME:=jsonschema-specifications PYPI_SOURCE_NAME:=jsonschema_specifications -PKG_HASH:=c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb +PKG_HASH:=9472fc4fea474cd74bea4a2b190daeccb5a9e4db2ea80efcf7a1b582fc9a81b8 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 1edc610b9..d9c0873c9 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt -PKG_VERSION:=1.1.37 +PKG_VERSION:=1.1.39 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libxslt/$(basename $(PKG_VERSION)) -PKG_HASH:=3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 +PKG_HASH:=2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 PKG_MAINTAINER:=Jiri Slachta PKG_LICENSE:=MIT diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile index 711cea1eb..37da8defc 100644 --- a/net/adblock-fast/Makefile +++ b/net/adblock-fast/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock-fast PKG_VERSION:=1.1.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast index 2c17caa50..a12e3a6f1 100755 --- a/net/adblock-fast/files/etc/init.d/adblock-fast +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -293,7 +293,8 @@ get_url_filesize() { [ -n "$url" ] || return 0 is_present 'curl' || return 0 size_command='curl --silent --insecure --fail --head --request GET' - size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')" +# size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')" + size="$($size_command "$url" | grep -Eo '^[cC]ontent-[lL]ength: (.*)' | awk '{print $2}')" # shellcheck disable=SC3037 echo -en "$size" } @@ -346,7 +347,7 @@ uci_changes() { local PACKAGE="$1" local CONFIG="$2" local OPTION="$3" - if [ -s "${UCI_CONFIG_DIR:-'/etc/config'}${PACKAGE}" ]; then + if [ -s "${UCI_CONFIG_DIR:-/etc/config/}${PACKAGE}" ]; then /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} changes "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}" fi } @@ -775,6 +776,7 @@ load_environment() { resolver() { _dnsmasq_instance_config() { local cfg="$1" param="$2" + [ -s "/etc/config/dhcp" ] || return 0 case "$param" in dnsmasq.addnhosts) if [ "$(uci_get 'dhcp' "$cfg" 'serversfile')" = "$dnsmasqServersFile" ]; then @@ -797,6 +799,7 @@ resolver() { esac } _smartdns_instance_config() { + [ -s "/etc/config/smartdns" ] || return 0 local cfg="$1" param="$2" case "$param" in cleanup) @@ -835,12 +838,16 @@ resolver() { rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig" rm -f "$smartdnsNftsetFile" "$smartdnsNftsetCache" "${compressed_cache_dir}/${smartdnsNftsetGzip}" "$smartdnsNftsetConfig" rm -f "$unboundFile" "$unboundCache" "$unboundGzip" - config_load 'dhcp' - config_foreach _dnsmasq_instance_config 'dnsmasq' 'cleanup' - uci_commit 'dhcp' - config_load 'smartdns' - config_foreach _smartdns_instance_config 'smartdns' 'cleanup' - uci_commit 'smartdns' + if [ -s "/etc/config/dhcp" ]; then + config_load 'dhcp' + config_foreach _dnsmasq_instance_config 'dnsmasq' 'cleanup' + [ -n "$(uci_changes 'dhcp')" ] && uci_commit 'dhcp' + fi + if [ -s "/etc/config/smartdns" ]; then + config_load 'smartdns' + config_foreach _smartdns_instance_config 'smartdns' 'cleanup' + [ -n "$(uci_changes 'smartdns')" ] && uci_commit 'smartdns' + fi ;; on_start) if [ ! -s "$outputFile" ]; then diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index ada453c85..38a97c5cf 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.36 +PKG_VERSION:=0.107.42 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=6f32717df3654432d0c50ee730f0eef3ec806a966508f5cd82899077f1e086c8 +PKG_MIRROR_HASH:=a3ab5470960b2ba8645d6889f5b4d229e6b21201503e61e2c485666540b33806 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt diff --git a/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch b/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch deleted file mode 100644 index c158b2368..000000000 --- a/net/adguardhome/patches/0001-go-get-github.com-quic-go-quic-go-v0.37.6.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 61c2e12116147fab716221009b3a14fa5792a72d Mon Sep 17 00:00:00 2001 -From: Dobroslaw Kijowski -Date: Mon, 21 Aug 2023 10:22:27 +0200 -Subject: [PATCH] go get github.com/quic-go/quic-go@v0.37.6 - ---- - go.mod | 4 ++-- - go.sum | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - ---- a/go.mod -+++ b/go.mod -@@ -28,7 +28,7 @@ require ( - github.com/mdlayher/raw v0.1.0 - github.com/miekg/dns v1.1.55 - // TODO(a.garipov): Update to ≥ v0.37.0 once we update to Go 1.20. -- github.com/quic-go/quic-go v0.36.2 -+ github.com/quic-go/quic-go v0.37.6 - github.com/stretchr/testify v1.8.4 - github.com/ti-mo/netfilter v0.5.0 - go.etcd.io/bbolt v1.3.7 -@@ -60,7 +60,7 @@ require ( - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-19 v0.3.2 // indirect -- github.com/quic-go/qtls-go1-20 v0.2.2 // indirect -+ github.com/quic-go/qtls-go1-20 v0.3.1 // indirect - github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect ---- a/go.sum -+++ b/go.sum -@@ -108,8 +108,12 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1 - github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= - github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E= - github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= -+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg= -+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= - github.com/quic-go/quic-go v0.36.2 h1:ZX/UNQ4gvpCv2RmwdbA6lrRjF6EBm5yZ7TMoT4NQVrA= - github.com/quic-go/quic-go v0.36.2/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ= -+github.com/quic-go/quic-go v0.37.6 h1:2IIUmQzT5YNxAiaPGjs++Z4hGOtIR0q79uS5qE9ccfY= -+github.com/quic-go/quic-go v0.37.6/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU= - github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA= - github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index 1a8a6441d..a94d248c7 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.59.1 +PKG_VERSION:=0.60.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=151616e2562b9bc8de85725293b264e7769d84fe1cd462e74be6fdc8505b0cbb +PKG_HASH:=4985b65cc4055f2defda5910005a998077726f5118ce55830b05d42dd73affd6 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile index 5d491c322..3bd577e8f 100644 --- a/net/sing-box/Makefile +++ b/net/sing-box/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.6.6 +PKG_VERSION:=1.7.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=88c8825f6e8af2e46a16e8a85ceb5e1c7c0795b59cad93c8327288ec7b8249e0 +PKG_HASH:=483c7188f054dffc37211a4c6d50edc7473f9cbbe57c5687bb3551aba3919e52 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 3f4df0996..1ed4ce64f 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.75.0 -PKG_RELEASE:=3 +PKG_VERSION:=3.1.76.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=c1a1b7d00df5ab45df968f0fb0125eba95bad27c181018b8d68a41e1bb6fc111 +PKG_HASH:=5586199be8b7a7c6a1b73e0af2e2e004db8417b8282668b10583071e35c9c7a9 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only diff --git a/utils/irqbalance/Makefile b/utils/irqbalance/Makefile index 23d4b3899..83f07da84 100644 --- a/utils/irqbalance/Makefile +++ b/utils/irqbalance/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irqbalance PKG_VERSION:=1.9.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git diff --git a/utils/irqbalance/patches/010-meson.patch b/utils/irqbalance/patches/010-meson.patch index 7e3ae36d8..71a8ebae7 100644 --- a/utils/irqbalance/patches/010-meson.patch +++ b/utils/irqbalance/patches/010-meson.patch @@ -4,6 +4,9 @@ Date: Fri, 10 Jun 2022 23:14:27 -0700 Subject: [PATCH] add meson Signed-off-by: Rosen Penev + +[update version string to 1.9.3] + --- meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++ meson_options.txt | 11 +++++++++++ @@ -15,7 +18,7 @@ Signed-off-by: Rosen Penev +++ b/meson.build @@ -0,0 +1,43 @@ +project('irqbalance', 'c', -+ version : '1.9.0', ++ version : '1.9.3', + default_options : ['warning_level=1'] +) + diff --git a/utils/irqbalance/patches/020-mark-EINVAL-error-permanent.patch b/utils/irqbalance/patches/020-mark-EINVAL-error-permanent.patch new file mode 100644 index 000000000..44eb15dc0 --- /dev/null +++ b/utils/irqbalance/patches/020-mark-EINVAL-error-permanent.patch @@ -0,0 +1,15 @@ +--- a/activate.c ++++ b/activate.c +@@ -98,11 +98,11 @@ error: + case ENOSPC: /* Specified CPU APIC is full. */ + case EAGAIN: /* Interrupted by signal. */ + case EBUSY: /* Affinity change already in progress. */ +- case EINVAL: /* IRQ would be bound to no CPU. */ + case ERANGE: /* CPU in mask is offline. */ + case ENOMEM: /* Kernel cannot allocate CPU mask. */ + /* Do not blacklist the IRQ on transient errors. */ + break; ++ case EINVAL: /* IRQ would be bound to no CPU. */ + default: + /* Any other error is considered permanent. */ + info->flags |= IRQ_FLAG_AFFINITY_UNMANAGED; diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index e8b744a46..71d7880c4 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing PKG_VERSION:=1.24.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) diff --git a/utils/syncthing/files/syncthing.init b/utils/syncthing/files/syncthing.init index 3ec81e593..7bcb90dae 100644 --- a/utils/syncthing/files/syncthing.init +++ b/utils/syncthing/files/syncthing.init @@ -14,7 +14,7 @@ config_cb() { local option="$1" local value="$2" case $option in - enabled|macprocs|nice|user|logfile) + enabled|gui_address|home|logfile|macprocs|nice|user) eval $option=$value ;; debug)