Merge branch 'next' into temp-c170-development

config/cfgroot/manualpages

@@ -27,7 +27,6 @@ netovpnrw.cgi=configuration/status/network_ovpnrw
 #netovpnsrv.cgi=
 wio.cgi=addons/wio
 hardwaregraphs.cgi=configuration/status/hardware_diagrams
-entropy.cgi=configuration/status/entropy
 connections.cgi=configuration/status/connections
 traffic.cgi=configuration/status/nettraffic
 #mdstat.cgi=

config/etc/sysctl.conf

@@ -109,5 +109,5 @@ kernel.core_uses_pid = 1
 # Block non-uid-0 profiling
 kernel.perf_event_paranoid = 3
 
-# Deny any ptrace use as there is no legitimate use-case for it on IPFire
-kernel.yama.ptrace_scope = 3
+# Only processes with CAP_SYS_PTRACE may use ptrace
+kernel.yama.ptrace_scope = 2

config/menu/20-status.menu

@@ -58,12 +58,6 @@
 				'title' => "$Lang::tr{'hardware graphs'}",
 				'enabled' => 1,
 			  };
-    $substatus->{'61.entropy'} = {
-				'caption' => "$Lang::tr{'entropy'}",
-				'uri' => '/cgi-bin/entropy.cgi',
-				'title' => "$Lang::tr{'entropy graphs'}",
-				'enabled' => 1,
-			  };
     $substatus->{'71.connections'} = {
 				'caption' => $Lang::tr{'connections'},
 				'uri' => '/cgi-bin/connections.cgi',

config/rootfiles/common/aarch64/initscripts

@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -187,7 +186,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig

config/rootfiles/common/aarch64/linux

@@ -7212,6 +7212,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K

config/rootfiles/common/armv6l/initscripts

@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -187,7 +186,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig

config/rootfiles/common/armv6l/linux

@@ -7664,6 +7664,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K

config/rootfiles/common/web-user-interface

@@ -15,7 +15,6 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/entropy.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi

config/rootfiles/common/x86_64/initscripts

@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -186,7 +185,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S74cloud-init

config/rootfiles/common/x86_64/linux

@@ -7124,6 +7124,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K

config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd

@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd

config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd

@@ -0,0 +1 @@
+../../../../common/armv6l/linux-initrd

config/rootfiles/oldcore/169/filelists/files

@@ -223,4 +223,5 @@ usr/sbin/setup
 var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/main/manualpages
+var/ipfire/menu.d/20-status.menu
 var/ipfire/suricata/ruleset-sources

config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd

@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd

config/rootfiles/oldcore/169/update.sh

@@ -88,6 +88,8 @@ rm -rvf \
 
 # Remove files
 rm -rvf \
+	/etc/rc.d/init.d/random \
+	/etc/rc.d/rcsysinit.d/S66random \
 	/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin \
 	/lib/firmware/intel/ice/ddp/ice-1.3.26.0.pkg \
 	/lib/firmware/iwlwifi-3160-10.ucode \
@@ -126,6 +128,7 @@ rm -rvf \
 	/lib/xtables/libip6t_REDIRECT.so \
 	/lib/xtables/libipt_DNAT.so \
 	/lib/xtables/libipt_REDIRECT.so \
+	/srv/web/ipfire/cgi-bin/entropy.cgi \
 	/usr/lib/libfuse3.so.3.10.4 \
 	/usr/lib/libunbound.so.8.1.14
 	/usr/lib/libxml2.so.2.9.12 \