[openwrt/openwrt] dnsmasq: add uci-defaults script for ipset migration

[LEDE Commits]

ldir pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7cdf74e163d8da8bf143c1ddd128f636e8e5afde

commit 7cdf74e163d8da8bf143c1ddd128f636e8e5afde
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Wed May 4 21:50:41 2022 +0200

    dnsmasq: add uci-defaults script for ipset migration
    
    When running sysupgrade from an existing configuration, move existing
    ipset definitions to a dedicated config section. Later on, it will allow
    to serve ipset as well as nftable sets from the same configuration.
    
    Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 package/network/services/dnsmasq/Makefile          |  1 +
 .../dnsmasq/files/50-dnsmasq-migrate-ipset.sh      | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 2a2d4fae79..e2902ed875 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -182,6 +182,7 @@ define Package/dnsmasq/install
 	$(INSTALL_DATA) ./files/dnsmasq_acl.json $(1)/usr/share/acl.d/
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/50-dnsmasq-migrate-resolv-conf-auto.sh $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/50-dnsmasq-migrate-ipset.sh $(1)/etc/uci-defaults
 endef
 
 Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
diff --git a/package/network/services/dnsmasq/files/50-dnsmasq-migrate-ipset.sh b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-ipset.sh
new file mode 100755
index 0000000000..aba73e7dd4
--- /dev/null
+++ b/package/network/services/dnsmasq/files/50-dnsmasq-migrate-ipset.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+ipsets=$(uci -q get dhcp. at dnsmasq[0].ipset)
+[ -z "$ipsets" ] && exit 0
+
+for ipset in $ipsets; do
+	names=${ipset##*/}
+	domains=${ipset%/*}
+
+	[ -z "$names" ] || [ -z "$domains" ] && continue
+
+	uci add dhcp ipset
+
+	OLDIFS="$IFS"
+
+	IFS=","
+	for name in $names; do
+		uci add_list dhcp. at ipset[-1].name="$name"
+	done
+
+	IFS="/"
+	for domain in ${domains:1}; do
+		uci add_list dhcp. at ipset[-1].domain="$domain"
+	done
+
+	IFS="$OLDIFS"
+
+	uci del_list dhcp. at dnsmasq[0].ipset="$ipset"
+done
+
+uci commit dhcp
+exit 0