Merge branch 'openwrt:master' into nginx-add-new-redirect

devel/cargo-c/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cargo-c
-PKG_VERSION:=0.9.32
+PKG_VERSION:=0.10.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/lu-zero/cargo-c/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=a96f3cc6c63d9901c9583083338d50b0132504bb067f68accc17f4116ed01f72
+PKG_HASH:=2c7bfff50e9c11801c92280f34f7d308857652b0c3875d0fd0906167623414ac
 
 PKG_MAINTAINER:=Luca Barbato <[email protected]>
 PKG_LICENSE:=MIT

lang/lua-ffi/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua-ffi
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL=https://github.com/zhaojh329/lua-ffi/releases/download/v$(PKG_VERSION)
-PKG_HASH:=e26a8ed685c1aa31566683e3c06b057fd9ae6c7eec9922abe7661eeb678f1cd8
+PKG_HASH:=85651aa772de5717b85fc6ac9bba61f0dc20155707fad8099245f97ecd301996
 
 PKG_MAINTAINER:=Jianhui Zhao <[email protected]>
 PKG_LICENSE:=MIT

lang/rust/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
-PKG_VERSION:=1.81.0
+PKG_VERSION:=1.84.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
+PKG_HASH:=15cee7395b07ffde022060455b3140366ec3a12cbbea8f1ef2ff371a9cca51bf
 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <[email protected]>

libs/libedit/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 VERSION:=3.1
-RELEASE_DATE:=20240808
+RELEASE_DATE:=20250104
 
 PKG_NAME:=libedit
 PKG_VERSION:=$(RELEASE_DATE).$(VERSION)
@@ -20,7 +20,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(RELEASE_DATE)-$(VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(RELEASE_DATE)-$(VERSION).tar.gz
 PKG_SOURCE_URL:=https://thrysoee.dk/editline/
-PKG_HASH:=5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f
+PKG_HASH:=23792701694550a53720630cd1cd6167101b5773adddcb4104f7345b73a568ac
 
 PKG_INSTALL:=1
 

libs/liburcu/Makefile

@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=liburcu
-PKG_VERSION:=0.14.1
+PKG_VERSION:=0.15.0
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Daniel Salzman <[email protected]>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=lgpl-2.1.txt gpl-2.0.txt lgpl-relicensing.txt
 
 PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://lttng.org/files/urcu/
-PKG_HASH:=231acb13dc6ec023e836a0f0666f6aab47dc621ecb1d2cd9d9c22f922678abc0
+PKG_HASH:=4f2d839af67905ad396d6d53ba5649b66113d90840dcbc89941e0da64bccd38c
 PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION)
 
 PKG_FIXUP:=autoreconf

libs/liburcu/patches/010-no-tests.patch

@@ -1,10 +1,11 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,6 +1,6 @@
+@@ -4,7 +4,7 @@
+
  ACLOCAL_AMFLAGS=-I m4
 
 -SUBDIRS = include src doc tests extras
 +SUBDIRS = include src
 
- dist_doc_DATA = LICENSE \
- 		README.md
+ dist_doc_DATA = \
+ 	LICENSE.md \

net/acme-acmesh/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
-PKG_VERSION:=3.0.7
-PKG_RELEASE:=2
+PKG_VERSION:=3.1.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=abd446d6bd45d0b44dca1dcbd931348797a3f82d1ed6fb171472eaf851a8d849
+PKG_HASH:=5bc8a72095e16a1a177d1a516728bbd3436abf8060232d5d36b462fce74447aa
 PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <[email protected]>

net/antiblock/Makefile

@@ -0,0 +1,48 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=antiblock
+PKG_VERSION:=2.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/karen07/antiblock
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=3ea495e825edb75bc0bec9010d4b0195442dbcc745fc4d3150ae41ca11e9dfc4
+
+PKG_MAINTAINER:=Khachatryan Karen <[email protected]>
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/antiblock
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libcurl
+  TITLE:=AntiBlock
+  URL:=https://github.com/karen07/antiblock
+endef
+
+define Package/antiblock/description
+  AntiBlock program proxies DNS requests.
+  The IP addresses of the specified domains are added to
+  the routing table for routing through the specified interface.
+endef
+
+define Package/antiblock/conffiles
+/etc/config/antiblock
+endef
+
+define Package/antiblock/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/antiblock $(1)/usr/bin/antiblock
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/antiblock $(1)/etc/init.d/antiblock
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/antiblock $(1)/etc/config/antiblock
+endef
+
+$(eval $(call BuildPackage,antiblock))

net/antiblock/files/etc/config/antiblock

@@ -0,0 +1,14 @@
+
+#config antiblock 'config'
+	#option enabled '0'
+	#At least one parameters needs to be filled:
+		#option url 'https://antifilter.download/list/domains.lst'
+		#option file '/root/my_urls.txt'
+	#Required parameters:
+		#option listen '192.168.1.1:5053'
+		#option DNS '1.1.1.1:53'
+		#option VPN_name 'VPN'
+	#Optional parameters:
+		#option log '1'
+		#option stat '1'
+		#option output '/tmp/antiblock'

net/antiblock/files/etc/init.d/antiblock

@@ -0,0 +1,83 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=99
+
+CONF="antiblock"
+
+start_service() {
+	config_load "$CONF"
+
+	local _enabled
+	config_get_bool _enabled "config" "enabled" "0"
+	[ "${_enabled}" -eq "0" ] && return 1
+
+	echo "AntiBlock start"
+
+	local _url
+	local _file
+	local _listen
+	local _DNS
+	local _VPN_name
+	local _log
+	local _stat
+	local _output
+
+	config_get _url "config" "url"
+	config_get _file "config" "file"
+
+	config_get _listen "config" "listen"
+	config_get _DNS "config" "DNS"
+	config_get _VPN_name "config" "VPN_name"
+
+	config_get_bool _log "config" "log" "0"
+	config_get_bool _stat "config" "stat" "0"
+	config_get _output "config" "output"
+
+	procd_open_instance "$CONF"
+
+	procd_set_param command "/usr/bin/antiblock"
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+
+	[ -n "${_url}" ] && procd_append_param command -url "${_url}"
+	[ -n "${_file}" ] && procd_append_param command -file "${_file}"
+
+	if [ -n "${_listen}" ]; then
+		local listen_IP="$(echo "${_listen}" | cut -d ':' -f1)"
+		local listen_port="$(echo "${_listen}" | cut -d ':' -f2)"
+		uci -q set dhcp.@dnsmasq[0].noresolv="1"
+		uci -q delete dhcp.@dnsmasq[0].server
+		uci -q add_list dhcp.@dnsmasq[0].server="$listen_IP#$listen_port"
+
+		procd_append_param command -listen "${_listen}"
+	fi
+	[ -n "${_DNS}" ] && procd_append_param command -DNS "${_DNS}"
+	if [ -n "${_VPN_name}" ]; then
+		local gateway="$(uci -q get network."${_VPN_name}".addresses | cut -d '/' -f1)"
+		procd_append_param command -gateway "$gateway"
+	fi
+
+	[ "${_log}" -ne "0" ] && procd_append_param command -log
+	[ "${_stat}" -ne "0" ] && procd_append_param command -stat
+	if [ -n "${_output}" ]; then
+		mkdir -p "${_output}"
+		procd_append_param command -output "${_output}"
+	fi
+
+	procd_close_instance
+
+	/etc/init.d/dnsmasq restart >/dev/null 2>&1
+}
+
+stop_service() {
+	echo "AntiBlock stop"
+
+	uci -q revert dhcp.@dnsmasq[0]
+
+	/etc/init.d/dnsmasq restart >/dev/null 2>&1
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONF"
+}

net/antiblock/test.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+antiblock | grep "AntiBlock started"

net/banip/Makefile

@@ -1,12 +1,12 @@
 # banIP - ban incoming and outgoing IPs via named nftables Sets
-# Copyright (c) 2018-2024 Dirk Brenken ([email protected])
+# Copyright (c) 2018-2025 Dirk Brenken ([email protected])
 # This is free software, licensed under the GNU General Public License v3.
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.5.0
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>