From a3d7e68fe86c66e3716b11f4bb36fcd22b8930ab Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 10 Feb 2023 09:06:00 +0100
Subject: F35 is closed

---
 buildfct | 119 ++++++++++++++++++++++++---------------------------------------
 getmock  |  38 +++-----------------
 2 files changed, 50 insertions(+), 107 deletions(-)

diff --git a/buildfct b/buildfct
index de8a6c5..b6d1d09 100644
--- a/buildfct
+++ b/buildfct
@@ -26,6 +26,7 @@ alias mockfc35xd="               mock --configdir=$mocketc -r fc35xd
 alias mockfc35xr="               mock --configdir=$mocketc -r fc35xr              rebuild "
 alias mockfc35x74="              mock --configdir=$mocketc -r fc35x74             rebuild "
 alias mockfc35x81="              mock --configdir=$mocketc -r fc35x81             rebuild "
+alias mockfc35n81="              mock --configdir=$mocketc -r fc35n81             rebuild "
 alias mockfc35x82="              mock --configdir=$mocketc -r fc35x82             rebuild "
 alias mockfc35xscl56="           mock --configdir=$mocketc -r fc35xscl56          rebuild "
 alias mockfc35xscl70="           mock --configdir=$mocketc -r fc35xscl70          rebuild "
@@ -130,6 +131,7 @@ alias mockel8x73="             mock --configdir=$mocketc -r el8x73             r
 alias mockel8x74="             mock --configdir=$mocketc -r el8x74             rebuild "
 alias mockel8x80="             mock --configdir=$mocketc -r el8x80             rebuild "
 alias mockel8x81="             mock --configdir=$mocketc -r el8x81             rebuild "
+alias mockel8n81="             mock --configdir=$mocketc -r el8n81             rebuild "
 alias mockel8x82="             mock --configdir=$mocketc -r el8x82             rebuild "
 alias mockel8xscl56="          mock --configdir=$mocketc -r el8xscl56          rebuild "
 alias mockel8xscl70="          mock --configdir=$mocketc -r el8xscl70          rebuild "
@@ -151,6 +153,7 @@ alias mockel9n="               mock --configdir=$mocketc -r el9n               r
 alias mockel9x74="             mock --configdir=$mocketc -r el9x74             rebuild "
 alias mockel9x80="             mock --configdir=$mocketc -r el9x80             rebuild "
 alias mockel9x81="             mock --configdir=$mocketc -r el9x81             rebuild "
+alias mockel9n81="             mock --configdir=$mocketc -r el9n81             rebuild "
 alias mockel9x82="             mock --configdir=$mocketc -r el9x82             rebuild "
 alias mockel9xscl74="          mock --configdir=$mocketc -r el9xscl74          rebuild "
 alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
@@ -178,11 +181,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 7
   do
     echo -n "$(date +%X) el$i  "
@@ -204,11 +202,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xr rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 7 8
   do
     echo -n "$(date +%X) el$i  "
@@ -220,27 +213,6 @@ else
 fi
 }
 
-# Build All distribution (PHP 7) / version / 64bits for remi
-mock7x()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution (PHP 5) / version / 64bits for remi
 mock5x()
 {
@@ -283,7 +255,7 @@ else
 fi
 }
 
-# Build All distribution / version / noarch for remi using PHP >= 7.4
+# Build All distribution / version / noarch for remi using PHP >= 8.0
 mock80n()
 {
 quiet="--quiet"
@@ -294,7 +266,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo "$(date +%X) (7x) fc$i  Ok." || echo "fc$1 Error !")&
@@ -316,6 +288,39 @@ else
 fi
 }
 
+# Build All distribution / version / noarch for remi using PHP >= 8.1
+mock81n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+    shift
+fi
+
+if [ -f "$1" ]; then
+  date +%X
+  pids=""
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc36x     rebuild "$@" && echo "$(date +%X) (81) fc36  Ok." || echo "fc36 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc37x     rebuild "$@" && echo "$(date +%X) (81) fc37  Ok." || echo "fc37 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php81 rebuild "$@" && echo "$(date +%X) (81) el7   Ok." || echo "el7  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8n81    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el9n81    rebuild "$@" && echo "$(date +%X) (81) el9   Ok." || echo "el9  Error !")&
+    pids="$pids $!"
+  wait $pids
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/remi-php55
 mock55x()
 {
@@ -473,7 +478,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) 74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -499,7 +504,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 36 35
+  for i in 37 36
   do
     echo -n "$(date +%X) scl82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -525,7 +530,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) scl81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -555,8 +560,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r fc37xr62 rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r62 f36 "
   mock $quiet --configdir=$mocketc -r fc36xr62 rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r62 f35 "
-  mock $quiet --configdir=$mocketc -r fc35x    rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r62 el9  "
   mock $quiet --configdir=$mocketc -r el9xr62  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r62 el8  "
@@ -583,8 +586,6 @@ if [ -f "$1" ]; then
   mock $quiet --configdir=$mocketc -r fc37xr70 rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 f36 "
   mock $quiet --configdir=$mocketc -r fc36xr70 rebuild "$@" && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) r70 f35 "
-  mock $quiet --configdir=$mocketc -r fc35x    rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 el9  "
   mock $quiet --configdir=$mocketc -r el9xr70  rebuild "$@" && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) r70 el8  "
@@ -607,7 +608,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) 82 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -633,7 +634,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) 81 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -664,11 +665,6 @@ if [ -f "$1" ]; then
     echo -n "$(date +%X) 80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
   done
-  for i in 35
-  do
-    echo -n "$(date +%X) 80 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}x   rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 9 8 7
   do
     echo -n "$(date +%X) 80 el$i  "
@@ -690,7 +686,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) scl80 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -716,7 +712,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 37 35 36
+  for i in 37 36
   do
     echo -n "$(date +%X) scl74 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -742,11 +738,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) scl73 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl73 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 7 8
   do
     echo -n "$(date +%X) scl73 el$i  "
@@ -768,11 +759,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) scl72 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 8 7
   do
     echo -n "$(date +%X) scl72 el$i  "
@@ -794,11 +780,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) scl71 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 8 7
   do
     echo -n "$(date +%X) scl71 el$i  "
@@ -820,11 +801,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) scl70 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 8 7
   do
     echo -n "$(date +%X) scl70 el$i  "
@@ -846,11 +822,6 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 35
-  do
-    echo -n "$(date +%X) scl56 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
   for i in 8 7
   do
     echo -n "$(date +%X) scl56 el$i  "
diff --git a/getmock b/getmock
index 64de38e..bd68e04 100755
--- a/getmock
+++ b/getmock
@@ -441,7 +441,6 @@ elif [ $1 = all73 ]; then
 elif [ $1 = all74 ]; then
 	[ $opt = remi ] && opt=php74
 	[ $opt = test ] && opt=test74
-		getOneMock fc35x74 $opt '*7.4*'
 		getOneMock fc36x74 $opt '*7.4*'
 		getOneMock fc37x74 $opt '*7.4*'
 		getOneMock el7x74  $opt '*7.4*'
@@ -450,7 +449,6 @@ elif [ $1 = all74 ]; then
 		getOneMock el9a74  $opt '*7.4*'
 
 elif [ $1 = all80 ]; then
-		getOneMock fc35x   $opt '*8.0*'
 	[ $opt = remi ] && opt=php80
 	[ $opt = test ] && opt=test80
 		getOneMock fc36x80 $opt '*8.0*'
@@ -463,7 +461,6 @@ elif [ $1 = all80 ]; then
 elif [ $1 = all81 ]; then
 	[ $opt = remi ] && opt=php81
 	[ $opt = test ] && opt=test81
-		getOneMock fc35x81 $opt '*8.1*'
 		getOneMock fc36x81 $opt '*8.1*'
 		getOneMock fc37x81 $opt '*8.1*'
 		getOneMock el7x81  $opt '*8.1*'
@@ -474,7 +471,6 @@ elif [ $1 = all81 ]; then
 elif [ $1 = all82 ]; then
 	[ $opt = remi ] && opt=php82
 	[ $opt = test ] && opt=test82
-		getOneMock fc35x82 $opt '*8.2*'
 		getOneMock fc36x82 $opt '*8.2*'
 		getOneMock fc37x82 $opt '*8.2*'
 		getOneMock el7x82  $opt '*8.2*'
@@ -484,7 +480,6 @@ elif [ $1 = all82 ]; then
 
 elif [ $1 = allr60 ]; then
 	opt=remi
-	getOneMock fc35x $opt '*6.0*'
 	getOneMock el7x  $opt '*6.0*'
 	opt=redis60
 	getOneMock fc36x $opt '*6.0*'
@@ -495,7 +490,6 @@ elif [ $1 = allr60 ]; then
 
 elif [ $1 = allr62 ]; then
 	opt=remi
-	getOneMock fc35x $opt '*6.2*'
 	getOneMock el7x  $opt '*6.2*'
 	opt=redis62
 	getOneMock fc36x $opt '*6.2*'
@@ -506,7 +500,6 @@ elif [ $1 = allr62 ]; then
 
 elif [ $1 = allr70 ]; then
 	opt=remi
-	getOneMock fc35x $opt '*7.0*'
 	getOneMock el7x  $opt '*7.0*'
 	opt=redis70
 	getOneMock fc36x $opt '*7.0*'
@@ -517,7 +510,6 @@ elif [ $1 = allr70 ]; then
 
 elif [ $1 = allm ]; then
 	opt=remi
-	getOneMock fc35x $opt '*1.6*'
 	getOneMock el7x  $opt '*1.6*'
 	getOneMock el8x  $opt '*1.6*'
 	opt=memcached
@@ -543,7 +535,7 @@ elif [ $1 = for55 ]; then
 	done
 
 elif [ $1 = allx ]; then
-	for i in 35 36 37
+	for i in 36 37
 	do
 		getOneMock fc${i}x $opt
 	done
@@ -565,37 +557,25 @@ elif [ $1 = scl55 ]; then
 	done
 
 elif [ $1 = scl56 ]; then
-	for i in 35
-	do
-		getOneMock scl56fc${i}x $opt
-	done
 	for i in 7 8
 	do
 		getOneMock scl56el${i}x $opt
 	done
 
 elif [ $1 = scl70 ]; then
-	for i in 35
-	do
-		getOneMock scl70fc${i}x $opt
-	done
 	for i in 7 8
 	do
 		getOneMock scl70el${i}x $opt
 	done
 
 elif [ $1 = scl71 ]; then
-	for i in 35
-	do
-		getOneMock scl71fc${i}x $opt
-	done
 	for i in 7 8
 	do
 		getOneMock scl71el${i}x $opt
 	done
 
 elif [ $1 = scl82 ]; then
-	for i in 35 36 37
+	for i in 36 37
 	do
 		getOneMock scl82fc${i}x $opt
 	done
@@ -605,7 +585,7 @@ elif [ $1 = scl82 ]; then
 	done
 
 elif [ $1 = scl81 ]; then
-	for i in 35 36 37
+	for i in 36 37
 	do
 		getOneMock scl81fc${i}x $opt
 	done
@@ -615,7 +595,7 @@ elif [ $1 = scl81 ]; then
 	done
 
 elif [ $1 = scl80 ]; then
-	for i in 35 36 37
+	for i in 36 37
 	do
 		getOneMock scl80fc${i}x $opt
 	done
@@ -625,7 +605,7 @@ elif [ $1 = scl80 ]; then
 	done
 
 elif [ $1 = scl74 ]; then
-	for i in 35 36 37
+	for i in 36 37
 	do
 		getOneMock scl74fc${i}x $opt
 	done
@@ -635,20 +615,12 @@ elif [ $1 = scl74 ]; then
 	done
 
 elif [ $1 = scl73 ]; then
-	for i in 35
-	do
-		getOneMock scl73fc${i}x $opt
-	done
 	for i in 7 8
 	do
 		getOneMock scl73el${i}x $opt
 	done
 
 elif [ $1 = scl72 ]; then
-	for i in 35
-	do
-		getOneMock scl72fc${i}x $opt
-	done
 	for i in 7 8
 	do
 		getOneMock scl72el${i}x $opt
-- 
cgit