php 8.4 as module helpers

5 files changed, 145 insertions, 15 deletions

diff --git a/buildfct b/buildfct
index f71e669..44366e4 100644
--- a/buildfct
+++ b/buildfct
@@ -11,6 +11,7 @@ alias mockfc39x80="              mock --configdir=$mocketc -r fc39x80
 alias mockfc39x81="              mock --configdir=$mocketc -r fc39x81             rebuild "
 alias mockfc39x82="              mock --configdir=$mocketc -r fc39x82             rebuild "
 alias mockfc39x83="              mock --configdir=$mocketc -r fc39x83             rebuild "
+alias mockfc39x84="              mock --configdir=$mocketc -r fc39x84             rebuild "
 alias mockfc39xscl74="           mock --configdir=$mocketc -r fc39xscl74          rebuild "
 alias mockfc39xscl80="           mock --configdir=$mocketc -r fc39xscl80          rebuild "
 alias mockfc39xscl81="           mock --configdir=$mocketc -r fc39xscl81          rebuild "
@@ -29,6 +30,7 @@ alias mockfc40x80="              mock --configdir=$mocketc -r fc40x80
 alias mockfc40x81="              mock --configdir=$mocketc -r fc40x81             rebuild "
 alias mockfc40x82="              mock --configdir=$mocketc -r fc40x82             rebuild "
 alias mockfc40x83="              mock --configdir=$mocketc -r fc40x83             rebuild "
+alias mockfc40x84="              mock --configdir=$mocketc -r fc40x84             rebuild "
 alias mockfc40xscl74="           mock --configdir=$mocketc -r fc40xscl74          rebuild "
 alias mockfc40xscl80="           mock --configdir=$mocketc -r fc40xscl80          rebuild "
 alias mockfc40xscl81="           mock --configdir=$mocketc -r fc40xscl81          rebuild "
@@ -47,6 +49,7 @@ alias mockfc41x80="              mock --configdir=$mocketc -r fc41x80
 alias mockfc41x81="              mock --configdir=$mocketc -r fc41x81             rebuild "
 alias mockfc41x82="              mock --configdir=$mocketc -r fc41x82             rebuild "
 alias mockfc41x83="              mock --configdir=$mocketc -r fc41x83             rebuild "
+alias mockfc41x84="              mock --configdir=$mocketc -r fc41x84             rebuild "
 alias mockfc41xscl74="           mock --configdir=$mocketc -r fc41xscl74          rebuild "
 alias mockfc41xscl80="           mock --configdir=$mocketc -r fc41xscl80          rebuild "
 alias mockfc41xscl81="           mock --configdir=$mocketc -r fc41xscl81          rebuild "
@@ -66,6 +69,7 @@ alias mockel8n81="             mock --configdir=$mocketc -r el8n81             r
 alias mockel8x82="             mock --configdir=$mocketc -r el8x82             rebuild "
 alias mockel8n82="             mock --configdir=$mocketc -r el8n82             rebuild "
 alias mockel8x83="             mock --configdir=$mocketc -r el8x83             rebuild "
+alias mockel8x84="             mock --configdir=$mocketc -r el8x84             rebuild "
 alias mockel8xscl56="          mock --configdir=$mocketc -r el8xscl56          rebuild "
 alias mockel8xscl70="          mock --configdir=$mocketc -r el8xscl70          rebuild "
 alias mockel8xscl71="          mock --configdir=$mocketc -r el8xscl71          rebuild "
@@ -93,6 +97,7 @@ alias mockel9n81="             mock --configdir=$mocketc -r el9n81             r
 alias mockel9x82="             mock --configdir=$mocketc -r el9x82             rebuild "
 alias mockel9n82="             mock --configdir=$mocketc -r el9n82             rebuild "
 alias mockel9x83="             mock --configdir=$mocketc -r el9x83             rebuild "
+alias mockel9x84="             mock --configdir=$mocketc -r el9x84             rebuild "
 alias mockel9xscl74="          mock --configdir=$mocketc -r el9xscl74          rebuild "
 alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
 alias mockel9xscl81="          mock --configdir=$mocketc -r el9xscl81          rebuild "
@@ -480,6 +485,32 @@ else
 fi
 }
 
+# Build All distribution / version / 64bits for remi/remi-php84
+mock84x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  for i in 41 40 39
+  do
+    echo -n "$(date +%X) 84 fc$i "
+    mock $quiet --configdir=$mocketc -r fc${i}x84 rebuild "$@" && echo " Ok." || echo " Error !"
+  done
+  for i in 8 9
+  do
+    echo -n "$(date +%X) 84 el$i  "
+    mock $quiet --configdir=$mocketc -r el${i}x84 rebuild "$@"&& echo " Ok." || echo " Error !"
+  done
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/remi-php83
 mock83x()
 {
diff --git a/cleanoldrpm b/cleanoldrpm
index d4e257f..cf3a368 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -9,6 +9,9 @@ $dest = false;
 $multi = [
 	'php'				=> 3, 	// php/8.0
 	'php-pecl-protobuf'	=> 1, 	// php-pecl-protobuf/3
+	'php81-php-pecl-protobuf'	=> 1,
+	'php82-php-pecl-protobuf'	=> 1,
+	'php83-php-pecl-protobuf'	=> 1,
 	'njs'				=> 99,	// njs/0.8.2
 	'libnjs-devel'		=> 99,	// 
 	'redis'				=> 3,	// redis/6.2
diff --git a/getmock b/getmock
index 9d60cd1..09b4634 100755
--- a/getmock
+++ b/getmock
@@ -120,6 +120,16 @@ el??83)
 	fi
 	type=enterprise
 	;;
+el??84)
+	dep=${1:2:1}
+    if [ "$2" == "php84" -o "$2" == "test84" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php84
+	else	rep=${2}84
+	fi
+	type=enterprise
+	;;
 fc???74)
 	dep=${1:2:2}
     if [ "$2" == "php74" -o "$2" == "test74" ]
@@ -170,6 +180,16 @@ fc???83)
 	fi
 	type=fedora
 	;;
+fc???84)
+	dep=${1:2:2}
+    if [ "$2" == "php84" -o "$2" == "test84" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php84
+	else	rep=${2}84
+	fi
+	type=fedora
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -423,6 +443,8 @@ elif [ $1 = all74 ]; then
 		getOneMock fc39a74 $opt '*7.4*'
 		getOneMock fc40x74 $opt '*7.4*'
 		getOneMock fc40a74 $opt '*7.4*'
+		getOneMock fc41x74 $opt '*7.4*'
+		getOneMock fc41a74 $opt '*7.4*'
 		getOneMock el8x74  $opt '*7.4*'
 		getOneMock el8a74  $opt '*7.4*'
 		getOneMock el9x74  $opt '*7.4*'
@@ -435,6 +457,8 @@ elif [ $1 = all80 ]; then
 		getOneMock fc39a80 $opt '*8.0*'
 		getOneMock fc40x80 $opt '*8.0*'
 		getOneMock fc40a80 $opt '*8.0*'
+		getOneMock fc41x80 $opt '*8.0*'
+		getOneMock fc41a80 $opt '*8.0*'
 		getOneMock el8x80  $opt '*8.0*'
 		getOneMock el8a80  $opt '*8.0*'
 		getOneMock el9x80  $opt '*8.0*'
@@ -447,6 +471,8 @@ elif [ $1 = all81 ]; then
 		getOneMock fc39a81 $opt '*8.1*'
 		getOneMock fc40x81 $opt '*8.1*'
 		getOneMock fc40a81 $opt '*8.1*'
+		getOneMock fc41x81 $opt '*8.1*'
+		getOneMock fc41a81 $opt '*8.1*'
 		getOneMock el8x81  $opt '*8.1*'
 		getOneMock el8a81  $opt '*8.1*'
 		getOneMock el9x81  $opt '*8.1*'
@@ -459,6 +485,8 @@ elif [ $1 = all82 ]; then
 		getOneMock fc39a82 $opt '*8.2*'
 		getOneMock fc40x82 $opt '*8.2*'
 		getOneMock fc40a82 $opt '*8.2*'
+		getOneMock fc41x82 $opt '*8.2*'
+		getOneMock fc41a82 $opt '*8.2*'
 		getOneMock el8x82  $opt '*8.2*'
 		getOneMock el8a82  $opt '*8.2*'
 		getOneMock el9x82  $opt '*8.2*'
@@ -471,11 +499,27 @@ elif [ $1 = all83 ]; then
 		getOneMock fc39a83 $opt '*8.3*'
 		getOneMock fc40x83 $opt '*8.3*'
 		getOneMock fc40a83 $opt '*8.3*'
+		getOneMock fc41x83 $opt '*8.3*'
+		getOneMock fc41a83 $opt '*8.3*'
 		getOneMock el8x83  $opt '*8.3*'
 		getOneMock el8a83  $opt '*8.3*'
 		getOneMock el9x83  $opt '*8.3*'
 		getOneMock el9a83  $opt '*8.3*'
 
+elif [ $1 = all84 ]; then
+	[ $opt = remi ] && opt=php84
+	[ $opt = test ] && opt=test84
+		getOneMock fc39x84 $opt '*8.4*'
+		getOneMock fc39a84 $opt '*8.4*'
+		getOneMock fc40x84 $opt '*8.4*'
+		getOneMock fc40a84 $opt '*8.4*'
+		getOneMock fc41x84 $opt '*8.4*'
+		getOneMock fc41a84 $opt '*8.4*'
+		getOneMock el8x84  $opt '*8.4*'
+		getOneMock el8a84  $opt '*8.4*'
+		getOneMock el9x84  $opt '*8.4*'
+		getOneMock el9a84  $opt '*8.4*'
+
 elif [ $1 = allr60 ]; then
 	opt=redis60
 	getOneMock fc39x $opt '*6.0*'
@@ -524,6 +568,8 @@ elif [ $1 = allm ]; then
 	opt=remi
 	getOneMock el8x  $opt '*1.6*'
 	getOneMock el8a  $opt '*1.6*'
+	getOneMock fc41x $opt '*1.6*'
+	getOneMock fc41a $opt '*1.6*'
 	opt=memcached
 	getOneMock fc39x $opt '*1.6*'
 	getOneMock fc39a $opt '*1.6*'
@@ -533,7 +579,7 @@ elif [ $1 = allm ]; then
 	getOneMock el9a  $opt '*1.6*'
 
 elif [ $1 = allx ]; then
-	for i in 39 40
+	for i in 39 40 41
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -543,7 +589,7 @@ elif [ $1 = allx ]; then
 	done
 
 elif [ $1 = alla ]; then
-	for i in 39 40
+	for i in 39 40 41
 	do
 		getOneMock fc${i}a $opt
 	done
diff --git a/mkmodular b/mkmodular
index 981ca5d..6a4005a 100755
--- a/mkmodular
+++ b/mkmodular
@@ -399,7 +399,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/39/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/39/php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	$mod .= genModule('fedora/39/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
@@ -420,6 +421,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/39/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/39/debug-php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
@@ -439,6 +441,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/39/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/39/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/39/debug-modular-test/x86_64';
@@ -452,6 +455,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/39/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/39/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -467,7 +471,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/39/php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/39/php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	$mod .= genModule('fedora/39/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
@@ -488,6 +493,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f39', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/39/debug-php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/39/debug-php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/39/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
@@ -507,6 +513,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/39/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/39/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/39/debug-modular-test/aarch64';
@@ -520,6 +527,7 @@ if (in_array('f39', $_SERVER['argv']) || in_array('f39a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/39/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/39/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/39/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -535,7 +543,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/40/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/40/php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	$mod .= genModule('fedora/40/redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
@@ -556,6 +565,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/40/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/40/debug-php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-redis60/x86_64',$dest, '*.rpm', '6.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/debug-redis62/x86_64',$dest, '*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/debug-redis70/x86_64',$dest, '*.rpm', '7.0', 'x86_64', $deps, $template_redis);
@@ -575,6 +585,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/40/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/40/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/40/debug-modular-test/x86_64';
@@ -588,6 +599,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/40/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/40/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -603,7 +615,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/40/php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/40/php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	$mod .= genModule('fedora/40/redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
@@ -624,6 +637,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f40', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/40/debug-php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/40/debug-php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-redis60/aarch64',$dest, '*.rpm', '6.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/debug-redis62/aarch64',$dest, '*.rpm', '6.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/40/debug-redis70/aarch64',$dest, '*.rpm', '7.0', 'aarch64', $deps, $template_redis);
@@ -643,6 +657,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/40/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/40/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/40/debug-modular-test/aarch64';
@@ -656,6 +671,7 @@ if (in_array('f40', $_SERVER['argv']) || in_array('f40a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/40/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/40/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/40/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -671,7 +687,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/41/php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/41/php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular/x86_64';
@@ -685,6 +702,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/41/debug-php81/x86_64',  $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -699,6 +717,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/41/test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular-test/x86_64';
@@ -712,6 +731,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/41/debug-test81/x86_64', $dest, '*.rpm', '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -727,7 +747,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/41/php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('fedora/41/php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular/aarch64';
@@ -741,6 +762,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/41/debug-php81/aarch64',  $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
@@ -755,6 +777,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/41/test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular-test/aarch64';
@@ -768,6 +791,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/41/debug-test81/aarch64', $dest, '*.rpm', '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/41/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -785,6 +809,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i
 	$mod .= genModule('enterprise/8/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8', 'php' => ''];
 	$mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -803,6 +828,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i
 	$mod .= genModule('enterprise/8/debug-test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/debug-test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv'])
@@ -821,7 +847,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$mod .= genModule('enterprise/8/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('enterprise/8/php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
@@ -852,6 +879,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$mod .= genModule('enterprise/8/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/debug-php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
@@ -876,6 +904,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i
 	$mod .= genModule('enterprise/8/test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8', 'php' => ''];
 	$mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm',   '2', 'aarch64', $deps, $template_comp);
@@ -894,6 +923,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i
 	$mod .= genModule('enterprise/8/debug-test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/debug-test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv'])
@@ -912,7 +942,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$mod .= genModule('enterprise/8/php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
-	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('enterprise/8/php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', '7.2', ['remi-7.2', 'remi-7.3', 'remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -942,6 +973,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$mod .= genModule('enterprise/8/debug-php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/debug-php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/debug-php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -963,6 +995,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 
 	$deps = ['platform' => 'el9', 'php' => ''];
 	$mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -979,6 +1012,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/debug-test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/debug-test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -995,7 +1029,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
 	$mod .= genModule('enterprise/9/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('enterprise/9/php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 
 	$mod .= genModule('enterprise/9/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
@@ -1023,6 +1058,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/debug-php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
 
 	$mod .= genModule('enterprise/9/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
@@ -1047,7 +1083,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
 	$mod .= genModule('enterprise/9/php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3']);
+	$mod .= genModule('enterprise/9/php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1', 'remi-8.2', 'remi-8.3', 'remi-8.4']);
 
 //	$mod .= genModule('enterprise/9/redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -1075,6 +1112,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/debug-php81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/debug-php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 
 //	$mod .= genModule('enterprise/9/debug-redis50/aarch64', $dest, 'redis*.rpm', '5.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('enterprise/9/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -1098,6 +1136,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el9', 'php' => ''];
 	$mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -1114,6 +1153,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/9/debug-test81/aarch64',  $dest, '*.rpm',         '8.1', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/debug-test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/9/debug-test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
diff --git a/mockit b/mockit
index 9366631..a60ff6c 100755
--- a/mockit
+++ b/mockit
@@ -132,15 +132,15 @@ fi
 echo mockit $SRPM $DIST $MIN $MAX $@
 case $DIST in
 	fc39x|fc39a|fc40x|fc40a|fc41x|fc41a|el9x|el9a)
-		LST="82 81 74 80 83"
+		LST="82 81 74 80 83 84"
 		SCL="74 80 81 82 83 84"
 		;;
 	el8a)
-		LST="72 73 74 80 81 82 83"
+		LST="72 73 74 80 81 82 83 84"
 		SCL="72 73 74 80 81 82 83 84"
 		;;
 	el8x)
-		LST="72 73 74 80 81 82 83"
+		LST="72 73 74 80 81 82 83 84"
 		SCL="56 70 71 72 73 74 80 81 82 83 84"
 		;;
 	allx)
@@ -154,6 +154,16 @@ case $DIST in
 			echo Not supported for direct build
 		fi
 		;;
+	ztsx)
+		if [ $REDIS -ge 1 ]; then
+			for i in fc39x fc40x el8x el9x
+			do
+				[ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@
+			done
+		else
+			echo Not supported for direct build
+		fi
+		;;
 	*)
 		echo Unkown DIST $DIST
 		exit 1