Merge branch 'fixup/news' into hbl

NEWS

@@ -19,9 +19,10 @@
   • easycwmp: Improve integration - fix Wi-Fi information and serial number/software version getters
   • easybird: Support for simple Bird configuration in LuCI
   • knot-resolver6: Preview of Knot Resolver 6 available for testing
+  • morce: Aggregated notifications and ignore list
 
 📌 Updates
-  • kernel: Updated to version 5.15.139
+  • kernel: Updated to version 5.15.146
 
 🐛 Bug Fixes
   • modem-manager-autosetup: Detect and don't break 3G setups

patches/openwrt/hack/0022-uboot-tools-allow-fw_env.config-init-not-just-on-pac.patch

@@ -29,14 +29,14 @@ index 8bbe1eb991..159238ff0a 100644
 -		$(INSTALL_DATA) ./files/$(BOARD)_$(SUBTARGET) \
 -		$(1)/etc/uci-defaults/30_uboot-envtools, \
 +		$(INSTALL_BIN) ./files/$(BOARD)_$(SUBTARGET) \
-+		$(1)/usr/bin/fw_env-config-init.sh &&
-+		echo '#!/bin/sh\nexec /usr/bin/fw_env-config-init.sh' \
++		$(1)/usr/bin/fw_env-config-init.sh && \
++		printf '#!/bin/sh\nexec /usr/bin/fw_env-config-init.sh' \
 +		>$(1)/etc/uci-defaults/30_uboot-envtools, \
  		$(if $(wildcard ./files/$(BOARD)), \
 -			$(INSTALL_DATA) ./files/$(BOARD) \
 -			$(1)/etc/uci-defaults/30_uboot-envtools \
 +			$(INSTALL_BIN) ./files/$(BOARD) $(1)/usr/bin/fw_env-config-init.sh && \
-+			echo '#!/bin/sh\nexec /usr/bin/fw_env-config-init.sh' \
++			printf '#!/bin/sh\nexec /usr/bin/fw_env-config-init.sh' \
 +			        >$(1)/etc/uci-defaults/30_uboot-envtools \
  		) \
  	)

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 = .142
-+LINUX_KERNEL_HASH-5.15.142 = 8d76c95277dc5ab0a6cd0069432af2ceb759d0ac2b6f5401330d390196095676
++LINUX_VERSION-5.15 = .146
++LINUX_KERNEL_HASH-5.15.146 = 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192
 -- 
 2.40.1
 

patches/packages/to-upstream/0012-packages-openssh-bump-to-version-9.6p1.patch

+From 978b09abccb936d3ddb958b364506470c01b5561 Mon Sep 17 00:00:00 2001
+From: Tomas Zak <tomas.zak@turris.com>
+Date: Fri, 22 Dec 2023 10:08:29 +0100
+Subject: [PATCH] packages: openssh: bump to version 9.6p1
+
+Bump openssh package to new version 9.6p1 from 8.4p1.
+More info: https://www.openssh.com/releasenotes.html
+---
+ net/openssh/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/net/openssh/Makefile b/net/openssh/Makefile
+index a9aa8b85e..7e2221685 100644
+--- a/net/openssh/Makefile
++++ b/net/openssh/Makefile
+@@ -8,13 +8,13 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=openssh
+-PKG_VERSION:=9.3p2
+-PKG_RELEASE:=1
++PKG_VERSION:=9.6p1
++PKG_RELEASE:=$(AUTORELEASE)
+ 
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+ PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
+ 		https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
+-PKG_HASH:=200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8
++PKG_HASH:=910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
+ 
+ PKG_LICENSE:=BSD ISC
+ PKG_LICENSE_FILES:=LICENCE
+-- 
+2.43.0

patches/turrispackages/to-upstream/0003-turris-netboot-update-busybox-version-to-1.35.0.patch

@@ -19,9 +19,7 @@ diff --git a/utils/turris-netboot/Makefile b/utils/turris-netboot/Makefile
 index 8f5e02249..b81ce95ee 100644
 --- a/utils/turris-netboot/Makefile
 +++ b/utils/turris-netboot/Makefile
-@@ -16,11 +16,11 @@ PKG_SOURCE_VERSION:=v$(PKG_VERSION)
- PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/turris-netboot.git
- PKG_MIRROR_HASH:=6eae57a9b30157d004dd40a0e290885e00f7fef6fcb1c427aff7d49ac728b888
+@@ -16,9 +16,9 @@ PKG_SOURCE_VERSION:=v$(PKG_VERSION)
  
 -BB_VERSION:=1.29.3
 +BB_VERSION:=1.35.0