Close F29 and Open F32

4 files changed, 116 insertions, 37 deletions

diff --git a/buildfct b/buildfct
index 5068b9a..209c3d7 100644
--- a/buildfct
+++ b/buildfct
@@ -34,6 +34,7 @@ alias mockfc30xscl73="           mock --configdir=$mocketc -r fc30xscl73
 alias mockfc30xscl74="           mock --configdir=$mocketc -r fc30xscl74          rebuild "
 
 alias mockfc31x="                mock --configdir=$mocketc -r fc31x               rebuild "
+alias mockfc31xd="               mock --configdir=$mocketc -r fc31xd              rebuild "
 alias mockfc31xr="               mock --configdir=$mocketc -r fc31xr              rebuild "
 alias mockfc31x74="              mock --configdir=$mocketc -r fc31x74             rebuild "
 alias mockfc31xscl56="           mock --configdir=$mocketc -r fc31xscl56          rebuild "
@@ -43,6 +44,16 @@ alias mockfc31xscl72="           mock --configdir=$mocketc -r fc31xscl72
 alias mockfc31xscl73="           mock --configdir=$mocketc -r fc31xscl73          rebuild "
 alias mockfc31xscl74="           mock --configdir=$mocketc -r fc31xscl74          rebuild "
 
+alias mockfc32x="                mock --configdir=$mocketc -r fc32x               rebuild "
+alias mockfc32xd="               mock --configdir=$mocketc -r fc32xd              rebuild "
+alias mockfc32xr="               mock --configdir=$mocketc -r fc32xr              rebuild "
+alias mockfc32xscl56="           mock --configdir=$mocketc -r fc32xscl56          rebuild "
+alias mockfc32xscl70="           mock --configdir=$mocketc -r fc32xscl70          rebuild "
+alias mockfc32xscl71="           mock --configdir=$mocketc -r fc32xscl71          rebuild "
+alias mockfc32xscl72="           mock --configdir=$mocketc -r fc32xscl72          rebuild "
+alias mockfc32xscl73="           mock --configdir=$mocketc -r fc32xscl73          rebuild "
+alias mockfc32xscl74="           mock --configdir=$mocketc -r fc32xscl74          rebuild "
+
 alias mockel6i="  setarch i686 mock --configdir=$mocketc -r el6i   --arch i686 rebuild "
 alias mockel6it=" setarch i686 mock --configdir=$mocketc -r el6it  --arch i686 rebuild "
 alias mockel6i55="setarch i686 mock --configdir=$mocketc -r el6i55 --arch i686 rebuild "
@@ -114,7 +125,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30 29
+  for i in 30
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -137,7 +148,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30 29
+  for i in 30
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}ir --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -157,7 +168,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30 29
+  for i in 30
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -303,8 +314,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  echo -n "$(date +%X) 73 fc29 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc29i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 73 el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r  el6i73 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -323,8 +332,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  echo -n "$(date +%X) 74 fc29 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc29i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 74 fc30 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc30i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -361,7 +368,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -387,7 +394,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xr rebuild $1 && echo " Ok." || echo " Error !"
@@ -413,7 +420,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -477,7 +484,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 31 30 29
+  for i in 31 30
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x  rebuild $1 && echo "$(date +%X) (56) fc$i  Ok." || echo "fc$1 Error !")&
@@ -510,7 +517,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 31 30 29
+  for i in 31 30
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (70) fc$i  Ok." || echo "fc$1 Error !")&
@@ -543,7 +550,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (71) fc$i  Ok." || echo "fc$1 Error !")&
@@ -576,7 +583,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (72) fc$i  Ok." || echo "fc$1 Error !")&
@@ -598,6 +605,69 @@ else
 fi
 }
 
+# Build All distribution / version / noarch for remi using PHP >= 7.3
+mock73n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+    shift
+fi
+
+if [ -f "$1" ]; then
+  date +%X
+  pids=""
+  for i in 31 30
+  do
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (72) fc$i  Ok." || echo "fc$1 Error !")&
+    pids="$pids $!"
+  done
+  for i in 8 7 6
+  do
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el${i}x73 rebuild $1 && echo "$(date +%X) (72) el$i   Ok." || echo "el$i  Error !")&
+    pids="$pids $!"
+  done
+  wait $pids
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
+# Build All distribution / version / noarch for remi using PHP >= 7.2
+mock72m()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+    shift
+fi
+
+if [ -f "$1" ]; then
+  date +%X
+  pids=""
+  for i in 31 30
+  do
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (72) fc$i  Ok." || echo "fc$1 Error !")&
+    pids="$pids $!"
+  done
+#  for i in 7 6
+#  do
+#    echo -n ""
+#    (mock $quiet --configdir=$mocketc -r el${i}x72 rebuild $1 && echo "$(date +%X) (72) el$i   Ok." || echo "el$i  Error !")&
+#    pids="$pids $!"
+#  done
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8x   rebuild $1 && echo "$(date +%X) (72) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
+  wait $pids
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/remi-php55
 mock55x()
 {
@@ -736,11 +806,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29
-  do
-    echo -n "$(date +%X) 73 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x73 rebuild $1 && echo " Ok." || echo " Error !"
-  done
   for i in 8 7 6
   do
     echo -n "$(date +%X) 73 el$i  "
@@ -762,7 +827,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
@@ -788,7 +853,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild $1 && echo " Ok." || echo " Error !"
@@ -814,7 +879,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) scl73 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild $1 && echo " Ok." || echo " Error !"
@@ -840,7 +905,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -866,7 +931,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 31 30
+  for i in 31 30
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -892,7 +957,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30 31
+  for i in 31 30
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -918,7 +983,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 31 30
+  for i in 31 30
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 628ebb2..03c3884 100755
--- a/getmock
+++ b/getmock
@@ -374,7 +374,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 29 30 31
+	for i in 29 30 31 32
 	do
 		getOneMock fc${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 0b14f84..c442df0 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -6,10 +6,11 @@ TMPSIG1=$(mktemp -t XXXXXXXX.2000)
 TMPSIG2=$(mktemp -t XXXXXXXX.2017)
 TMPSIG3=$(mktemp -t XXXXXXXX.2018)
 TMPSIG4=$(mktemp -t XXXXXXXX.2019)
+TMPSIG2020=$(mktemp -t XXXXXXXX.2020)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
@@ -40,8 +41,17 @@ if [ -s $TMPSIG ]; then
 
     grep fc30    $TMPSIG  > $TMPSIG4
     grep fc31    $TMPSIG >> $TMPSIG4
-    grep src.rpm $TMPSIG >> $TMPSIG4
 
+    grep fc32    $TMPSIG  > $TMPSIG2020
+    grep src.rpm $TMPSIG >> $TMPSIG2020
+
+    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 Remi's RPM repository" --addsign $(cat $TMPSIG2020)
+		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 Remi's RPM repository" --addsign $(cat $TMPSIG4)
@@ -56,7 +66,7 @@ if [ -s $TMPSIG ]; then
 		else 	exit 1
 		fi
 	fi
-	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | grep -v fc31 | grep -v src.rpm | grep -v el8 > $TMPSIG1
+	grep -v fc29 $TMPSIG | grep -v fc30 | grep -v fc31 | grep -v fc32 | grep -v src.rpm | grep -v el8 > $TMPSIG1
     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 Remi Collet" --addsign $(cat $TMPSIG1)
@@ -82,7 +92,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{29,30,31}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{29,30,31,32}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp,aarch64}
 do
 	[[ $dep =~ /modular ]] && continue
 
diff --git a/mkrepo b/mkrepo
index 68a788d..91a70fa 100755
--- a/mkrepo
+++ b/mkrepo
@@ -20,7 +20,11 @@ if [ ${1:-check} != nocheck ]; then
 	rpm -K *.rpm | grep -v 'signatures.*OK' | cut -d: -f1 | tee $TMP
 	if [ -s $TMP ]
 	then
-		if [ "$dis" == "fedora" -a "$ver" -ge 30 ]
+		if [ "$dis" == "fedora" -a "$ver" -ge 32 ]
+		then echo "key 2020"
+			rpmsign --define '_gpg_path /home/remi/.gnupg2020' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
+
+		elif [ "$dis" == "fedora" -a "$ver" -ge 30 ]
 		then echo "key 2019"
 			rpmsign --define '_gpg_path /home/remi/.gnupg2019' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
 
@@ -84,12 +88,12 @@ else
                --database .
 fi
 
-echo "+ Génération repoview"
-nom=${PWD#/home/rpmbuild/site/rpms/}
+#echo "+ Génération repoview"
+#nom=${PWD#/home/rpmbuild/site/rpms/}
 #echo repoview --quiet --url http://rpms.remirepo.net/$nom \
 #	--template-dir /home/rpmbuild/site/rpms/repotmpl \
 #	--title "Remi's RPM repository - ${nom//\// - }" .
-LANG=C repoview --quiet --url http://rpms.remirepo.net/$nom \
-	--template-dir /home/rpmbuild/site/rpms/repotmpl \
-	--title "Remi's RPM repository - ${nom//\// - }" .
+#LANG=C repoview --quiet --url http://rpms.remirepo.net/$nom \
+#	--template-dir /home/rpmbuild/site/rpms/repotmpl \
+#	--title "Remi's RPM repository - ${nom//\// - }" .