From 3b146fa41277b05876ed0ba4c29071533a0cbb59 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 4 Sep 2024 05:08:22 +0800 Subject: [PATCH 1/3] toolchain: GCC 15-20240901 Snapshot * This snapshot has been generated from the GCC 15 git branch with the following options: git://gcc.gnu.org/git/gcc.git branch master revision 592a335de563a3a9e36d362c5b9f3fb0a990c1d8 Signed-off-by: sbwml --- .../generic/202-toolchain-gcc-add-support-for-GCC-15.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openwrt/patch/generic/202-toolchain-gcc-add-support-for-GCC-15.patch b/openwrt/patch/generic/202-toolchain-gcc-add-support-for-GCC-15.patch index f3c4f555e..8779b1f84 100644 --- a/openwrt/patch/generic/202-toolchain-gcc-add-support-for-GCC-15.patch +++ b/openwrt/patch/generic/202-toolchain-gcc-add-support-for-GCC-15.patch @@ -55,7 +55,7 @@ index f5db99f..24c6535 100644 endif +ifeq ($(PKG_VERSION),15.0.0) -+ PKG_HASH:=1be70eb828b6a0e8e6292e4a0ba27a5e8b5c920c5d5aa5ec88d7c3a53a2e398f ++ PKG_HASH:=4633621d7edc84b5e13c02c0d5f78a098e612321581b098319486b768055c7d9 +endif + PATCH_DIR=../patches-$(GCC_MAJOR_VERSION).x From e8f48de7c4a989ca5b0ec0797b7dbecedfd7a562 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 4 Sep 2024 12:45:44 +0800 Subject: [PATCH 2/3] luci-app-firewall: refresh patches Signed-off-by: sbwml --- ...-add-nft-fullcone-and-bcm-fullcone-.patch} | 16 ++++- ...-app-firewall-add-shortcut-fe-option.patch | 65 +++++++++++++++++++ ...ci-app-firewall-add-ipv6-nat-option.patch} | 15 +++++ ...irewall-add-custom-nft-rule-support.patch} | 21 ++++++ ...02-luci-app-firewall_add_shortcut-fe.patch | 34 ---------- openwrt/scripts/00-prepare_base.sh | 8 +-- 6 files changed, 120 insertions(+), 39 deletions(-) rename openwrt/patch/firewall4/{01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch => 0001-luci-app-firewall-add-nft-fullcone-and-bcm-fullcone-.patch} (69%) create mode 100644 openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch rename openwrt/patch/firewall4/{03-luci-app-firewall_add_ipv6-nat.patch => 0003-luci-app-firewall-add-ipv6-nat-option.patch} (52%) rename openwrt/patch/firewall4/{04-luci-add-firewall4-nft-rules-file.patch => 0004-luci-add-firewall-add-custom-nft-rule-support.patch} (68%) delete mode 100644 openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch diff --git a/openwrt/patch/firewall4/01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch b/openwrt/patch/firewall4/0001-luci-app-firewall-add-nft-fullcone-and-bcm-fullcone-.patch similarity index 69% rename from openwrt/patch/firewall4/01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch rename to openwrt/patch/firewall4/0001-luci-app-firewall-add-nft-fullcone-and-bcm-fullcone-.patch index 71452b080..1bfa53370 100644 --- a/openwrt/patch/firewall4/01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch +++ b/openwrt/patch/firewall4/0001-luci-app-firewall-add-nft-fullcone-and-bcm-fullcone-.patch @@ -1,5 +1,16 @@ +From 9bb3e0985634cd5bf7551d5f21a0ebc081af2599 Mon Sep 17 00:00:00 2001 +From: sbwml +Date: Wed, 4 Sep 2024 12:22:05 +0800 +Subject: [PATCH 1/4] luci-app-firewall: add nft-fullcone and bcm-fullcone + option + +Signed-off-by: sbwml +--- + .../htdocs/luci-static/resources/view/firewall/zones.js | 9 +++++++++ + 1 file changed, 9 insertions(+) + diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js -index 1de98c2..ac72083 100644 +index 1de98c2045..ac720831ef 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js @@ -58,6 +58,15 @@ return view.extend({ @@ -18,3 +29,6 @@ index 1de98c2..ac72083 100644 var p = [ s.option(form.ListValue, 'input', _('Input')), s.option(form.ListValue, 'output', _('Output')), +-- +2.43.5 + diff --git a/openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch b/openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch new file mode 100644 index 000000000..91e49bcbc --- /dev/null +++ b/openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch @@ -0,0 +1,65 @@ +From e62768ea9de7fcf554bce7ba8ed2e1f301863006 Mon Sep 17 00:00:00 2001 +From: sbwml +Date: Wed, 4 Sep 2024 12:34:17 +0800 +Subject: [PATCH 2/4] luci-app-firewall: add shortcut-fe option + +Signed-off-by: sbwml +--- + .../resources/view/firewall/zones.js | 34 +++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +index ac720831ef..f7c64e4379 100644 +--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js ++++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +@@ -100,6 +100,21 @@ return view.extend({ + o.depends('flow_offloading', '1'); + } + ++ /* Shortcut-FE flow offload support */ ++ if (L.hasSystemFeature('shortcutfe')) { ++ o = s.option(form.Flag, 'shortcut_fe', ++ _('Shortcut-FE flow offloading'), ++ _('Shortcut-FE based offloading for routing/NAT')); ++ o.optional = true; ++ ++ o = s.option(form.ListValue, 'shortcut_fe_module', ++ _('Connection Manager'), ++ _('Set up the Shortcut-FE engine connection manager')); ++ o.value('shortcut-fe-cm', _('shortcut-fe-cm')); ++ o.value('fast-classifier', _('fast-classifier')); ++ o.default = 'shortcut-fe-cm'; ++ o.depends('shortcut_fe', '1'); ++ } + + s = m.section(form.GridSection, 'zone', _('Zones')); + s.addremove = true; +@@ -393,6 +408,25 @@ return view.extend({ + o.filter = out.filter; + o.cfgvalue = out.cfgvalue; + ++ setTimeout(function() { ++ const checkboxes = document.querySelectorAll('.cbi-checkbox input[type="checkbox"]'); ++ checkboxes.forEach((checkbox) => { ++ const widgetId = checkbox.getAttribute('data-widget-id'); ++ if ((widgetId.includes('flow_offloading') && !widgetId.includes('flow_offloading_hw')) || widgetId.includes('shortcut_fe')) { ++ checkbox.addEventListener('change', function() { ++ if (this.checked) { ++ checkboxes.forEach((cb) => { ++ if (cb !== this && (cb.getAttribute('data-widget-id').includes('flow_offloading') || ++ cb.getAttribute('data-widget-id').includes('shortcut_fe'))) { ++ cb.checked = false; ++ } ++ }); ++ } ++ }); ++ } ++ }); ++ }, 500); ++ + return m.render(); + } + }); +-- +2.43.5 + diff --git a/openwrt/patch/firewall4/03-luci-app-firewall_add_ipv6-nat.patch b/openwrt/patch/firewall4/0003-luci-app-firewall-add-ipv6-nat-option.patch similarity index 52% rename from openwrt/patch/firewall4/03-luci-app-firewall_add_ipv6-nat.patch rename to openwrt/patch/firewall4/0003-luci-app-firewall-add-ipv6-nat-option.patch index 5579cbca3..d9263c6e9 100644 --- a/openwrt/patch/firewall4/03-luci-app-firewall_add_ipv6-nat.patch +++ b/openwrt/patch/firewall4/0003-luci-app-firewall-add-ipv6-nat-option.patch @@ -1,3 +1,15 @@ +From 6379d22fb3c4dba52078dfbf44c0f2b8315c0ccf Mon Sep 17 00:00:00 2001 +From: sbwml +Date: Wed, 4 Sep 2024 12:35:13 +0800 +Subject: [PATCH 3/4] luci-app-firewall: add ipv6 nat option + +Signed-off-by: sbwml +--- + .../htdocs/luci-static/resources/view/firewall/zones.js | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +index f7c64e4379..1bedd2ce52 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js @@ -67,6 +67,12 @@ return view.extend({ @@ -13,3 +25,6 @@ var p = [ s.option(form.ListValue, 'input', _('Input')), s.option(form.ListValue, 'output', _('Output')), +-- +2.43.5 + diff --git a/openwrt/patch/firewall4/04-luci-add-firewall4-nft-rules-file.patch b/openwrt/patch/firewall4/0004-luci-add-firewall-add-custom-nft-rule-support.patch similarity index 68% rename from openwrt/patch/firewall4/04-luci-add-firewall4-nft-rules-file.patch rename to openwrt/patch/firewall4/0004-luci-add-firewall-add-custom-nft-rule-support.patch index ebbbd05bd..b20e70ce0 100644 --- a/openwrt/patch/firewall4/04-luci-add-firewall4-nft-rules-file.patch +++ b/openwrt/patch/firewall4/0004-luci-add-firewall-add-custom-nft-rule-support.patch @@ -1,3 +1,17 @@ +From 0a71614b1690e60048b2f5c5ff672a68f5fd7478 Mon Sep 17 00:00:00 2001 +From: sbwml +Date: Wed, 4 Sep 2024 12:36:11 +0800 +Subject: [PATCH 4/4] luci-add-firewall: add custom nft rule support + +Signed-off-by: sbwml +--- + .../htdocs/luci-static/resources/view/firewall/custom.js | 6 +++--- + .../root/usr/share/luci/menu.d/luci-app-firewall.json | 3 --- + .../root/usr/share/rpcd/acl.d/luci-app-firewall.json | 6 ++++-- + 3 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js +index 1997a720c6..b3183d67d6 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/custom.js @@ -5,13 +5,13 @@ @@ -25,6 +39,8 @@ E('p', {}, E('textarea', { 'style': 'width:100%', 'rows': 25 }, [ fwuser != null ? fwuser : '' ])) ]); }, +diff --git a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json +index f024dcfe25..8aea702c53 100644 --- a/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json +++ b/applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json @@ -64,9 +64,6 @@ @@ -37,6 +53,8 @@ } } } +diff --git a/applications/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json b/applications/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json +index 17d1fbab12..7e06de7022 100644 --- a/applications/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json +++ b/applications/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json @@ -3,7 +3,8 @@ @@ -59,3 +77,6 @@ }, "ubus": { "file": [ "write" ] +-- +2.43.5 + diff --git a/openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch b/openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch deleted file mode 100644 index 759e37c3d..000000000 --- a/openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js -+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js -@@ -91,7 +91,7 @@ return view.extend({ - o = s.option(form.Flag, 'flow_offloading', - _('Software flow offloading'), - _('Software based offloading for routing/NAT')); -- o.optional = true; -+ o.optional = false; - - o = s.option(form.Flag, 'flow_offloading_hw', - _('Hardware flow offloading'), -@@ -100,6 +100,22 @@ return view.extend({ - o.depends('flow_offloading', '1'); - } - -+ /* Shortcut-FE flow offload support */ -+ if (L.hasSystemFeature('shortcutfe')) { -+ o = s.option(form.Flag, 'shortcut_fe', -+ _('Shortcut-FE flow offloading'), -+ _('Shortcut-FE based offloading for routing/NAT')); -+ o.optional = true; -+ o.depends('flow_offloading', '0'); -+ -+ o = s.option(form.ListValue, 'shortcut_fe_module', -+ _('Connection Manager'), -+ _('Set up the Shortcut-FE engine connection manager')); -+ o.value('shortcut-fe-cm', _('shortcut-fe-cm')); -+ o.value('fast-classifier', _('fast-classifier')); -+ o.modalonly = true; -+ o.depends('shortcut_fe', '1'); -+ } - - s = m.section(form.GridSection, 'zone', _('Zones')); - s.addremove = true; diff --git a/openwrt/scripts/00-prepare_base.sh b/openwrt/scripts/00-prepare_base.sh index 2685bdf23..844043456 100644 --- a/openwrt/scripts/00-prepare_base.sh +++ b/openwrt/scripts/00-prepare_base.sh @@ -200,10 +200,10 @@ git clone https://$github/sbwml/packages_new_nat6 package/new/nat6 # Patch Luci add nft_fullcone/bcm_fullcone & shortcut-fe & ipv6-nat & custom nft command option pushd feeds/luci - curl -s https://$mirror/openwrt/patch/firewall4/01-luci-app-firewall_add_nft-fullcone-bcm-fullcone_option.patch | patch -p1 - curl -s https://$mirror/openwrt/patch/firewall4/02-luci-app-firewall_add_shortcut-fe.patch | patch -p1 - curl -s https://$mirror/openwrt/patch/firewall4/03-luci-app-firewall_add_ipv6-nat.patch | patch -p1 - curl -s https://$mirror/openwrt/patch/firewall4/04-luci-add-firewall4-nft-rules-file.patch | patch -p1 + curl -s https://$mirror/openwrt/patch/firewall4/0001-luci-app-firewall-add-nft-fullcone-and-bcm-fullcone-.patch | patch -p1 + curl -s https://$mirror/openwrt/patch/firewall4/0002-luci-app-firewall-add-shortcut-fe-option.patch | patch -p1 + curl -s https://$mirror/openwrt/patch/firewall4/0003-luci-app-firewall-add-ipv6-nat-option.patch | patch -p1 + curl -s https://$mirror/openwrt/patch/firewall4/0004-luci-add-firewall-add-custom-nft-rule-support.patch | patch -p1 popd # openssl - quictls From 303a0dda8bfebfa63349615f62a3b472b65018c8 Mon Sep 17 00:00:00 2001 From: sbwml Date: Wed, 4 Sep 2024 12:51:24 +0800 Subject: [PATCH 3/3] openssl: quic: refresh patches Signed-off-by: sbwml --- .../openssl/quic/0044-QUIC-Update-metadata-version.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/openwrt/patch/openssl/quic/0044-QUIC-Update-metadata-version.patch b/openwrt/patch/openssl/quic/0044-QUIC-Update-metadata-version.patch index c2528104d..33aaf0d00 100644 --- a/openwrt/patch/openssl/quic/0044-QUIC-Update-metadata-version.patch +++ b/openwrt/patch/openssl/quic/0044-QUIC-Update-metadata-version.patch @@ -1,10 +1,5 @@ --- a/VERSION.dat +++ b/VERSION.dat -@@ -2,6 +2,6 @@ MAJOR=3 - MINOR=0 - PATCH=14 - PRE_RELEASE_TAG= +@@ -5,1 +5,1 @@ -BUILD_METADATA= +BUILD_METADATA=quic - RELEASE_DATE="4 Jun 2024" - SHLIB_VERSION=3