cleanup and EL-9 helpers

1 files changed, 48 insertions, 17 deletions

diff --git a/mkmodular b/mkmodular
index 97c1d14..96f0dee 100755
--- a/mkmodular
+++ b/mkmodular
@@ -244,8 +244,10 @@ EOT;
 function findPackages($from, $dest, $pat) {
 	global $oldrpms;
 	$excl = [
-		'php-amqplib', 'php-jsonlint', 'php-laminas-mime', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data', 'php-doctrine-orm',
-		'php-icewind-streams', 'php-masterminds-html5',
+		'php-amqplib', 'php-jsonlint', 'php-cs-fixer', 'php-tecnickcom-tc-lib-unicode-data',
+		'php-doctrine-orm',
+		'php-laminas-authentication', 'php-laminas-diactoros2', 'php-laminas-mime', 'php-laminas-i18n-resources',
+		'php-icewind-streams', 'php-masterminds-html5', 'php-league-mime-type-detection',
 	];
 	$rpms = [];
 	foreach (glob("$from/$pat") as $file) {
@@ -374,8 +376,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	$dest = 'fedora/33/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f33'];
-	$mod  = genModule('fedora/33/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/33/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
@@ -385,8 +389,10 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'fedora/33/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f33'];
-	$mod  = genModule('fedora/33/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/33/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
@@ -396,8 +402,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
 	$dest = 'fedora/34/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f34'];
-	$mod  = genModule('fedora/34/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/34/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
@@ -407,8 +415,10 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'fedora/34/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f34'];
-	$mod  = genModule('fedora/34/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/34/test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
@@ -418,8 +428,10 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
 	$dest = 'fedora/35/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f35'];
-	$mod  = genModule('fedora/35/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/remi/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/35/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	$mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']);
 	createRepo($dest, $mod);
@@ -428,8 +440,10 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'fedora/35/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'f35'];
-	$mod  = genModule('fedora/35/test/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/test/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/35/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
@@ -438,8 +452,10 @@ if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el8'];
-	$mod  = genModule('enterprise/8/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
@@ -450,8 +466,10 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
 	$dest = 'enterprise/8/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el8'];
-	$mod  = genModule('enterprise/8/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/8/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
@@ -473,7 +491,10 @@ if (in_array('el9', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el9'];
+	$mod .= genModule('enterprise/9/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/test81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
@@ -482,18 +503,22 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) {
 	$dest = 'enterprise/9/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el9'];
+	$mod .= genModule('enterprise/9/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/9/php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
-	$mod .= genDefaults('php', false, ['remi-8.0', 'remi-8.1']);
-	$deps = ['platform' => 'el9'];
+	$mod .= genDefaults('php', false, ['remi-7.4', 'remi-8.0', 'remi-8.1']);
+
 	$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);
 	$mod .= genModule('enterprise/9/redis62/x86_64', $dest, 'redis*.rpm', '6.2', 'x86_64', $deps, $template_redis);
 	$mod .= genDefaults('redis', false, ['remi-5.0', 'remi-6.0', 'remi-6.2']);
+
 	$mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached);
 	$mod .= genDefaults('memcached', false, ['remi']);
-	$deps = ['platform' => 'el9', 'php' => ''];
+
 	$mod .= genModule('enterprise/9/composer2/x86_64', $dest, '*.rpm',         '2', 'x86_64', $deps, $template_comp);
 	$mod .= genDefaults('composer', '2', ['2']);
 	createRepo($dest, $mod);
@@ -504,8 +529,10 @@ if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
 	$dest = 'temp/epel-8-modular';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el8', 'php' => '7.2'];
-	$mod  = genModule('temp/epel-8-php-7.2',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_phpextras);
+	$mod .= genModule('temp/epel-8-php-7.2',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_phpextras);
 	$deps = ['platform' => 'el8', 'php' => '7.3'];
 	$mod .= genModule('temp/epel-8-php-7.3',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_phpextras);
 	$deps = ['platform' => 'el8', 'php' => '7.4'];
@@ -518,9 +545,11 @@ if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$dest = 'enterprise/7/modular-test/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el7'];
-	$mod  = genModule('enterprise/7/test71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
-	$mod  = genModule('enterprise/7/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/7/test71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/7/test72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/test80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
@@ -531,8 +560,10 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
 	$dest = 'enterprise/7/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
+	$mod  = '';
+
 	$deps = ['platform' => 'el7'];
-	$mod  = genModule('enterprise/7/php71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/7/php71/x86_64',  $dest, '*.rpm',         '7.1', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
 	$mod .= genModule('enterprise/7/php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);