Merge Turris OS 6.1 into hbk

NEWS

+6.1.0
+-----
+
+💥 Breaking Changes
+  • Nextcloud now uses PHP 8
+  • PHP 8 doc_root changed to /srv/www
+
+🚀 New Features
+  • VLAN support for WAN interface in reForis
+  • Credentials (username, password) support in OpenVPN reForis client
+
+🐛 Bug Fixes
+  • Fixed missing PHP 8 performance tuning
+  • Fixed missing PHP 8 lighttpd config file
+  • Fixed automatic Nextcloud updates without user approval in the UI
+  • Fixed Turris Netboot to work with Turris OS 6
+  • Fixed Rainbow not saving brightness when set with the button
+  • Fixed builds of apr-util and subversion
+
+📌 Updates
+  • Linux kernel on Turris 1.X updated from 5.10 to 5.15
+  • Nextcloud updated to 23.0.11
+  • reForis updated to 1.4.1
+  • Foris Controller updated to 5.4.0
+  • Turris HW updated to 0.10.0
+  • reForis OpenVPN updated to 1.6.0
+  • Foris Controller openvpn_client module updated to 0.7.0
+
 6.0.4
 -----
 

patches/openwrt/wip/0000-mpc85xx-and-mvebu-switch-to-kernel-5.15.patch

@@ -17,7 +17,7 @@ index b1771dfd8e..35d08b12d1 100644
  SUBTARGETS:=p1010 p1020 p2020
  
 -KERNEL_PATCHVER:=5.4
-+KERNEL_PATCHVER:=5.10
++KERNEL_PATCHVER:=5.15
 +KERNEL_TESTING_PATCHVER:=5.15
  
  KERNELNAME:=zImage

patches/packages/branding/0009-php8-Tunning-of-default-options.patch

+From 3a98c2171eca9551cbd87d9bcc880ced1ec95a22 Mon Sep 17 00:00:00 2001
+From: Michal Hrusecky <michal.hrusecky@nic.cz>
+Date: Tue, 9 Apr 2019 14:09:07 +0200
+Subject: [PATCH 1/2] php8: Tunning of default options
+
+Make php more performant as we have good enough HW
+
+---
+ lang/php8/Makefile          | 1 +
+ lang/php8/files/opcache.ini | 8 ++++++++
+ lang/php8/files/php.ini     | 6 +++---
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+ create mode 100644 lang/php8/files/opcache.ini
+
+diff --git a/lang/php8/Makefile b/lang/php8/Makefile
+index 6a4cbfd8c..6ad19f7e1 100644
+--- a/lang/php8/Makefile
++++ b/lang/php8/Makefile
+@@ -600,6 +600,7 @@ define BuildModule
+ 	$(INSTALL_DIR) $$(1)/usr/lib/php8
+ 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php8/
+ 	$(INSTALL_DIR) $$(1)/etc/php8
++	[ \! -f ./files/$(subst -,_,$(1)).ini ] || cp ./files/$(subst -,_,$(1)).ini $$(1)/etc/php8/99_$(subst -,_,$(1)).ini
+       ifeq ($(5),zend)
+ 	echo "zend_extension=/usr/lib/php8/$(subst -,_,$(1)).so" > $$(1)/etc/php8/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
+       else
+diff --git a/lang/php8/files/opcache.ini b/lang/php8/files/opcache.ini
+new file mode 100644
+index 000000000..54ffc995b
+--- /dev/null
++++ b/lang/php8/files/opcache.ini
+@@ -0,0 +1,8 @@
++opcache.enable=1
++opcache.enable_cli=1
++opcache.interned_strings_buffer=16
++opcache.max_accelerated_files=10000
++opcache.memory_consumption=256
++opcache.save_comments=1
++opcache.revalidate_freq=1
++
+diff --git a/lang/php8/files/php.ini b/lang/php8/files/php.ini
+index 0254b4309..fc77e197d 100644
+--- a/lang/php8/files/php.ini
++++ b/lang/php8/files/php.ini
+@@ -47,7 +47,7 @@ max_execution_time = 30
+ max_input_time = 60
+ ;max_input_nesting_level = 64
+ ;max_input_vars = 1000
+-memory_limit = 8M
++memory_limit = 512M
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ; Error handling and logging ;
+@@ -97,7 +97,7 @@ default_mimetype = "text/html"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ;include_path = ".:/php/includes"
+-doc_root = "/www"
++doc_root = "/srv/www"
+ user_dir =
+ extension_dir = "/usr/lib/php8"
+ ;sys_temp_dir = "/tmp"
+@@ -118,7 +118,7 @@ cgi.fix_pathinfo = 1
+ 
+ file_uploads = On
+ upload_tmp_dir = "/tmp"
+-upload_max_filesize = 2M
++upload_max_filesize = 512M
+ max_file_uploads = 20
+ 
+ ;;;;;;;;;;;;;;;;;;
+-- 
+2.32.0
+

patches/packages/branding/0012-php8-Integrate-php-fpm-into-lighttpd.patch

+From 6e6747161b9d8b8827e9cfef516ffd13304fd805 Mon Sep 17 00:00:00 2001
+From: Michal Hrusecky <michal.hrusecky@nic.cz>
+Date: Tue, 9 Apr 2019 14:10:20 +0200
+Subject: [PATCH] php8: Integrate php-fpm into lighttpd
+
+We have lighttpd installed by default so making sure that installation of php
+enables php sites.
+---
+ lang/php8/Makefile               | 3 +++
+ lang/php8/files/php-fpm.lighttpd | 7 +++++++
+ 2 files changed, 10 insertions(+)
+ create mode 100644 lang/php8/files/php-fpm.lighttpd
+
+diff --git a/lang/php8/Makefile b/lang/php8/Makefile
+index 03e0b21a0d..3960c4e927 100644
+--- a/lang/php8/Makefile
++++ b/lang/php8/Makefile
+@@ -551,6 +551,9 @@ define Package/php8-fpm/install
+ 
+ 	$(INSTALL_DIR) $(1)/etc/init.d
+ 	$(INSTALL_BIN) ./files/php8-fpm.init $(1)/etc/init.d/php8-fpm
++
++	$(INSTALL_DIR) $(1)/etc/lighttpd/conf.d/
++	$(INSTALL_DATA) ./files/php-fpm.lighttpd $(1)/etc/lighttpd/conf.d/30-php-fpm.conf
+ endef
+ 
+ define Package/php8-fpm/conffiles
+diff --git a/lang/php8/files/php-fpm.lighttpd b/lang/php8/files/php-fpm.lighttpd
+new file mode 100644
+index 0000000000..7120346a13
+--- /dev/null
++++ b/lang/php8/files/php-fpm.lighttpd
+@@ -0,0 +1,7 @@
++fastcgi.server += ( ".php" =>
++        ((
++                "socket" => "/var/run/php8-fpm.sock",
++                "broken-scriptfilename" => "enable",
++                "fix-root-scriptname" => "enable"
++        ))
++)
+-- 
+2.38.1
+