update to v23.05.2

aarnaud · Dec 11, 2023 · b787807 · b787807
1 parent d1afb73
commit b787807
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 46 deletions.
diff --git a/configs/gl-mt1300.config b/configs/gl-mt1300.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -126,7 +123,7 @@ CONFIG_PACKAGE_vim=y
 CONFIG_PACKAGE_vpnc-scripts=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 # CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
@@ -139,6 +136,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/configs/lamobo_R1.config b/configs/lamobo_R1.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -126,7 +123,7 @@ CONFIG_PACKAGE_vim=y
 CONFIG_PACKAGE_vpnc-scripts=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 # CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
@@ -139,6 +136,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/configs/linksys-wrt1200ac.config b/configs/linksys-wrt1200ac.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -126,7 +123,7 @@ CONFIG_PACKAGE_vim=y
 CONFIG_PACKAGE_vpnc-scripts=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 # CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
@@ -139,6 +136,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/configs/linksys-wrt1900ac.config b/configs/linksys-wrt1900ac.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -126,7 +123,7 @@ CONFIG_PACKAGE_vim=y
 CONFIG_PACKAGE_vpnc-scripts=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 # CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
@@ -139,6 +136,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/configs/ubnt-erx.config b/configs/ubnt-erx.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_PACKAGE_blkid=y
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_conntrack=y
@@ -73,7 +70,6 @@ CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-multiwan=y
-CONFIG_PACKAGE_luci-app-openvpn=y
 CONFIG_PACKAGE_luci-app-qos=y
 CONFIG_PACKAGE_luci-app-wireguard=y
 CONFIG_PACKAGE_luci-base=y
@@ -92,7 +88,6 @@ CONFIG_PACKAGE_ncdu=y
 CONFIG_PACKAGE_openconnect=y
 CONFIG_PACKAGE_openssh-client=y
 CONFIG_PACKAGE_openssh-keygen=y
-CONFIG_PACKAGE_openvpn-openssl=y
 CONFIG_PACKAGE_python3-base=y
 CONFIG_PACKAGE_python3-codecs=y
 CONFIG_PACKAGE_python3-distutils=y
@@ -127,6 +122,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/configs/unifiac.config b/configs/unifiac.config
@@ -46,7 +46,7 @@ CONFIG_PACKAGE_rpcd-mod-luci=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_BUG_URL=""
@@ -59,6 +59,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_COLLECT_KERNEL_DEBUG is not set
diff --git a/configs/x86.config b/configs/x86.config
@@ -6,15 +6,12 @@ CONFIG_LIBCURL_COOKIES=y
 CONFIG_LIBCURL_FILE=y
 CONFIG_LIBCURL_FTP=y
 CONFIG_LIBCURL_HTTP=y
-CONFIG_LIBCURL_WOLFSSL=y
+CONFIG_LIBCURL_MBEDTLS=y
 CONFIG_LIBCURL_NO_SMB="!"
 CONFIG_LIBCURL_NGHTTP2=y
 CONFIG_LIBCURL_PROXY=y
-CONFIG_OPENCONNECT_OPENSSL=y
+CONFIG_OPENCONNECT_GNUTLS=y
 CONFIG_OPENCONNECT_STOKEN=y
-CONFIG_OPENSSL_ENGINE_CRYPTO=y
-CONFIG_OPENSSL_ENGINE_DIGEST=y
-CONFIG_OPENSSL_HARDWARE_SUPPORT=y
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -126,7 +123,7 @@ CONFIG_PACKAGE_vim=y
 CONFIG_PACKAGE_vpnc-scripts=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wpad-mesh-wolfssl=y
+CONFIG_PACKAGE_wpad-mesh-mbedtls=y
 # CONFIG_PER_FEED_REPO_ADD_COMMENTED is not set
 CONFIG_SDK=y
 CONFIG_VERSIONOPT=y
@@ -139,6 +136,6 @@ CONFIG_VERSION_MANUFACTURER=""
 CONFIG_VERSION_MANUFACTURER_URL=""
 CONFIG_VERSION_NUMBER=""
 CONFIG_VERSION_PRODUCT=""
-CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/22.03.6"
+CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"
 CONFIG_VERSION_SUPPORT_URL=""
 # CONFIG_IB_STANDALONE is not set
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 TARGET=$1
-OPENWRT_VERSION="v22.03.6"
+OPENWRT_VERSION="v23.05.2"
 
 
 SCRIPTS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )