update

Author: kiddin9

devices/common/.config

@@ -99,6 +99,7 @@ CONFIG_VERSIONOPT=y
 CONFIG_VERSION_MANUFACTURER="Kiddin'"
 CONFIG_VERSION_FILENAMES=n
 CONFIG_VERSION_CODE_FILENAMES=n
+CONFIG_VERSION_HOME_URL="https://openwrt.ai/"
 
 CONFIG_KERNEL_XDP_SOCKETS=y
 

devices/common/diy.sh

@@ -9,6 +9,8 @@ sed -i "s?targets/%S/packages?targets/%S/\$(LINUX_VERSION)?" include/feeds.mk
 
 sed -i '/	refresh_config();/d' scripts/feeds
 
+sed -i "s?git.openwrt.org/\(project\|feed\)?github.com/openwrt?g" feeds.conf.default
+
 ./scripts/feeds update -a
 ./scripts/feeds install -a -p kiddin9 -f
 ./scripts/feeds install -a
@@ -30,8 +32,9 @@ wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/
 wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/package/firmware/wireless-regdb/patches/600-custom-change-txpower-and-dfs.patch -P package/firmware/wireless-regdb/patches/
 wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/master/config/Config-kernel.in -P config/
 
-rm -rf package/libs/openssl package/network/services/ppp
+rm -rf package/libs/openssl package/network/services/ppp feeds/luci/modules/luci-mod-network
 git_clone_path openwrt-24.10 https://github.com/immortalwrt/immortalwrt package/libs/openssl package/network/services/ppp
+git_clone_path separate-dhcp-dns https://github.com/Alphix/luci modules/luci-mod-network && mv modules/luci-mod-network feeds/luci/modules/
 
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
@@ -41,6 +44,7 @@ coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr b
 
 sed -i "s/procd-ujail//" include/target.mk
 
+
 sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
 
 status=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/kwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')

devices/common/patches/luci-base.patch

@@ -117,6 +117,26 @@
  };
 
 
+--- a/package/feeds/luci/luci-base/htdocs/luci-static/resources/network.js
++++ b/package/feeds/luci/luci-base/htdocs/luci-static/resources/network.js
+@@ -2560,6 +2560,16 @@ Protocol = baseclass.extend(/** @lends LuCI.network.Protocol.prototype */ {
+ 		return (this._ubus('dynamic') == true);
+ 	},
+ 
++	/**
++	 * Checks whether this logical interface is pending.
++	 *
++	 * @returns {boolean}
++	 * returns `true` when the interface is pending or `false` when it is not.
++	 */
++	isPending: function() {
++		return (this._ubus('pending') == true);
++	},
++
+ 	/**
+ 	 * Checks whether this interface is an alias interface.
+ 	 *
+
 --- a/package/feeds/luci/luci-base/htdocs/luci-static/resources/network.js
 +++ b/package/feeds/luci/luci-base/htdocs/luci-static/resources/network.js
 @@ -4376,4 +4376,10 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */

devices/common/patches/luci-dhcp.patch

@@ -1,39 +1,24 @@
---- a/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
-+++ b/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
-@@ -337,6 +337,25 @@ return view.extend({
- 		s.tab('mxhosts', _('MX'));
- 		s.tab('cnamehosts', _('CNAME'));
- 		s.tab('pxe_tftp', _('PXE/TFTP'));
-+		s.tab('custom_domain', _('Custom Redirect Domain'));
-+
-+		o = s.taboption('custom_domain', form.SectionValue, 'domain', form.GridSection, 'domain', null,
-+			_('Define a custom domain name and the corresponding PTR record'));
-+
-+		ss = o.subsection;
-+		ss.addremove = true;
-+		ss.anonymous = true;
-+
-+		so = ss.option(form.Value, 'name', _('Domain Name'));
-+		so.datatype = 'hostname';
-+		so.rmempty  = false;
-+
-+		so = ss.option(form.Value, 'ip', _('<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address'));
-+		so.datatype = 'or(ip4addr,"ignore")';
-+		so.rmempty  = false;
+--- a/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
++++ b/package/feeds/luci/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js
+@@ -253,6 +253,11 @@ return view.extend({
+ 		o.optional = true;
+ 		o.placeholder = '/example.org/ipset,ipset6';
+ 
++		o = s.taboption('general', form.Flag, 'dns_redirect',
++			_('DNS Redirect'),
++			_('Force redirect all local DNS queries to DNSMasq, a.k.a. DNS Hijacking.'));
++		o.optional = true;
 +
+ 		o = s.taboption('general', form.Flag, 'allservers',
+ 			_('All servers'),
+ 			_('Query all available upstream resolvers.') + ' ' + _('First answer wins.'));
+@@ -442,6 +447,9 @@ return view.extend({
+ 		so.rmempty = false;
+ 		so.datatype = 'ipaddr("nomask")';
+ 
 +		so = ss.option(form.Value, 'comments', _('Comments'));
 +		so.rmempty  = true;
- 
- 		s.taboption('filteropts', form.Flag, 'domainneeded',
- 			_('Domain required'),
-@@ -347,6 +366,10 @@ return view.extend({
- 			_('Authoritative'),
- 			_('This is the only DHCP server in the local network.'));
- 
-+		s.taboption('general', form.Flag, 'dns_redirect',
-+			_('DNS redirect'),
-+			_('Force redirect all local DNS queries to DNSMasq, a.k.a. DNS Hijacking.'));
 +
- 		o = s.taboption('general', form.Value, 'local',
- 			_('Resolve these locally'),
- 			_('Never forward these matching domains or subdomains; resolve from DHCP or hosts files only.'));
+ 		var ipaddrs = {};
+ 
+ 		Object.keys(hosts).forEach(function(mac) {