all keys moved in same folder

5 files changed, 31 insertions, 65 deletions

diff --git a/buildfct b/buildfct
index d5dc87d..e56f26d 100644
--- a/buildfct
+++ b/buildfct
@@ -475,7 +475,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35 34 36
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -553,7 +553,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 34 35
+  for i in 34 35 36
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -579,7 +579,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35 34
+  for i in 35 34 36
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 69f72d7..c191283 100755
--- a/getmock
+++ b/getmock
@@ -483,7 +483,7 @@ elif [ $1 = scl71 ]; then
 	done
 
 elif [ $1 = scl81 ]; then
-	for i in 34 35
+	for i in 34 35 36
 	do
 		getOneMock scl81fc${i}x $opt
 	done
@@ -493,7 +493,7 @@ elif [ $1 = scl81 ]; then
 	done
 
 elif [ $1 = scl80 ]; then
-	for i in 34 35
+	for i in 34 35 36
 	do
 		getOneMock scl80fc${i}x $opt
 	done
@@ -503,7 +503,7 @@ elif [ $1 = scl80 ]; then
 	done
 
 elif [ $1 = scl74 ]; then
-	for i in 34 35
+	for i in 34 35 36
 	do
 		getOneMock scl74fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 8c2d1ee..dd695fd 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -2,16 +2,14 @@
 
 TMPSIG=$(mktemp)
 TMPLNK=$(mktemp)
-TMPSIG1=$(mktemp -t XXXXXXXX.2000)
-TMPSIG3=$(mktemp -t XXXXXXXX.2018)
-TMPSIG4=$(mktemp -t XXXXXXXX.2019)
-TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
+TMPSIG2000=$(mktemp -t XXXXXXXX.2000)
+TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
 TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
 TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
@@ -39,15 +37,9 @@ if [ -s $TMPSIG ]; then
     echo "À signer:"; sort < $TMPSIG
 
 	# old
-    grep el7     $TMPSIG  > $TMPSIG1
+    grep el7     $TMPSIG  > $TMPSIG2000
 	# 2018
-    grep el8     $TMPSIG  > $TMPSIG3
-	# 2019
-    grep fc30    $TMPSIG  > $TMPSIG4
-    grep fc31    $TMPSIG >> $TMPSIG4
-	# 2020
-    grep fc32    $TMPSIG  > $TMPSIG2020
-    grep fc33    $TMPSIG >> $TMPSIG2020
+    grep el8     $TMPSIG  > $TMPSIG2018
 	# 2021
     grep fc34    $TMPSIG  > $TMPSIG2021
     grep fc35    $TMPSIG >> $TMPSIG2021
@@ -65,35 +57,21 @@ if [ -s $TMPSIG ]; then
 	fi
     if [ -s $TMPSIG2021 ]; then
 		echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupg2021' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
-    if [ -s $TMPSIG2020 ]; then
-		echo "== Signature des $(cat $TMPSIG2020 | wc -l) nouveaux RPM (2020) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name 34C10BDBCC6F1B252E50BA1A0714919E4C21A808" --addsign $(cat $TMPSIG2020)
+    if [ -s $TMPSIG2018 ]; then
+		echo "== Signature des $(cat $TMPSIG2018 | wc -l) nouveaux RPM (2018) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG2018)
 		then	echo done.
 		else 	exit 1
 		fi
 	fi
-    if [ -s $TMPSIG4 ]; then
-		echo "== Signature des $(cat $TMPSIG4 | wc -l) nouveaux RPM (2019) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name 5F136145BF10369B7685D8DE503666CCBBAE6F1B" --addsign $(cat $TMPSIG4)
-		then	echo done.
-		else 	exit 1
-		fi
-	fi
-    if [ -s $TMPSIG3 ]; then
-		echo "== Signature des $(cat $TMPSIG3 | wc -l) nouveaux RPM (2018) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name 6B38FEA7231F87F52B9CA9D8555097595F11735A" --addsign $(cat $TMPSIG3)
-		then	echo done.
-		else 	exit 1
-		fi
-	fi
-    if [ -s $TMPSIG1 ]; then
-		echo "== Signature des $(cat $TMPSIG1 | wc -l) nouveaux RPM (old) =="
-		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG1)
+    if [ -s $TMPSIG2000 ]; then
+		echo "== Signature des $(cat $TMPSIG2000 | wc -l) nouveaux RPM (old) =="
+		if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56" --addsign $(cat $TMPSIG2000)
 		then	echo done.
 		else 	exit 1
 		fi
@@ -116,7 +94,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{33,34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{34,35,36}/*/{i386,x86_64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 	[[ $dep =~ /debug-modular ]] && continue
diff --git a/mkmodular b/mkmodular
index 474a973..11254a1 100755
--- a/mkmodular
+++ b/mkmodular
@@ -335,29 +335,23 @@ chdir($dest);
 
 // Key
 [$dis,$ver]=explode("/", $dest);
+$GPG_PATH="/home/remi/.gnupgrpm";
 if ($dis == "fedora") {
 	if ($ver >= 36) {
-		$GPG_PATH="/home/remi/.gnupgrpm";
 		$GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014";
 	} else if ($ver >= 34) {
-		$GPG_PATH="/home/remi/.gnupg2021";
 		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
 	} else if ($ver >= 32) {
-		$GPG_PATH="/home/remi/.gnupg2020";
 		$GPG_NAME="34C10BDBCC6F1B252E50BA1A0714919E4C21A808";
 	} else {
-		$GPG_PATH="/home/remi/.gnupg2019";
 		$GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B";
 	}
 } else {
 	if ($ver >= 9) {
-		$GPG_PATH="/home/remi/.gnupg2021";
 		$GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947";
 	} else if ($ver == 8) {
-		$GPG_PATH="/home/remi/.gnupg2018";
 		$GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A";
 	} else {
-		$GPG_PATH="/home/remi/.gnupgrpm";
 		$GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56";
 	}
 }
@@ -379,7 +373,7 @@ rename($data, "$data.$arch");
 exec("gpg --armor --detach-sign --default-key \"$GPG_NAME\" --homedir \"$GPG_PATH\" repodata/repomd.xml");
 chdir($old);
 }
-
+/*
 if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
 	$dest = 'fedora/33/modular/x86_64';
 	echo "Populate $dest\n";
@@ -405,7 +399,7 @@ if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod .= genModule('fedora/33/test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
-
+*/
 if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
 	$dest = 'fedora/34/modular/x86_64';
 	echo "Populate $dest\n";
@@ -413,7 +407,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
 	$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, ['uwsgi-plugin-php*rpm', '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']);
@@ -425,7 +419,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f34', $_SERVER['argv'])) {
 	$mod  = '';
 
 	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/debug-remi/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/34/debug-remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/debug-php80/x86_64',  $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
@@ -437,7 +431,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$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, ['uwsgi-plugin-php*rpm', '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);
@@ -448,7 +442,7 @@ if (in_array('f34', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 	$mod  = '';
 
 	$deps = ['platform' => 'f34'];
-	$mod .= genModule('fedora/34/debug-test/x86_64',   $dest, ['unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/34/debug-test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*7.4*.rpm'], '7.4', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/debug-test80/x86_64', $dest, '*.rpm',         '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/34/debug-test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
@@ -462,7 +456,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
 
 	$deps = ['platform' => 'f35'];
 	$mod .= genModule('fedora/35/php74/x86_64',  $dest, '*rpm',          '7.4', '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/remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', '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-7.4', 'remi-8.0', 'remi-8.1']);
 	createRepo($dest, $mod);
@@ -474,7 +468,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f35', $_SERVER['argv'])) {
 
 	$deps = ['platform' => 'f35'];
 	$mod .= genModule('fedora/35/debug-php74/x86_64',  $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-remi/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/debug-remi/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/35/debug-php81/x86_64',  $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
@@ -486,7 +480,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 
 	$deps = ['platform' => 'f35'];
 	$mod .= genModule('fedora/35/test74/x86_64', $dest, '*.rpm',         '7.4', '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/test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', '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);
 
@@ -497,7 +491,7 @@ if (in_array('f35', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
 
 	$deps = ['platform' => 'f35'];
 	$mod .= genModule('fedora/35/debug-test74/x86_64', $dest, '*.rpm',         '7.4', 'x86_64', $deps, $template_php);
-	$mod .= genModule('fedora/35/debug-test/x86_64',   $dest, ['unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/35/debug-test/x86_64',   $dest, ['uwsgi-plugin-php*rpm', 'unit-php*rpm', 'php-*8.0*.rpm'], '8.0', 'x86_64', $deps, $template_php);
 	$mod .= genModule('fedora/35/debug-test81/x86_64', $dest, '*.rpm',         '8.1', 'x86_64', $deps, $template_php);
 	createRepo($dest, $mod);
 }
diff --git a/mkrepo b/mkrepo
index 0e6c165..abca8e7 100755
--- a/mkrepo
+++ b/mkrepo
@@ -23,23 +23,20 @@ else
   dst=/data/rpms/old
 fi
 
+GPG_PATH=/home/remi/.gnupgrpm
 if [ "$dis" == "fedora" ]; then
 	# Fedora
 	if [ "$ver" -ge 36 ]
 	then echo "key 2022"
-		GPG_PATH=/home/remi/.gnupgrpm
 		GPG_NAME="845160D23149DAD504F0A32D83C0639E1FEF0014"
 	elif [ "$ver" -ge 34 ]
 	then echo "key 2021"
-		GPG_PATH=/home/remi/.gnupg2021
 		GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"
 	elif [ "$ver" -ge 32 ]
 	then echo "key 2020"
-		GPG_PATH=/home/remi/.gnupg2020
 		GPG_NAME="34C10BDBCC6F1B252E50BA1A0714919E4C21A808"
 	elif [ "$ver" -ge 30 ]
 	then echo "key 2019"
-		GPG_PATH=/home/remi/.gnupg2019
 		GPG_NAME="5F136145BF10369B7685D8DE503666CCBBAE6F1B"
 	else echo "older key"
 		exit 1
@@ -48,14 +45,11 @@ else
 	# Enterprise
 	if [ "$ver" -ge 9 ]
 	then echo "key 2021"
-		GPG_PATH=/home/remi/.gnupg2021
 		GPG_NAME="B1ABF71E14C9D74897E198A8B19527F1478F8947"
 	elif [ "$ver" -ge 8 ]
 	then echo "key 2018"
-		GPG_PATH=/home/remi/.gnupg2018
 		GPG_NAME="6B38FEA7231F87F52B9CA9D8555097595F11735A"
 	else echo "old key"
-		GPG_PATH=/home/remi/.gnupgrpm
 		GPG_NAME="1EE04CCE88A4AE4AA29A5DF5004E6F4700F97F56"
 	fi
 fi