[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: tools/dosfstools: fix PKG_SOURCE (coolsnowwolf#10620) kernel: bump to 5.4.227, 5.10.159, 5.15.83 (coolsnowwolf#10619) dnsmasq: drop mini_ttl option dnsmasq: add support for filter-AAAA/A dnsmasq: add logfacility file to jail mounts firewall: set default fullcone to high performance mode generic: fix linux 6.1 flowoffload support
BCYDTZ · Dec 15, 2022 · b2d3e3d · b2d3e3d
2 parents 89f256c + 4952f51
commit b2d3e3d
Show file tree

Hide file tree

Showing 39 changed files with 131 additions and 387 deletions.
diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .158
-LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
+LINUX_VERSION-5.10 = .159
+LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .82
-LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
+LINUX_VERSION-5.15 = .83
+LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .226
-LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
+LINUX_VERSION-5.4 = .227
+LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593
diff --git a/include/kernel-6.1 b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 =
+LINUX_VERSION-6.1 = 
 LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewall
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git

diff --git a/package/network/config/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config
@@ -3,7 +3,7 @@ config defaults
 	option input		ACCEPT
 	option output		ACCEPT
 	option forward		REJECT
-	option fullcone	0
+	option fullcone	2
 # Uncomment this line to disable ipv6 rules
 #	option disable_ipv6	1
 

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2006-2022 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.