Merge branch 'hotfix/kernel-update' into hbl

NEWS

@@ -23,11 +23,13 @@
 
 📌 Updates
   • kernel: Updated to version 5.15.146
+  • openssh: Updated to version 9.6p1
 
 🐛 Bug Fixes
   • modem-manager-autosetup: Detect and don't break 3G setups
   • mwan3: Enable configuration by default
   • foris-controller-openvpn: Fix configuration when when router is both VPN server and client
+  • turris-netboot: various fixes and more debugging options
 
 6.4.4
 -----

patches/openwrt/wip/0003-include-kernels-add-dedicated-files-for-versions-5.1.patch

@@ -16,8 +16,8 @@ index 0000000000..4c18bc35c2
 --- /dev/null
 +++ b/include/kernel-5.15
 @@ -0,0 +1,2 @@
-+LINUX_VERSION-5.15 = .146
-+LINUX_KERNEL_HASH-5.15.146 = 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192
++LINUX_VERSION-5.15 = .147
++LINUX_KERNEL_HASH-5.15.147 = 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4
 -- 
 2.40.1
 

patches/packages/pending/0003-packages-openvpn-hotfix-for-openvpn-client-s-side.patch

+From 2ab16ca528b72add92227140e5b6e84b7e83aeb8 Mon Sep 17 00:00:00 2001
+From: Tomas Zak <tomas.zak@turris.com>
+Date: Thu, 25 Jan 2024 11:32:22 +0100
+Subject: [PATCH] packages: openvpn: hotfix for openvpn client's side
+
+Hotfix openvpn for client's side, wrong path of configuration file were
+provided.
+This fixing commit: 4f7e6ba76544895a63bd7b9074ecf6fad8b16d74
+---
+ net/openvpn/files/openvpn.init | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
+index c59406960..caa4d6c02 100644
+--- a/net/openvpn/files/openvpn.init
++++ b/net/openvpn/files/openvpn.init
+@@ -139,11 +139,11 @@ openvpn_get_credentials() {
+ openvpn_add_instance() {
+ 	local name="$1"
+ 	local dir="$2"
+-	local conf=$(basename "$3")
++	local conf="$3"
+ 	local security="$4"
+ 	local up="$5"
+ 	local down="$6"
+-	local client=$(grep -qEx "client|tls-client" "$dir/$conf" && echo 1)
++	local client=$(grep -qEx "client|tls-client" "$conf" && echo 1)
+ 
+ 	procd_open_instance "$name"
+ 	procd_set_param command "$PROG"	\
+-- 
+2.43.0
+