Merge branch 'openwrt:master' into master

2023-02-24 22:25:53 +05:30 · 2023-02-24 22:25:53 +05:30 · 2389aa4116
commit 2389aa4116
parent c3df6f24ab 21fa9f4656
18 changed files with 33 additions and 134 deletions
--- a/kernel/antfs/Makefile
+++ b/kernel/antfs/Makefile
@ -1,44 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=antfs
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=https://github.com/klukonin/antfs.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-02-10
-PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05
-PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db
-
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fs-antfs
-	SUBMENU:=Filesystems
-	TITLE:=AVM NTFS Read/Write Driver
-	FILES:=$(PKG_BUILD_DIR)/antfs.ko
-	AUTOLOAD:=$(call AutoLoad,30,antfs,1)
-	DEPENDS:=+kmod-nls-base @LINUX_5_10
-endef
-
-define KernelPackage/fs-antfs/description
-	Kernel module for NTFS Filesytem
-endef
-
-MAKE_OPTS:= \
-        ARCH="$(LINUX_KARCH)" \
-        CROSS_COMPILE="$(TARGET_CROSS)" \
-        M="$(PKG_BUILD_DIR)"
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		CONFIG_ANTFS_FS=m \
-		CONFIG_ANTFS_SYMLINKS=y \
-		ANTFS_VERSION=07.19-$(call version_abbrev,$(PKG_SOURCE_VERSION)) \
-		modules
-endef
-
-$(eval $(call KernelPackage,fs-antfs))
--- a/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch
+++ b/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch
@ -1,40 +0,0 @@
--- a/file.c
-+++ b/file.c
-@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *
- 		unsigned page_idx = nr_pages;
- 		pgoff_t page_idx_to_init;
- 		bool do_init_page = false;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+		DEFINE_READAHEAD(rac, file, mapping, 0);
-+#endif
- 
- 		if (page_offs & (buffer_len - 1)) {
- 			/* If initialized size is not on buffer boundary, walk
-@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *
- 			}
- 		}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+		mpage_readahead(&rac, antfs_get_block);
-+		err = 0;
-+#else
- 		err = mpage_readpages(mapping, pages, nr_pages,
- 				antfs_get_block);
-+#endif
- 		if (!err && do_init_page) {
- 			/* Initialize stuff past initialized_size with zero. */
- 			page = grab_cache_page(mapping, page_idx_to_init);
--- a/libntfs-3g/misc.c
-+++ b/libntfs-3g/misc.c
-@@ -38,7 +38,11 @@ void *ntfs_malloc(size_t size)
- 		return kmalloc(size, GFP_KERNEL);
- 	}
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
-+	return __vmalloc(size, GFP_KERNEL);
-+#else
- 	return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
-+#endif
- }
- 
- /**
--- a/lang/golang/golang/Makefile
+++ b/lang/golang/golang/Makefile
@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 GO_VERSION_MAJOR_MINOR:=1.19
-GO_VERSION_PATCH:=5
+GO_VERSION_PATCH:=6

 PKG_NAME:=golang
 PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@ -20,7 +20,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:=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
+PKG_HASH:=d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767

 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
--- a/libs/msgpack-c/Makefile
+++ b/libs/msgpack-c/Makefile
@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=msgpack-c
-PKG_VERSION:=4.0.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=5.0.0
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/c-$(PKG_VERSION)?
-PKG_HASH:=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3
+PKG_HASH:=a61288a9a46fd3b3b4cbd48a17736a9568b65419141cb536833f9adfe8fc97d7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-c-$(PKG_VERSION)

 PKG_LICENSE:=BSL-1.0
--- a/net/adguardhome/Makefile
+++ b/net/adguardhome/Makefile
@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.21
+PKG_VERSION:=0.107.24
 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:=ff5e38d977b8c8f5a546b745ab46894dd4b55f76b447b147287b47d03f6cd507

 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ddns-scripts
 PKG_VERSION:=2.8.2
-PKG_RELEASE:=34
+PKG_RELEASE:=35

 PKG_LICENSE:=GPL-2.0

--- a/net/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
+++ b/net/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
@ -3,5 +3,9 @@
 	"ipv4": {
 		"url": "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/generic.php?hostname=[DOMAIN]&myip=[IP]",
 		"answer": "OK|NOERROR"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/generic.php?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "OK|NOERROR"
 	}
 }
--- a/net/git/Makefile
+++ b/net/git/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=git
-PKG_VERSION:=2.34.6
+PKG_VERSION:=2.34.7
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=ed2c17ea71cacac9b92835e74edef7b26ed5bc85bb25e954adb0efa12fbfcf69
+PKG_HASH:=59754e404b7a5fd1544a67b50c2abdeb02b41012d831c02146cb148f1f3d2e5e

 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=https-dns-proxy
 PKG_VERSION:=2022-10-15
-PKG_RELEASE:=10
+PKG_RELEASE:=11

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
--- a/net/https-dns-proxy/files/https-dns-proxy.config
+++ b/net/https-dns-proxy/files/https-dns-proxy.config
@ -19,7 +19,7 @@ config https-dns-proxy
 	option bootstrap_dns '1.1.1.1,1.0.0.1'
 	option resolver_url 'https://cloudflare-dns.com/dns-query'
 	option listen_addr '127.0.0.1'
-	option listen_port '5054'
+	option listen_port '5053'
 	option user 'nobody'
 	option group 'nogroup'

@ -27,6 +27,6 @@ config https-dns-proxy
 	option bootstrap_dns '8.8.8.8,8.8.4.4'
 	option resolver_url 'https://dns.google/dns-query'
 	option listen_addr '127.0.0.1'
-	option listen_port '5053'
+	option listen_port '5054'
 	option user 'nobody'
 	option group 'nogroup'
--- a/net/https-dns-proxy/files/https-dns-proxy.init
+++ b/net/https-dns-proxy/files/https-dns-proxy.init
@ -127,6 +127,11 @@ append_bootstrap() {
 	[ "$ipv6_resolvers_only" -eq 0 ] && xappend '-4'
 }

+boot() {
+	ubus -t 30 wait_for network.interface 2>/dev/null
+	rc_procd start_service 'on_boot'
+}
+
 start_instance() {
 	local cfg="$1" param listen_addr listen_port ipv6_resolvers_only p url

--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=zerotier
-PKG_VERSION:=1.10.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=1.10.3
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=9f98b1670785f42294b9858068d42c6b8c2fdee6402e871a36562b47559e74e7
+PKG_HASH:=f2ce8a63a459a5fab129fb398e379b8c0875bdfeccb7bf15f9683ad22e43e629
 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)

 PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
--- a/net/zerotier/patches/0001-fix-makefile.patch
+++ b/net/zerotier/patches/0001-fix-makefile.patch
@ -38,7 +38,7 @@ Subject: [PATCH 1/2] fix makefile
 	RUSTFLAGS=--release
 endif
 
-@@ -308,7 +308,7 @@ ifeq ($(ZT_CONTROLLER),1)
+@@ -313,7 +313,7 @@ ifeq ($(ZT_CONTROLLER),1)
 endif
 
 # ARM32 hell -- use conservative CFLAGS
@ -47,7 +47,7 @@ Subject: [PATCH 1/2] fix makefile
 	ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
 		override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
 		override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
-@@ -335,8 +335,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
+@@ -340,8 +340,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
 endif
 
 # Position Independence
--- a/utils/antfs-mount/Makefile
+++ b/utils/antfs-mount/Makefile
@ -1,28 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=antfs-mount
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/antfs-mount
-	SECTION:=utils
-	CATEGORY:=Utilities
-	SUBMENU:=Filesystem
-	TITLE:=NTFS mount script for AVM NTFS driver
-	PKGARCH:=all
-	DEPENDS:=+kmod-fs-antfs
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/antfs-mount/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin
-endef
-
-$(eval $(call BuildPackage,antfs-mount))
--- a/utils/antfs-mount/files/mount.ntfs
+++ b/utils/antfs-mount/files/mount.ntfs
@ -1,2 +0,0 @@
-#!/bin/sh
-mount -t antfs "$@"
--- a/utils/miniflux/Makefile
+++ b/utils/miniflux/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=miniflux
-PKG_VERSION:=2.0.41
+PKG_VERSION:=2.0.42
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/miniflux/v2/tar.gz/${PKG_VERSION}?
-PKG_HASH:=01e150ebfba12c8b5ca7c1d9d5a5976d018081cafc11228d6f77a48ac3333e1b
+PKG_HASH:=f050b2bc9839dd485047b9d7820dbb669668fd13135aa8b49dc0ad304e509fd5

 PKG_MAINTAINER:=Michal Vasilek <michal.vasilek@nic.cz>
 PKG_LICENSE:=Apache-2.0
--- a/utils/miniflux/files/miniflux.conf
+++ b/utils/miniflux/files/miniflux.conf
@ -6,6 +6,8 @@ config miniflux main

 	option listen_address '127.0.0.1:5433'

+	option base_url ''
+
 	# run migrations on each start, disabling this will make miniflux fail to
 	# start on the next upgrade until migrations are ran manually
 	option migrate 1
--- a/utils/miniflux/files/miniflux.init
+++ b/utils/miniflux/files/miniflux.init
@ -24,6 +24,8 @@ start_service() {
 		procd_append_param env LISTEN_ADDR="$listen_address"
 		config_get run_migrations main run_migrations
 		[ "$run_migrations" = 1 ] && procd_append_param env RUN_MIGRATIONS=1
+		config_get base_url main base_url
+		[ -n "$base_url" ] && procd_append_param env BASE_URL="$base_url"

 		config_get database_url database url
 		if [ -z "$database_url" ]; then