Helpers for PHP 8.5 modulesHEADmaster

5 files changed, 128 insertions, 21 deletions

diff --git a/buildfct b/buildfct
index 022666e..092fd99 100644
--- a/buildfct
+++ b/buildfct
@@ -12,6 +12,7 @@ alias mockfc41x81="              mock --configdir=$mocketc -r fc41x81
 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 mockfc41x85="              mock --configdir=$mocketc -r fc41x85             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 "
@@ -30,6 +31,7 @@ alias mockfc42x81="              mock --configdir=$mocketc -r fc42x81
 alias mockfc42x82="              mock --configdir=$mocketc -r fc42x82             rebuild "
 alias mockfc42x83="              mock --configdir=$mocketc -r fc42x83             rebuild "
 alias mockfc42x84="              mock --configdir=$mocketc -r fc42x84             rebuild "
+alias mockfc42x85="              mock --configdir=$mocketc -r fc42x85             rebuild "
 alias mockfc42xscl74="           mock --configdir=$mocketc -r fc42xscl74          rebuild "
 alias mockfc42xscl80="           mock --configdir=$mocketc -r fc42xscl80          rebuild "
 alias mockfc42xscl81="           mock --configdir=$mocketc -r fc42xscl81          rebuild "
@@ -48,6 +50,7 @@ alias mockfc43x81="              mock --configdir=$mocketc -r fc43x81
 alias mockfc43x82="              mock --configdir=$mocketc -r fc43x82             rebuild "
 alias mockfc43x83="              mock --configdir=$mocketc -r fc43x83             rebuild "
 alias mockfc43x84="              mock --configdir=$mocketc -r fc43x84             rebuild "
+alias mockfc43x85="              mock --configdir=$mocketc -r fc43x85             rebuild "
 alias mockfc43xscl74="           mock --configdir=$mocketc -r fc43xscl74          rebuild "
 alias mockfc43xscl80="           mock --configdir=$mocketc -r fc43xscl80          rebuild "
 alias mockfc43xscl81="           mock --configdir=$mocketc -r fc43xscl81          rebuild "
@@ -72,6 +75,7 @@ alias mockel8x82="             mock --configdir=$mocketc -r el8x82             r
 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 mockel8x85="             mock --configdir=$mocketc -r el8x85             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 "
@@ -104,6 +108,7 @@ alias mockel9x82="             mock --configdir=$mocketc -r el9x82             r
 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 mockel9x85="             mock --configdir=$mocketc -r el9x85             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 "
@@ -130,6 +135,7 @@ alias mockel10x82="             mock --configdir=$mocketc -r el10x82
 alias mockel10n82="             mock --configdir=$mocketc -r el10n82             rebuild "
 alias mockel10x83="             mock --configdir=$mocketc -r el10x83             rebuild "
 alias mockel10x84="             mock --configdir=$mocketc -r el10x84             rebuild "
+alias mockel10x85="             mock --configdir=$mocketc -r el10x85             rebuild "
 alias mockel10xscl74="          mock --configdir=$mocketc -r el10xscl74          rebuild "
 alias mockel10xscl80="          mock --configdir=$mocketc -r el10xscl80          rebuild "
 alias mockel10xscl81="          mock --configdir=$mocketc -r el10xscl81          rebuild "
@@ -142,6 +148,7 @@ alias mockel10xr80="            mock --configdir=$mocketc -r el10xr80
 alias mockel10xr82="            mock --configdir=$mocketc -r el10xr82            rebuild "
 alias mockel10xv81="            mock --configdir=$mocketc -r el10xv81            rebuild "
 alias mockel10xm="              mock --configdir=$mocketc -r el10xm              rebuild "
+alias mockel10t84="             mock --configdir=$mocketc -r el10t84             rebuild "
 
 alias mockepel872="            mock --configdir=$mocketc -r epel872            rebuild "
 alias mockepel873="            mock --configdir=$mocketc -r epel873            rebuild "
diff --git a/getmock b/getmock
index 829392a..79ca0ce 100755
--- a/getmock
+++ b/getmock
@@ -193,6 +193,26 @@ el???84)
 	fi
 	type=enterprise
 	;;
+el??85)
+	dep=${1:2:1}
+    if [ "$2" == "php85" -o "$2" == "test85" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php85
+	else	rep=${2}85
+	fi
+	type=enterprise
+	;;
+el???85)
+	dep=${1:2:2}
+    if [ "$2" == "php85" -o "$2" == "test85" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php85
+	else	rep=${2}85
+	fi
+	type=enterprise
+	;;
 fc???74)
 	dep=${1:2:2}
     if [ "$2" == "php74" -o "$2" == "test74" ]
@@ -253,6 +273,16 @@ fc???84)
 	fi
 	type=fedora
 	;;
+fc???85)
+	dep=${1:2:2}
+    if [ "$2" == "php85" -o "$2" == "test85" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php85
+	else	rep=${2}85
+	fi
+	type=fedora
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -612,6 +642,22 @@ elif [ $1 = all84 ]; then
 		getOneMock el10x84 $opt '*8.4*'
 		getOneMock el10a84 $opt '*8.4*'
 
+elif [ $1 = all85 ]; then
+	[ $opt = remi ] && opt=php85
+	[ $opt = test ] && opt=test85
+		getOneMock fc43x85 $opt '*module_php.8.5*'
+		getOneMock fc43a85 $opt '*module_php.8.5*'
+		getOneMock fc42x85 $opt '*module_php.8.5*'
+		getOneMock fc42a85 $opt '*module_php.8.5*'
+		getOneMock fc41x85 $opt '*module_php.8.5*'
+		getOneMock fc41a85 $opt '*module_php.8.5*'
+		getOneMock el8x85  $opt '*module_php.8.5*'
+		getOneMock el8a85  $opt '*module_php.8.5*'
+		getOneMock el9x85  $opt '*module_php.8.5*'
+		getOneMock el9a85  $opt '*module_php.8.5*'
+		getOneMock el10x85 $opt '*module_php.8.5*'
+		getOneMock el10a85 $opt '*module_php.8.5*'
+
 elif [ $1 = allr60 ]; then
 	opt=redis60
 	getOneMock el8x  $opt '*6.0*'
@@ -804,7 +850,7 @@ elif [ $1 = scl72 ]; then
 
 elif [ $1 = allphp ]; then
 	LOG=$(mktemp out.XXXXXXXXXX)
-	MOD="all72 all73 all74 all80 all81 all82 all83 all84"
+	MOD="all72 all73 all74 all80 all81 all82 all83 all84 all85"
 	SCL="scl56 scl70 scl71 scl72 scl73 scl74 scl80 scl81 scl82 scl83 scl84 scl85"
 	for i in $SCL $MOD
 	do	$0 $opt $i | tee $LOG
diff --git a/mkmodular b/mkmodular
index b9f21fc..8d53267 100755
--- a/mkmodular
+++ b/mkmodular
@@ -448,7 +448,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$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 .= 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']);
+	$mod .= genModule('fedora/41/php85/x86_64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/41/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
@@ -470,6 +471,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$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);
+	$mod .= genModule('fedora/41/debug-php85/x86_64',  $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
@@ -488,6 +490,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('fedora/41/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular-test/x86_64';
@@ -502,6 +505,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41x', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('fedora/41/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -518,7 +522,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$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 .= 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']);
+	$mod .= genModule('fedora/41/php85/aarch64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/41/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
@@ -540,6 +545,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f41', $_SERVER['argv']) || in_array
 	$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);
+	$mod .= genModule('fedora/41/debug-php85/aarch64',  $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/41/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/41/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
@@ -558,6 +564,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('fedora/41/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/41/debug-modular-test/aarch64';
@@ -572,6 +579,7 @@ if (in_array('f41', $_SERVER['argv']) || in_array('f41a', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('fedora/41/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -589,7 +597,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/42/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/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/42/php85/x86_64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/42/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
@@ -611,6 +620,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/42/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/42/debug-php85/x86_64',  $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
@@ -629,6 +639,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/42/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/42/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/42/debug-modular-test/x86_64';
@@ -643,6 +654,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/42/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/42/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -659,7 +671,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/42/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/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/42/php85/aarch64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/42/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
@@ -681,6 +694,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/42/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/42/debug-php85/aarch64',  $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/42/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
@@ -699,6 +713,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/42/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/42/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/42/debug-modular-test/aarch64';
@@ -713,6 +728,7 @@ if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/42/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/42/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/42/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -730,7 +746,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/43/php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/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/43/php85/x86_64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/43/redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
@@ -752,6 +769,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/43/debug-php82/x86_64',  $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-php83/x86_64',  $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-php84/x86_64',  $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/43/debug-php85/x86_64',  $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-redis80/x86_64',$dest, '*.rpm', '8.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/debug-redis82/x86_64',$dest, '*.rpm', '8.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey);
@@ -770,6 +788,7 @@ if (in_array('f43', $_SERVER['argv']) || in_array('f43x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/43/test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/43/test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/43/debug-modular-test/x86_64';
@@ -784,6 +803,7 @@ if (in_array('f43', $_SERVER['argv']) || in_array('f43x', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/43/debug-test82/x86_64', $dest, '*.rpm', '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-test83/x86_64', $dest, '*.rpm', '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-test84/x86_64', $dest, '*.rpm', '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/43/debug-test85/x86_64', $dest, '*.rpm', '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -800,7 +820,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/43/php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/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/43/php85/aarch64',  $dest, '*.rpm', '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('fedora/43/redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
@@ -822,6 +843,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array
 	$mod .= genModule('fedora/43/debug-php82/aarch64',  $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-php83/aarch64',  $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-php84/aarch64',  $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/43/debug-php85/aarch64',  $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-redis80/aarch64',$dest, '*.rpm', '8.0', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/debug-redis82/aarch64',$dest, '*.rpm', '8.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('fedora/43/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey);
@@ -840,6 +862,7 @@ if (in_array('f43', $_SERVER['argv']) || in_array('f43a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/43/test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/43/test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 
 	$dest = 'fedora/43/debug-modular-test/aarch64';
@@ -854,6 +877,7 @@ if (in_array('f43', $_SERVER['argv']) || in_array('f43a', $_SERVER['argv']) || i
 	$mod .= genModule('fedora/43/debug-test82/aarch64', $dest, '*.rpm', '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-test83/aarch64', $dest, '*.rpm', '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('fedora/43/debug-test84/aarch64', $dest, '*.rpm', '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('fedora/43/debug-test85/aarch64', $dest, '*.rpm', '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -873,6 +897,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('enterprise/8/test85/x86_64',  $dest, '*.rpm',         '8.5', '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);
@@ -892,6 +917,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('enterprise/8/debug-test85/x86_64',  $dest, '*.rpm',         '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8x', $_SERVER['argv'])
@@ -911,7 +937,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$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 .= 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']);
+	$mod .= genModule('enterprise/8/php85/x86_64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
@@ -948,6 +975,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$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);
+	$mod .= genModule('enterprise/8/debug-php85/x86_64',  $dest, '*.rpm',         '8.5', '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);
@@ -976,6 +1004,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('enterprise/8/test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8', 'php' => ''];
 	$mod .= genModule('enterprise/8/composer2-test/x86_64', $dest, '*.rpm',   '2', 'aarch64', $deps, $template_comp);
@@ -995,6 +1024,7 @@ if (in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv']) || i
 	$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);
+	$mod .= genModule('enterprise/8/debug-test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array('el8a', $_SERVER['argv'])
@@ -1014,7 +1044,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$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 .= 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']);
+	$mod .= genModule('enterprise/8/php85/aarch64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -1050,6 +1081,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array
 	$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);
+	$mod .= genModule('enterprise/8/debug-php85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el8'];
 	$mod .= genModule('enterprise/8/debug-redis60/aarch64', $dest, 'redis*.rpm', '6.0', 'aarch64', $deps, $template_redis);
@@ -1075,6 +1107,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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);
+	$mod .= genModule('enterprise/9/test85/x86_64',  $dest, '*.rpm',         '8.5', '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);
@@ -1092,6 +1125,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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);
+	$mod .= genModule('enterprise/9/debug-test85/x86_64',  $dest, '*.rpm',         '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -1109,7 +1143,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
 	$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 .= 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/php85/x86_64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 	$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);
@@ -1143,6 +1178,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$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-php85/x86_64',  $dest, '*.rpm',         '8.5', '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);
@@ -1171,7 +1207,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])
 	$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 .= 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/php85/aarch64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 //	$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);
@@ -1205,6 +1242,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$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-php85/aarch64',  $dest, '*.rpm',         '8.5', '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);
@@ -1232,6 +1270,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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);
+	$mod .= genModule('enterprise/9/test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el9', 'php' => ''];
 	$mod .= genModule('enterprise/9/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -1249,6 +1288,7 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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);
+	$mod .= genModule('enterprise/9/debug-test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -1265,6 +1305,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test85/x86_64',  $dest, '*.rpm',         '8.5', 'x86_64', $deps, $template_php);
 
 	$deps = ['platform' => 'el10', 'php' => ''];
 	$mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -1282,6 +1323,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/debug-test82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-test83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-test84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test85/x86_64',  $dest, '*.rpm',         '8.5', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
@@ -1299,7 +1341,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
 	$mod .= genModule('enterprise/10/php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/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/10/php85/x86_64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('enterprise/10/redis72/x86_64', $dest, 'redis*.rpm',   '7.2', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/10/redis80/x86_64', $dest, 'redis*.rpm',   '8.0', 'x86_64', $deps, $template_redis);
@@ -1329,6 +1372,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/debug-php82/x86_64',  $dest, '*.rpm',         '8.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-php83/x86_64',  $dest, '*.rpm',         '8.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-php84/x86_64',  $dest, '*.rpm',         '8.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php85/x86_64',  $dest, '*.rpm',         '8.5', 'x86_64', $deps, $template_php);
 
 	$mod .= genModule('enterprise/10/debug-redis50/x86_64', $dest, 'redis*.rpm', '5.0', 'x86_64', $deps, $template_redis);
 	$mod .= genModule('enterprise/10/debug-redis60/x86_64', $dest, 'redis*.rpm', '6.0', 'x86_64', $deps, $template_redis);
@@ -1358,7 +1402,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])
 	$mod .= genModule('enterprise/10/php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/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/10/php85/aarch64',  $dest, '*.rpm',         '8.5', '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', 'remi-8.5']);
 
 	$mod .= genModule('enterprise/10/redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('enterprise/10/redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
@@ -1388,6 +1433,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/debug-php82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-php83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-php84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-php85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 
 	$mod .= genModule('enterprise/10/debug-redis72/aarch64', $dest, 'redis*.rpm', '7.2', 'aarch64', $deps, $template_redis);
 	$mod .= genModule('enterprise/10/debug-redis80/aarch64', $dest, 'redis*.rpm', '8.0', 'aarch64', $deps, $template_redis);
@@ -1411,6 +1457,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 
 	$deps = ['platform' => 'el10', 'php' => ''];
 	$mod .= genModule('enterprise/10/composer2-test/x86_64', $dest, '*.rpm',   '2', 'x86_64', $deps, $template_comp);
@@ -1428,6 +1475,7 @@ if (in_array('el10', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('enterprise/10/debug-test82/aarch64',  $dest, '*.rpm',         '8.2', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-test83/aarch64',  $dest, '*.rpm',         '8.3', 'aarch64', $deps, $template_php);
 	$mod .= genModule('enterprise/10/debug-test84/aarch64',  $dest, '*.rpm',         '8.4', 'aarch64', $deps, $template_php);
+	$mod .= genModule('enterprise/10/debug-test85/aarch64',  $dest, '*.rpm',         '8.5', 'aarch64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
 
diff --git a/mkrepo b/mkrepo
index e658031..8794dce 100755
--- a/mkrepo
+++ b/mkrepo
@@ -9,10 +9,10 @@ then
   ver=8
   old=2
   dst=/data/rpms/old
-elif [ "$nom" = "SRPMS" ]
+elif [ "$nom" = "SRPMS" -o "$nom" = "php8.4" ]
 then
   dis=fedora
-  ver=42
+  ver=43
   old=8
   dst=/data/rpms/SRPMS.remi
 else
diff --git a/mockit b/mockit
index 8964c66..8c93354 100755
--- a/mockit
+++ b/mockit
@@ -1,14 +1,20 @@
 #!/bin/bash
 
 if [ "$2" = "" ]; then
-	echo -e "\nusage: $0 [ options ] SRPM distro [ min_ver [, max_ver [, mock_options ]]]\n"
+	echo -e "\nusage: $0 [ options ] SRPM target [ min_ver [, max_ver [, mock_options ]]]\n"
 	echo -e "\t--redis            store build command in redis queue"
 	echo -e "\t--valkey           store build command in valkey queue"
 	echo -e "\t--list             list queue content"
 	echo -e "\t--nobase | --scl   only build PHP SCL packages"
 	echo -e "\t--noscl | --base   only build PHP base packages"
 	echo -e "\t--mock             distro is a mock config name\n"
-	echo -e "Special distro: all, zts, memcached, im6, im7\n"
+	echo -e "Targets:"
+	echo -e "\tDistribution: el8a el8x el9a el9x el10a el10x fc41a fc41x fc42a fc42x fc43a fc43x"
+	echo -e "\tPHP:          all, zts"
+	echo -e "\tMemcached:    memcached"
+	echo -e "\tImageMagick:  im6, im7"
+	echo -e "\tRedis:        r60, r62, r70, r72, r80, r82"
+	echo -e "\tValkey:       v81\n"
 	exit 0
 fi
 
@@ -84,7 +90,7 @@ else
 	shift
 fi
 if [ "$1" = "" ]; then
-	MAX=84
+	MAX=85
 else
 	MAX=$1
 	shift
@@ -146,15 +152,15 @@ fi
 echo mockit $SRPM $DIST $MIN $MAX $@
 case $DIST in
 	fc43x|fc43a|fc42x|fc42a|fc41x|fc41a|el9x|el9a|el10x|el10a)
-		LST="74 80 81 82 83 84"
+		LST="74 80 81 82 83 84 85"
 		SCL="74 80 81 82 83 84 85"
 		;;
 	el8a)
-		LST="72 73 74 80 81 82 83 84"
+		LST="72 73 74 80 81 82 83 84 85"
 		SCL="72 73 74 80 81 82 83 84 85"
 		;;
 	el8x)
-		LST="72 73 74 80 81 82 83 84"
+		LST="72 73 74 80 81 82 83 84 85"
 		SCL="56 70 71 72 73 74 80 81 82 83 84 85"
 		;;
 	all)