Skip to content

Commit fbe1701

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: 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 kernel: kmod-ipt-ulog: Remove package rockchip: fix opc-h68k tf boot fail on some cards dnsmasq: bump to v2.8.7 silicon: fix kernel target
2 parents 0eba6b9 + 7660f97 commit fbe1701

File tree

52 files changed

+180
-1041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+180
-1041
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .158
2-
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
1+
LINUX_VERSION-5.10 = .159
2+
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .82
2-
LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
1+
LINUX_VERSION-5.15 = .83
2+
LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .226
2-
LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
1+
LINUX_VERSION-5.4 = .227
2+
LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593

‎include/kernel-6.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.1 =
1+
LINUX_VERSION-6.1 =
22
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb

‎include/netfilter.mk

-7
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_connt
230230
$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc))
231231

232232

233-
# ulog
234-
235-
$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
236-
237-
238233
# nflog
239234

240235
$(eval $(call nf_add,IPT_NFLOG,CONFIG_NETFILTER_XT_TARGET_NFLOG, $(P_XT)xt_NFLOG))
@@ -321,7 +316,6 @@ $(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat))
321316

322317
# watchers
323318
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log))
324-
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog))
325319
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog))
326320
$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nfqueue))
327321

@@ -393,7 +387,6 @@ IPT_BUILTIN += $(IPT_NAT6-y)
393387
IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
394388
IPT_BUILTIN += $(NF_NATHELPER-y)
395389
IPT_BUILTIN += $(NF_NATHELPER_EXTRA-y)
396-
IPT_BUILTIN += $(IPT_ULOG-y)
397390
IPT_BUILTIN += $(IPT_TPROXY-y)
398391
IPT_BUILTIN += $(NFNETLINK-y)
399392
IPT_BUILTIN += $(NFNETLINK_LOG-y)

‎package/kernel/linux/modules/netfilter.mk

-17
Original file line numberDiff line numberDiff line change
@@ -604,23 +604,6 @@ endef
604604
$(eval $(call KernelPackage,nf-nathelper-extra))
605605

606606

607-
define KernelPackage/ipt-ulog
608-
TITLE:=Module for user-space packet logging
609-
KCONFIG:=$(KCONFIG_IPT_ULOG)
610-
FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).ko)
611-
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_ULOG-m)))
612-
$(call AddDepends/ipt)
613-
endef
614-
615-
define KernelPackage/ipt-ulog/description
616-
Netfilter (IPv4) module for user-space packet logging
617-
Includes:
618-
- ULOG
619-
endef
620-
621-
$(eval $(call KernelPackage,ipt-ulog))
622-
623-
624607
define KernelPackage/ipt-nflog
625608
TITLE:=Module for user-space packet logging
626609
KCONFIG:=$(KCONFIG_IPT_NFLOG)

‎package/kernel/linux/modules/usb.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@ endef
11541154

11551155
$(eval $(call KernelPackage,usb-net-asix))
11561156

1157-
11581157
define KernelPackage/usb-net-asix-ax88179
11591158
TITLE:=Kernel module for USB-to-Gigabit-Ethernet Asix convertors
11601159
DEPENDS:=+kmod-libphy

‎package/network/config/firewall/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
include $(TOPDIR)/rules.mk
1010

1111
PKG_NAME:=firewall
12-
PKG_RELEASE:=2
12+
PKG_RELEASE:=3
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git

‎package/network/config/firewall/files/firewall.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ config defaults
33
option input ACCEPT
44
option output ACCEPT
55
option forward REJECT
6-
option fullcone 0
6+
option fullcone 2
77
# Uncomment this line to disable ipv6 rules
88
# option disable_ipv6 1
99

‎package/network/services/dnsmasq/Makefile

+15-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2006-2016 OpenWrt.org
2+
# Copyright (C) 2006-2022 OpenWrt.org
33
#
44
# This is free software, licensed under the GNU General Public License v2.
55
# See /LICENSE for more information.
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=dnsmasq
11-
PKG_UPSTREAM_VERSION:=2.86
11+
PKG_UPSTREAM_VERSION:=2.87
1212
PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
1313
PKG_RELEASE:=$(AUTORELEASE)
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
16-
PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq
17-
PKG_HASH:=28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
16+
PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/
17+
PKG_HASH:=0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a
1818

1919
PKG_LICENSE:=GPL-2.0
2020
PKG_LICENSE_FILES:=COPYING
@@ -30,6 +30,7 @@ PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcp \
3030
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \
3131
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth \
3232
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset \
33+
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_nftset \
3334
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack \
3435
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_noid \
3536
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc \
@@ -61,10 +62,11 @@ endef
6162

6263
define Package/dnsmasq-full
6364
$(call Package/dnsmasq/Default)
64-
TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset, Conntrack, NO_ID enabled by default)
65+
TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset, Nftset, Conntrack, NO_ID enabled by default)
6566
DEPENDS+=+PACKAGE_dnsmasq_full_dnssec:libnettle \
6667
+PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset \
67-
+PACKAGE_dnsmasq_full_conntrack:libnetfilter-conntrack
68+
+PACKAGE_dnsmasq_full_conntrack:libnetfilter-conntrack \
69+
+PACKAGE_dnsmasq_full_nftset:nftables-json
6870
VARIANT:=full
6971
PROVIDES:=dnsmasq
7072
endef
@@ -83,7 +85,7 @@ define Package/dnsmasq-full/description
8385
$(call Package/dnsmasq/description)
8486

8587
This is a fully configurable variant with DHCPv4, DHCPv6, DNSSEC, Authoritative DNS
86-
and IPset, Conntrack support & NO_ID enabled by default.
88+
and nftset, Conntrack support & NO_ID enabled by default.
8789
endef
8890

8991
define Package/dnsmasq/conffiles
@@ -100,7 +102,7 @@ define Package/dnsmasq-full/config
100102
config PACKAGE_dnsmasq_full_dhcpv6
101103
bool "Build with DHCPv6 support."
102104
depends on IPV6 && PACKAGE_dnsmasq_full_dhcp
103-
default n
105+
default y
104106
config PACKAGE_dnsmasq_full_dnssec
105107
bool "Build with DNSSEC support."
106108
default n
@@ -110,6 +112,9 @@ define Package/dnsmasq-full/config
110112
config PACKAGE_dnsmasq_full_ipset
111113
bool "Build with IPset support."
112114
default y
115+
config PACKAGE_dnsmasq_full_nftset
116+
bool "Build with Nftset support."
117+
default n
113118
config PACKAGE_dnsmasq_full_conntrack
114119
bool "Build with Conntrack support."
115120
default n
@@ -144,6 +149,7 @@ ifeq ($(BUILD_VARIANT),full)
144149
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec),-DHAVE_DNSSEC) \
145150
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth),,-DNO_AUTH) \
146151
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET) \
152+
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_nftset),-DHAVE_NFTSET,) \
147153
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack),-DHAVE_CONNTRACK,) \
148154
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_noid),-DNO_ID,) \
149155
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc),-DHAVE_BROKEN_RTC) \
@@ -182,6 +188,7 @@ define Package/dnsmasq/install
182188
$(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/
183189
$(INSTALL_DIR) $(1)/etc/uci-defaults
184190
$(INSTALL_BIN) ./files/50-dnsmasq-migrate-resolv-conf-auto.sh $(1)/etc/uci-defaults
191+
$(INSTALL_BIN) ./files/50-dnsmasq-migrate-ipset.sh $(1)/etc/uci-defaults
185192
endef
186193

187194
Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)

‎package/network/services/dnsmasq/files/50-dnsmasq-migrate-ipset.sh

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
3+
ipsets=$(uci -q get dhcp.@dnsmasq[0].ipset)
4+
[ -z "$ipsets" ] && exit 0
5+
6+
for ipset in $ipsets; do
7+
names=${ipset##*/}
8+
domains=${ipset%/*}
9+
10+
[ -z "$names" ] || [ -z "$domains" ] && continue
11+
12+
uci add dhcp ipset
13+
14+
OLDIFS="$IFS"
15+
16+
IFS=","
17+
for name in $names; do
18+
uci add_list dhcp.@ipset[-1].name="$name"
19+
done
20+
21+
IFS="/"
22+
for domain in ${domains:1}; do
23+
uci add_list dhcp.@ipset[-1].domain="$domain"
24+
done
25+
26+
IFS="$OLDIFS"
27+
28+
uci del_list dhcp.@dnsmasq[0].ipset="$ipset"
29+
done
30+
31+
uci commit dhcp
32+
exit 0

‎package/network/services/dnsmasq/files/dhcp.conf

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ config dnsmasq
2020
#list notinterface lo
2121
#list bogusnxdomain '64.94.110.11'
2222
option localservice 1 # disable to allow DNS requests from non-local subnets
23-
option filter_aaaa 1
24-
option filter_a 0
25-
option cachesize 8000
26-
option mini_ttl 3600
2723
option ednspacket_max 1232
24+
option filter_aaaa 0
25+
option filter_a 0
26+
#list addnmount /some/path # read-only mount path to expose it to dnsmasq
2827

2928
config dhcp lan
3029
option interface lan

0 commit comments

Comments
 (0)