From d13bdc2c76ecd0f9110a67234caa2c87891cdd1b Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 28 Apr 2023 00:58:06 +0200
Subject: [PATCH] modules: update openwrt

3960c220da OpenWrt v22.03.5: revert to branch defaults
863f769b75 OpenWrt v22.03.5: adjust config defaults
5f15225c1e ramips: reduce Archer AX23 / MR70X SPI-frequency
c1ccae54ce ccache: update to 4.6.3
80653f0c07 tools/ccache: update to 4.6.2
eeff8b3be1 tools/ccache: update to 4.6.1
31b1366bc6 ramips: fix lzma-loader for buffalo_WSR_600DHP
bf81a92171 ath79: create Aruba AP-105 APBoot compatible image
b6cbab1ad7 openssl: fix CVE-2023-464 and CVE-2023-465
---
 modules                                          |  2 +-
 ...621-make-DSA-images-swconfig-upgradable.patch | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules b/modules
index 360bc88a..455b933e 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-22.03
-OPENWRT_COMMIT=074db5793641b197892f210d60223f17340d9e6f
+OPENWRT_COMMIT=3960c220daabe5b58381af1a8c7b9dd2e6b7e815
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
index d8f341ed..6b110bce 100644
--- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
+++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
@@ -3,7 +3,7 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
 Subject: ramips-mt7621: make DSA images swconfig upgradable
 
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a16dce7fb 100644
+index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f00cb6da84 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
 @@ -180,7 +180,6 @@ endef
@@ -14,7 +14,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    DEVICE_VENDOR := ASUS
    DEVICE_MODEL := RT-AC57U
    DEVICE_ALT0_VENDOR := ASUS
-@@ -451,7 +450,6 @@ endef
+@@ -452,7 +451,6 @@ endef
  TARGET_DEVICES += dlink_dir-853-r1
  
  define Device/dlink_dir-860l-b1
@@ -22,7 +22,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/seama-lzma-loader)
    SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
    IMAGE_SIZE := 16064k
-@@ -1271,7 +1269,6 @@ endef
+@@ -1272,7 +1270,6 @@ endef
  TARGET_DEVICES += mts_wg430223
  
  define Device/netgear_ex6150
@@ -30,7 +30,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/uimage-lzma-loader)
    DEVICE_VENDOR := NETGEAR
    DEVICE_MODEL := EX6150
-@@ -1284,7 +1281,6 @@ endef
+@@ -1285,7 +1282,6 @@ endef
  TARGET_DEVICES += netgear_ex6150
  
  define Device/netgear_sercomm_nand
@@ -38,7 +38,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/uimage-lzma-loader)
    BLOCKSIZE := 128k
    PAGESIZE := 2048
-@@ -1467,7 +1463,6 @@ endef
+@@ -1468,7 +1464,6 @@ endef
  TARGET_DEVICES += netgear_wax202
  
  define Device/netgear_wndr3700-v5
@@ -46,7 +46,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/netgear_sercomm_nor)
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 15232k
-@@ -1804,7 +1799,6 @@ endef
+@@ -1805,7 +1800,6 @@ endef
  TARGET_DEVICES += tplink_tl-wpa8631p-v3
  
  define Device/ubnt_edgerouter_common
@@ -54,7 +54,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/uimage-lzma-loader)
    DEVICE_VENDOR := Ubiquiti
    IMAGE_SIZE := 256768k
-@@ -2220,7 +2214,6 @@ endef
+@@ -2221,7 +2215,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg2626
  
  define Device/zbtlink_zbt-wg3526-16m
@@ -62,7 +62,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..540a52dd87dd5aba48886e68a78d9e3a
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 16064k
    DEVICE_VENDOR := Zbtlink
-@@ -2233,7 +2226,6 @@ endef
+@@ -2234,7 +2227,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg3526-16m
  
  define Device/zbtlink_zbt-wg3526-32m