From db369edce481e23555166f041f60f2972f7aa76f Mon Sep 17 00:00:00 2001
From: Daniel Winzen <daniel@danwin1210.me>
Date: Sun, 4 Apr 2021 13:20:35 +0200
Subject: [PATCH] Remove PHP 7.3 as active support ended and security support
 will end in a few months

---
 install_binaries.sh | 63 ---------------------------------------------
 var/www/common.php  |  4 +--
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/install_binaries.sh b/install_binaries.sh
index c816107..f3cb0c0 100755
--- a/install_binaries.sh
+++ b/install_binaries.sh
@@ -1417,69 +1417,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-7.3
-git pull
-cat <<EOF | git apply -
-From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
-Date: Mon, 22 Oct 2018 06:54:31 +0000
-Subject: Use pkg-config for FreeType2 detection
-
----
- ext/gd/config.m4 | 30 +++++++++++++++++++-----------
- 1 file changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index 498d870..d28c6ae 100644
---- a/ext/gd/config.m4
-+++ b/ext/gd/config.m4
-@@ -184,21 +184,29 @@ AC_DEFUN([PHP_GD_XPM],[
- AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "\$PHP_FREETYPE_DIR" != "no"; then
- 
--    for i in \$PHP_FREETYPE_DIR /usr/local /usr; do
--      if test -f "\$i/bin/freetype-config"; then
--        FREETYPE2_DIR=\$i
--        FREETYPE2_CONFIG="\$i/bin/freetype-config"
--        break
-+    if test -z "\$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi
-+    if test -x "\$PKG_CONFIG" && \$PKG_CONFIG --exists freetype2 ; then
-+      FREETYPE2_CFLAGS=\`\$PKG_CONFIG --cflags freetype2\`
-+      FREETYPE2_LIBS=\`\$PKG_CONFIG --libs freetype2\`
-+    else
-+      for i in \$PHP_FREETYPE_DIR /usr/local /usr; do
-+        if test -f "\$i/bin/freetype-config"; then
-+          FREETYPE2_DIR=\$i
-+          FREETYPE2_CONFIG="\$i/bin/freetype-config"
-+          break
-+        fi
-+      done
-+
-+      if test -z "\$FREETYPE2_DIR"; then
-+        AC_MSG_ERROR([freetype-config not found.])
-       fi
--    done
- 
--    if test -z "\$FREETYPE2_DIR"; then
--      AC_MSG_ERROR([freetype-config not found.])
-+      FREETYPE2_CFLAGS=\`\$FREETYPE2_CONFIG --cflags\`
-+      FREETYPE2_LIBS=\`\$FREETYPE2_CONFIG --libs\`
-     fi
- 
--    FREETYPE2_CFLAGS=\`\$FREETYPE2_CONFIG --cflags\`
--    FREETYPE2_LIBS=\`\$FREETYPE2_CONFIG --libs\`
--
-     PHP_EVAL_INCLINE(\$FREETYPE2_CFLAGS)
-     PHP_EVAL_LIBLINE(\$FREETYPE2_LIBS, GD_SHARED_LIBADD)
-     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
-EOF
-
-./buildconf
-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/7.3/fpm/conf.d --libdir=/usr/lib/php --libexecdir=/usr/lib/php --datadir=/usr/share/php/7.3 --program-suffix=7.3 --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 --with-gd=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --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 --enable-zip --enable-apcu --enable-brotli --with-libbrotli --with-imagick --with-ssh2 --with-pcre-regex --with-pcre-jit --with-gnupg --enable-rar --with-secp256k1
-make -j $PROC_LIMIT install
-make distclean
-git reset --hard
 ln -fs /usr/bin/php8.0 /usr/bin/php
 cd ..
 ldconfig
diff --git a/var/www/common.php b/var/www/common.php
index 6a8fb61..7201727 100644
--- a/var/www/common.php
+++ b/var/www/common.php
@@ -26,8 +26,8 @@ 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=[4 => '7.3', 5 => '7.4', 6 => '8.0']; //currently active php versions
-const DEFAULT_PHP_VERSION='7.4'; //default php version
+const PHP_VERSIONS=[5 => '7.4', 6 => '8.0']; //currently active php versions
+const DEFAULT_PHP_VERSION='8.0'; //default php version
 const PHP_CONFIG='zend_extension=opcache.so
 memory_limit = 256M
 error_reporting = E_ALL