Drop support for php8.0

etc/systemd/system/php8.0-fpm.service

@@ -1,16 +0,0 @@
-# This service is actually a systemd target,
-# but we are using a service since targets cannot be reloaded.
-
-[Unit]
-Description=The PHP 8.0 FastCGI Process Manager (multi instance master)
-Documentation=man:php-fpm8.0(8)
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-
-[Install]
-WantedBy=multi-user.target

etc/systemd/system/php8.0-fpm@.service

@@ -1,35 +0,0 @@
-[Unit]
-Description=The PHP 8.0 FastCGI Process Manager (instance %i)
-Documentation=man:php-fpm8.0(8)
-After=network.target
-PartOf=php8.0-fpm.service
-ReloadPropagatedFrom=php8.0-fpm.service
-
-[Service] 
-Type=notify
-PIDFile=/run/php/php8.0-fpm-%i.pid
-ExecStart=/usr/sbin/php-fpm8.0 --nodaemonize --fpm-config /etc/php/8.0/fpm/php-fpm-%i.conf
-ExecReload=/bin/kill -USR2 $MAINPID
-LimitNOFILE=100000
-TimeoutStartSec=300
-ProtectSystem=strict
-PrivateTmp=true
-NoNewPrivileges=true
-PrivateDevices=true
-ProtectKernelTunables=true
-ProtectKernelModules=true
-ProtectControlGroups=true
-LockPersonality=true
-SystemCallArchitectures=native
-ReadWritePaths=-/var/log/
-ReadWritePaths=-/var/run/
-ReadWritePaths=-/run/
-InaccessiblePaths=-/root/
-CPUQuota=100%
-MemoryHigh=25%
-MemoryMax=35%
-RuntimeDirectory=php
-RuntimeDirectoryPreserve=yes
-
-[Install]
-WantedBy=multi-user.target

etc/systemd/system/php8.0-fpm@default.service

@@ -1,39 +0,0 @@
-[Unit]
-Description=The PHP 8.0 FastCGI Process Manager
-Documentation=man:php-fpm8.0(8)
-After=network.target
-PartOf=php8.0-fpm.service
-ReloadPropagatedFrom=php8.0-fpm.service
-
-[Service] 
-Type=notify
-PIDFile=/run/php/php8.0-fpm.pid
-ExecStart=/usr/sbin/php-fpm8.0 --nodaemonize --fpm-config /etc/php/8.0/fpm/php-fpm.conf
-ExecReload=/bin/kill -USR2 $MAINPID
-LimitNOFILE=100000
-TimeoutStartSec=300
-ProtectSystem=strict
-PrivateTmp=true
-# sendmail requires it...
-#NoNewPrivileges=true
-PrivateDevices=true
-ProtectKernelTunables=true
-ProtectKernelModules=true
-ProtectControlGroups=true
-LockPersonality=true
-SystemCallArchitectures=native
-ReadWritePaths=-/var/log/
-ReadWritePaths=-/var/run/
-ReadWritePaths=-/run/
-ReadWritePaths=-/var/local/squirrelmail/
-ReadWritePaths=-/var/www/
-ReadWritePaths=-/var/spool/postfix/
-InaccessiblePaths=-/root/
-CPUQuota=100%
-MemoryHigh=25%
-MemoryMax=35%
-RuntimeDirectory=php
-RuntimeDirectoryPreserve=yes
-
-[Install]
-WantedBy=multi-user.target

install_binaries.sh

@@ -1451,40 +1451,6 @@ LIBS='-lgpg-error' CXXFLAGS='-O3 -mtune=native -march=native' CFLAGS='-O3 -mtune
 make -j $PROC_LIMIT install
 make distclean
 git reset --hard
-git checkout php-8.0.30
-cat <<EOF | git apply -
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 19e7a0d79e..4d159895ac 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -56,6 +56,10 @@
- #include <openssl/ssl.h>
- #include <openssl/pkcs12.h>
- #include <openssl/cms.h>
-+#if PHP_OPENSSL_API_VERSION >= 0x30000
-+#include <openssl/core_names.h>
-+#include <openssl/param_build.h>
-+#endif
- 
- /* Common */
- #include <time.h>
-@@ -1221,7 +1225,9 @@ PHP_MINIT_FUNCTION(openssl)
- 	REGISTER_LONG_CONSTANT("OPENSSL_CMS_NOSIGS", CMS_NOSIGS, CONST_CS|CONST_PERSISTENT);
- 
- 	REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
-+#ifdef RSA_SSLV23_PADDING
- 	REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
-+#endif
- 	REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
- 
-EOF
-
-./buildconf -f
-LIBS='-lgpg-error' CXXFLAGS='-O3 -mtune=native -march=native' CFLAGS='-O3 -mtune=native -march=native' ./configure -C --enable-re2c-cgoto --prefix=/usr --with-config-file-scan-dir=/etc/php/8.0/fpm/conf.d --libdir=/usr/lib/php --libexecdir=/usr/lib/php --datadir=/usr/share/php/8.0 --program-suffix=8.0 --sysconfdir=/etc --localstatedir=/var --mandir=/usr/share/man --enable-fpm --enable-cli --disable-cgi --disable-phpdbg --with-fpm-systemd --with-fpm-user=www-data --with-fpm-group=www-data --with-layout=GNU --disable-dtrace --disable-short-tags --without-valgrind --disable-shared --disable-debug --disable-rpath --without-pear --with-openssl --enable-bcmath --with-bz2 --enable-calendar --with-curl --enable-dba --with-qdbm --with-lmdb --enable-exif --enable-ftp --enable-gd --with-external-gd --with-jpeg --with-webp --with-xpm --with-freetype --enable-gd-jis-conv --with-gettext --with-gmp --with-mhash --with-imap --with-imap-ssl --with-kerberos --enable-intl --with-ldap --with-ldap-sasl --enable-mbstring --with-mysqli --with-pdo-mysql --enable-mysqlnd --with-mysql-sock=/var/run/mysqld/mysqld.sock --with-zlib --with-libedit --with-readline --enable-shmop --enable-soap --enable-sockets --with-sodium --with-password-argon2 --with-tidy --with-xsl --with-enchant --with-pspell --with-zip --with-ffi --enable-apcu --enable-brotli --with-libbrotli --with-imagick --with-ssh2 --with-gnupg --enable-rar --enable-igbinary --with-msgpack --enable-sysvsem --enable-sysvmsg --enable-sysvshm
-make -j $PROC_LIMIT install
-make distclean
-git reset --hard
 ln -fs /usr/bin/php8.2 /usr/bin/php
 cd ..
 ldconfig

var/www/common.php

@@ -27,7 +27,7 @@ const ENABLE_SHELL_ACCESS=true; //allows users to login via ssh, when disabled o
 const ADMIN_PASSWORD='MY_PASSWORD'; //password for admin interface
 const SERVICE_INSTANCES=['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's']; //one character per instance - run multiple tor+php-fpm instances for load balancing, remove all but one instance if you expect less than 200 accounts. If tor starts using 100% cpu and failing circuits every few hours after a restart, add more instances. In my experience this happens around 250 hidden services per instance - run setup.php after change
 const DISABLED_PHP_VERSIONS=[]; //php versions still installed on the system but no longer offered for new accounts
-const PHP_VERSIONS=[6 => '8.0', 7 => '8.1', 8 => '8.2']; //currently active php versions
+const PHP_VERSIONS=[7 => '8.1', 8 => '8.2']; //currently active php versions
 const DEFAULT_PHP_VERSION='8.2'; //default php version
 const PHP_CONFIG='zend_extension=opcache.so
 memory_limit = 256M

var/www/setup_chroot.sh

@@ -147,7 +147,6 @@ BINARIES_GENERAL=(
     'od'
     'openssl'
     'paste'
-    'php8.0'
     'php8.1'
     'php8.2'
     'pr'