From bc36b3ec63bfebcc45ebf9a4dd2f550726de8c1e Mon Sep 17 00:00:00 2001 From: Xavier Noguer Date: Tue, 19 Sep 2023 16:12:52 +0000 Subject: [PATCH 1/3] Avoiding warning because of hyphen. Due to changes in grep 3.8 --- include/tests_kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_kernel b/include/tests_kernel index bba8080f0..201d803e0 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -692,7 +692,7 @@ else # Match on items like /boot/vm5.3.7 or /boot/vmlinuz-5.3.7-1-default. Sort based on versions (-v) and then find the last item # Note: ignore a rescue kernel (e.g. CentOS) - FOUND_VMLINUZ=$(${LSBINARY} -v ${ROOTDIR}boot/vm[l0-9]* 2> /dev/null | ${GREPBINARY} -v '\-rescue\-' | ${TAILBINARY} -1) + FOUND_VMLINUZ=$(${LSBINARY} -v ${ROOTDIR}boot/vm[l0-9]* 2> /dev/null | ${GREPBINARY} -v '\-rescue-' | ${TAILBINARY} -1) LogText "Result: found ${FOUND_VMLINUZ}" fi From 04a73a9c19bfe5e707cb1f8aeb0ba8f6dbf9a6f7 Mon Sep 17 00:00:00 2001 From: Xavier Noguer Date: Tue, 19 Sep 2023 16:46:20 +0000 Subject: [PATCH 2/3] Reverting change from another PR --- include/tests_php | 65 +++-------------------------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/include/tests_php b/include/tests_php index beb1eca3f..b5f53d9a8 100644 --- a/include/tests_php +++ b/include/tests_php @@ -37,9 +37,6 @@ ${ROOTDIR}etc/php7.2/php.ini \ ${ROOTDIR}etc/php7.3/php.ini \ ${ROOTDIR}etc/php7.4/php.ini \ - ${ROOTDIR}etc/php8.0/php.ini \ - ${ROOTDIR}etc/php8.1/php.ini \ - ${ROOTDIR}etc/php8.2/php.ini \ ${ROOTDIR}etc/php/cgi-php5/php.ini \ ${ROOTDIR}etc/php/cli-php5/php.ini \ ${ROOTDIR}etc/php/apache2-php5/php.ini \ @@ -50,9 +47,6 @@ ${ROOTDIR}etc/php/apache2-php7.2/php.ini \ ${ROOTDIR}etc/php/apache2-php7.3/php.ini \ ${ROOTDIR}etc/php/apache2-php7.4/php.ini \ - ${ROOTDIR}etc/php/apache2-php8.0/php.ini \ - ${ROOTDIR}etc/php/apache2-php8.1/php.ini \ - ${ROOTDIR}etc/php/apache2-php8.2/php.ini \ ${ROOTDIR}etc/php/cgi-php5.5/php.ini \ ${ROOTDIR}etc/php/cgi-php5.6/php.ini \ ${ROOTDIR}etc/php/cgi-php7.0/php.ini \ @@ -60,9 +54,6 @@ ${ROOTDIR}etc/php/cgi-php7.2/php.ini \ ${ROOTDIR}etc/php/cgi-php7.3/php.ini \ ${ROOTDIR}etc/php/cgi-php7.4/php.ini \ - ${ROOTDIR}etc/php/cgi-php8.0/php.ini \ - ${ROOTDIR}etc/php/cgi-php8.1/php.ini \ - ${ROOTDIR}etc/php/cgi-php8.2/php.ini \ ${ROOTDIR}etc/php/cli-php5.5/php.ini \ ${ROOTDIR}etc/php/cli-php5.6/php.ini \ ${ROOTDIR}etc/php/cli-php7.0/php.ini \ @@ -70,9 +61,6 @@ ${ROOTDIR}etc/php/cli-php7.2/php.ini \ ${ROOTDIR}etc/php/cli-php7.3/php.ini \ ${ROOTDIR}etc/php/cli-php7.4/php.ini \ - ${ROOTDIR}etc/php/cli-php8.0/php.ini \ - ${ROOTDIR}etc/php/cli-php8.1/php.ini \ - ${ROOTDIR}etc/php/cli-php8.2/php.ini \ ${ROOTDIR}etc/php/embed-php5.5/php.ini \ ${ROOTDIR}etc/php/embed-php5.6/php.ini \ ${ROOTDIR}etc/php/embed-php7.0/php.ini \ @@ -80,12 +68,6 @@ ${ROOTDIR}etc/php/embed-php7.2/php.ini \ ${ROOTDIR}etc/php/embed-php7.3/php.ini \ ${ROOTDIR}etc/php/embed-php7.4/php.ini \ - ${ROOTDIR}etc/php/embed-php8.0/php.ini \ - ${ROOTDIR}etc/php/embed-php8.1/php.ini \ - ${ROOTDIR}etc/php/embed-php8.2/php.ini \ - ${ROOTDIR}etc/php/fpm-php8.2/php.ini \ - ${ROOTDIR}etc/php/fpm-php8.1/php.ini \ - ${ROOTDIR}etc/php/fpm-php8.0/php.ini \ ${ROOTDIR}etc/php/fpm-php7.4/php.ini \ ${ROOTDIR}etc/php/fpm-php7.3/php.ini \ ${ROOTDIR}etc/php/fpm-php7.2/php.ini \ @@ -106,9 +88,6 @@ ${ROOTDIR}etc/php/7.2/apache2/php.ini \ ${ROOTDIR}etc/php/7.3/apache2/php.ini \ ${ROOTDIR}etc/php/7.4/apache2/php.ini \ - ${ROOTDIR}etc/php/8.0/apache2/php.ini \ - ${ROOTDIR}etc/php/8.1/apache2/php.ini \ - ${ROOTDIR}etc/php/8.2/apache2/php.ini \ ${ROOTDIR}etc/php/7.0/cli/php.ini \ ${ROOTDIR}etc/php/7.0/fpm/php.ini \ ${ROOTDIR}etc/php/7.1/cli/php.ini \ @@ -119,12 +98,6 @@ ${ROOTDIR}etc/php/7.3/fpm/php.ini \ ${ROOTDIR}etc/php/7.4/cli/php.ini \ ${ROOTDIR}etc/php/7.4/fpm/php.ini \ - ${ROOTDIR}etc/php/8.0/cli/php.ini \ - ${ROOTDIR}etc/php/8.0/fpm/php.ini \ - ${ROOTDIR}etc/php/8.1/cli/php.ini \ - ${ROOTDIR}etc/php/8.1/fpm/php.ini \ - ${ROOTDIR}etc/php/8.2/cli/php.ini \ - ${ROOTDIR}etc/php/8.2/fpm/php.ini \ ${ROOTDIR}var/www/conf/php.ini \ ${ROOTDIR}usr/local/etc/php.ini \ ${ROOTDIR}usr/local/lib/php.ini \ @@ -136,9 +109,6 @@ ${ROOTDIR}usr/local/php72/lib/php.ini \ ${ROOTDIR}usr/local/php73/lib/php.ini \ ${ROOTDIR}usr/local/php74/lib/php.ini \ - ${ROOTDIR}usr/local/php80/lib/php.ini \ - ${ROOTDIR}usr/local/php81/lib/php.ini \ - ${ROOTDIR}usr/local/php82/lib/php.ini \ ${ROOTDIR}usr/local/zend/etc/php.ini \ ${ROOTDIR}usr/pkg/etc/php.ini \ ${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.ini \ @@ -164,18 +134,12 @@ ${ROOTDIR}opt/alt/php72/etc/php.ini \ ${ROOTDIR}opt/alt/php73/etc/php.ini \ ${ROOTDIR}opt/alt/php74/etc/php.ini \ - ${ROOTDIR}opt/alt/php80/etc/php.ini \ - ${ROOTDIR}opt/alt/php81/etc/php.ini \ - ${ROOTDIR}opt/alt/php82/etc/php.ini \ ${ROOTDIR}etc/opt/remi/php56/php.ini \ ${ROOTDIR}etc/opt/remi/php70/php.ini \ ${ROOTDIR}etc/opt/remi/php71/php.ini \ ${ROOTDIR}etc/opt/remi/php72/php.ini \ ${ROOTDIR}etc/opt/remi/php73/php.ini \ - ${ROOTDIR}etc/opt/remi/php74/php.ini \ - ${ROOTDIR}etc/opt/remi/php80/php.ini \ - ${ROOTDIR}etc/opt/remi/php81/php.ini \ - ${ROOTDIR}etc/opt/remi/php82/php.ini" + ${ROOTDIR}etc/opt/remi/php74/php.ini" # HEADS-UP: OpenBSD, last two releases are supported, and snapshots of -current PHPINILOCS="${PHPINILOCS} \ ${ROOTDIR}etc/php-5.6.ini \ @@ -183,10 +147,7 @@ ${ROOTDIR}etc/php-7.1.ini \ ${ROOTDIR}etc/php-7.2.ini \ ${ROOTDIR}etc/php-7.3.ini \ - ${ROOTDIR}etc/php-7.4.ini \ - ${ROOTDIR}etc/php-8.0.ini \ - ${ROOTDIR}etc/php-8.1.ini \ - ${ROOTDIR}etc/php-8.2.ini" + ${ROOTDIR}etc/php-7.4.ini" PHPINIDIRS="${ROOTDIR}etc/php5/conf.d \ ${ROOTDIR}etc/php/7.0/cli/conf.d \ @@ -194,17 +155,11 @@ ${ROOTDIR}etc/php/7.2/cli/conf.d \ ${ROOTDIR}etc/php/7.3/cli/conf.d \ ${ROOTDIR}etc/php/7.4/cli/conf.d \ - ${ROOTDIR}etc/php/8.0/cli/conf.d \ - ${ROOTDIR}etc/php/8.1/cli/conf.d \ - ${ROOTDIR}etc/php/8.2/cli/conf.d \ ${ROOTDIR}etc/php/7.0/fpm/conf.d \ ${ROOTDIR}etc/php/7.1/fpm/conf.d \ ${ROOTDIR}etc/php/7.2/fpm/conf.d \ ${ROOTDIR}etc/php/7.3/fpm/conf.d \ ${ROOTDIR}etc/php/7.4/fpm/conf.d \ - ${ROOTDIR}etc/php/8.0/fpm/conf.d \ - ${ROOTDIR}etc/php/8.1/fpm/conf.d \ - ${ROOTDIR}etc/php/8.2/fpm/conf.d \ ${ROOTDIR}etc/php.d \ ${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.d \ ${ROOTDIR}opt/cpanel/ea-php55/root/etc/php.d \ @@ -214,9 +169,6 @@ ${ROOTDIR}opt/cpanel/ea-php72/root/etc/php.d \ ${ROOTDIR}opt/cpanel/ea-php73/root/etc/php.d \ ${ROOTDIR}opt/cpanel/ea-php74/root/etc/php.d \ - ${ROOTDIR}opt/cpanel/ea-php80/root/etc/php.d \ - ${ROOTDIR}opt/cpanel/ea-php81/root/etc/php.d \ - ${ROOTDIR}opt/cpanel/ea-php82/root/etc/php.d \ ${ROOTDIR}opt/alt/php44/etc/php.d.all \ ${ROOTDIR}opt/alt/php51/etc/php.d.all \ ${ROOTDIR}opt/alt/php52/etc/php.d.all \ @@ -229,18 +181,12 @@ ${ROOTDIR}opt/alt/php72/etc/php.d.all \ ${ROOTDIR}opt/alt/php73/etc/php.d.all \ ${ROOTDIR}opt/alt/php74/etc/php.d.all \ - ${ROOTDIR}opt/alt/php80/etc/php.d.all \ - ${ROOTDIR}opt/alt/php81/etc/php.d.all \ - ${ROOTDIR}opt/alt/php82/etc/php.d.all \ ${ROOTDIR}usr/local/lib/php.conf.d \ ${ROOTDIR}usr/local/php70/lib/php.conf.d \ ${ROOTDIR}usr/local/php71/lib/php.conf.d \ ${ROOTDIR}usr/local/php72/lib/php.conf.d \ ${ROOTDIR}usr/local/php73/lib/php.conf.d \ - ${ROOTDIR}usr/local/php74/lib/php.conf.d \ - ${ROOTDIR}usr/local/php80/lib/php.conf.d \ - ${ROOTDIR}usr/local/php81/lib/php.conf.d \ - ${ROOTDIR}usr/local/php82/lib/php.conf.d" + ${ROOTDIR}usr/local/php74/lib/php.conf.d" # HEADS-UP: OpenBSD, last two releases are supported, and snapshots of -current PHPINIDIRS="${PHPINIDIRS} \ ${ROOTDIR}etc/php-5.6 \ @@ -248,10 +194,7 @@ ${ROOTDIR}etc/php-7.1 \ ${ROOTDIR}etc/php-7.2 \ ${ROOTDIR}etc/php-7.3 \ - ${ROOTDIR}etc/php-7.4 \ - ${ROOTDIR}etc/php-8.0 \ - ${ROOTDIR}etc/php-8.1 \ - ${ROOTDIR}etc/php-8.2" + ${ROOTDIR}etc/php-7.4" # ################################################################################# # From a5dbda51b9b44d9f2131271d8dfae0784fbf17c9 Mon Sep 17 00:00:00 2001 From: Xavier Noguer Date: Tue, 19 Sep 2023 16:47:23 +0000 Subject: [PATCH 3/3] Reverting change from another PR --- include/tests_php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/tests_php b/include/tests_php index b5f53d9a8..04502f686 100644 --- a/include/tests_php +++ b/include/tests_php @@ -119,9 +119,6 @@ ${ROOTDIR}opt/cpanel/ea-php72/root/etc/php.ini \ ${ROOTDIR}opt/cpanel/ea-php73/root/etc/php.ini \ ${ROOTDIR}opt/cpanel/ea-php74/root/etc/php.ini \ - ${ROOTDIR}opt/cpanel/ea-php80/root/etc/php.ini \ - ${ROOTDIR}opt/cpanel/ea-php81/root/etc/php.ini \ - ${ROOTDIR}opt/cpanel/ea-php82/root/etc/php.ini \ ${ROOTDIR}opt/alt/php44/etc/php.ini \ ${ROOTDIR}opt/alt/php51/etc/php.ini \ ${ROOTDIR}opt/alt/php52/etc/php.ini \