-F26 +F30

4 files changed, 100 insertions, 34 deletions

diff --git a/buildfct b/buildfct
index 4b528a5..c4a5a40 100644
--- a/buildfct
+++ b/buildfct
@@ -5,15 +5,15 @@ alias rhpkg='echo NO PLEASE, use fedpkg'
 
 mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 
-alias mockfc26i="  setarch i686  mock --configdir=$mocketc -r fc26i   --arch i686 rebuild "
-alias mockfc26i72="setarch i686  mock --configdir=$mocketc -r fc26i72 --arch i686 rebuild "
-alias mockfc26x="                mock --configdir=$mocketc -r fc26x               rebuild "
-alias mockfc26x72="              mock --configdir=$mocketc -r fc26x72             rebuild "
-alias mockfc26xt="               mock --configdir=$mocketc -r fc26xt              rebuild "
-alias mockfc26xscl56="           mock --configdir=$mocketc -r fc26xscl56          rebuild "
-alias mockfc26xscl70="           mock --configdir=$mocketc -r fc26xscl70          rebuild "
-alias mockfc26xscl71="           mock --configdir=$mocketc -r fc26xscl71          rebuild "
-alias mockfc26xscl72="           mock --configdir=$mocketc -r fc26xscl72          rebuild "
+#alias mockfc26i="  setarch i686  mock --configdir=$mocketc -r fc26i   --arch i686 rebuild "
+#alias mockfc26i72="setarch i686  mock --configdir=$mocketc -r fc26i72 --arch i686 rebuild "
+#alias mockfc26x="                mock --configdir=$mocketc -r fc26x               rebuild "
+#alias mockfc26x72="              mock --configdir=$mocketc -r fc26x72             rebuild "
+#alias mockfc26xt="               mock --configdir=$mocketc -r fc26xt              rebuild "
+#alias mockfc26xscl56="           mock --configdir=$mocketc -r fc26xscl56          rebuild "
+#alias mockfc26xscl70="           mock --configdir=$mocketc -r fc26xscl70          rebuild "
+#alias mockfc26xscl71="           mock --configdir=$mocketc -r fc26xscl71          rebuild "
+#alias mockfc26xscl72="           mock --configdir=$mocketc -r fc26xscl72          rebuild "
 
 alias mockfc27i="  setarch i686  mock --configdir=$mocketc -r fc27i   --arch i686 rebuild "
 alias mockfc27i72="setarch i686  mock --configdir=$mocketc -r fc27i72 --arch i686 rebuild "
@@ -48,6 +48,14 @@ alias mockfc29xscl71="           mock --configdir=$mocketc -r fc29xscl71
 alias mockfc29xscl72="           mock --configdir=$mocketc -r fc29xscl72          rebuild "
 alias mockfc29xscl73="           mock --configdir=$mocketc -r fc29xscl73          rebuild "
 
+alias mockfc30i="  setarch i686  mock --configdir=$mocketc -r fc30i   --arch i686 rebuild "
+alias mockfc30x="                mock --configdir=$mocketc -r fc30x               rebuild "
+alias mockfc30xscl56="           mock --configdir=$mocketc -r fc30xscl56          rebuild "
+alias mockfc30xscl70="           mock --configdir=$mocketc -r fc30xscl70          rebuild "
+alias mockfc30xscl71="           mock --configdir=$mocketc -r fc30xscl71          rebuild "
+alias mockfc30xscl72="           mock --configdir=$mocketc -r fc30xscl72          rebuild "
+alias mockfc30xscl73="           mock --configdir=$mocketc -r fc30xscl73          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 "
@@ -93,6 +101,7 @@ alias mockel7xscl73="          mock --configdir=$mocketc -r el7xscl73          r
 alias mockel8x="               mock --configdir=$mocketc -r el8x               rebuild "
 alias mockel8x72="             mock --configdir=$mocketc -r el8x72             rebuild "
 alias mockel8x73="             mock --configdir=$mocketc -r el8x73             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 "
 alias mockel8xscl72="          mock --configdir=$mocketc -r el8xscl72          rebuild "
@@ -111,7 +120,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 27 26
+  for i in 30 29 28 27
   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 !"
@@ -134,7 +143,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 27 26
+  for i in 29 28 27
   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 !"
@@ -264,8 +273,6 @@ fi
 if [ -f "$1" ]; then
   echo -n "$(date +%X) 72 fc27 "
   setarch i686    mock $quiet --configdir=$mocketc -r fc27i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
-  echo -n "$(date +%X) 72 fc26 "
-  setarch i686    mock $quiet --configdir=$mocketc -r fc26i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   echo -n "$(date +%X) 72 el6  "
   setarch i686    mock $quiet --configdir=$mocketc -r  el6i72 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
   date +%X
@@ -326,7 +333,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 27 28 26
+  for i in 29 27 28 30
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -352,7 +359,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 26 27
+  for i in 29 28 27
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -416,7 +423,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 29 28 27 26
+  for i in 30 29 28 27
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x  rebuild $1 && echo "$(date +%X) (56) fc$i  Ok." || echo "fc$1 Error !")&
@@ -449,7 +456,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 29 28 27 26
+  for i in 30 29 28 27
   do
     echo -n ""
     (mock $quiet --configdir=$mocketc -r fc${i}x    rebuild $1 && echo "$(date +%X) (70) fc$i  Ok." || echo "fc$1 Error !")&
@@ -482,7 +489,7 @@ fi
 if [ -f "$1" ]; then
   date +%X
   pids=""
-  for i in 28 27 26 29
+  for i in 28 27 29 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 !")&
@@ -504,6 +511,45 @@ else
 fi
 }
 
+# Build All distribution / version / noarch for remi using PHP >= 7.2
+mock72n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+    shift
+fi
+
+if [ -f "$1" ]; then
+  date +%X
+  pids=""
+  for i in 28 29 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 27
+  do
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc${i}x72  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()
 {
@@ -598,7 +644,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 27 26
+  for i in 27
   do
     echo -n "$(date +%X) 72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -676,7 +722,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 27 26
+  for i in 29 28 27
   do
     echo -n "$(date +%X) scl72 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl72 rebuild $1 && echo " Ok." || echo " Error !"
@@ -702,7 +748,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 26 27
+  for i in 29 28 27
   do
     echo -n "$(date +%X) scl71 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl71 rebuild $1 && echo " Ok." || echo " Error !"
@@ -728,7 +774,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 26 27
+  for i in 29 28 27
   do
     echo -n "$(date +%X) scl70 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl70 rebuild $1 && echo " Ok." || echo " Error !"
@@ -754,12 +800,12 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 28 27 26
+  for i in 29 28 27
   do
     echo -n "$(date +%X) scl56 fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
   done
-  for i in 7 6
+  for i in 8 7 6
   do
     echo -n "$(date +%X) scl56 el$i  "
     mock $quiet --configdir=$mocketc -r el${i}xscl56 rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 198f073..3879c5d 100755
--- a/getmock
+++ b/getmock
@@ -374,7 +374,7 @@ elif [ $1 = scl56 ]; then
 	do
 		getOneMock scl56fc${i}x $opt
 	done
-	for i in 6 7
+	for i in 6 7 8
 	do
 		getOneMock scl56el${i}x $opt
 	done
diff --git a/mkallrepo b/mkallrepo
index 3614754..6a332a3 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -2,13 +2,14 @@
 
 TMPSIG=$(mktemp)
 TMPLNK=$(mktemp)
-TMPSIG1=$(mktemp)
-TMPSIG2=$(mktemp)
-TMPSIG3=$(mktemp)
+TMPSIG1=$(mktemp -t XXXXXXXX.2000)
+TMPSIG2=$(mktemp -t XXXXXXXX.2017)
+TMPSIG3=$(mktemp -t XXXXXXXX.2018)
+TMPSIG4=$(mktemp -t XXXXXXXX.2019)
 
 cd /home/rpmbuild/site/rpms
 
-for dep in fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	arch=${dep##*/}
 
@@ -38,8 +39,17 @@ if [ -s $TMPSIG ]; then
     grep fc28    $TMPSIG  > $TMPSIG3
     grep fc29    $TMPSIG >> $TMPSIG3
     grep el8     $TMPSIG >> $TMPSIG3
-    grep src.rpm $TMPSIG >> $TMPSIG3
 
+    grep fc30    $TMPSIG  > $TMPSIG4
+    grep src.rpm $TMPSIG >> $TMPSIG4
+
+    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)
+		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 Remi's RPM repository" --addsign $(cat $TMPSIG3)
@@ -54,7 +64,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 src.rpm | grep -v el8 > $TMPSIG1
+	grep -v fc26 $TMPSIG | grep -v fc27 | grep -v fc28 | grep -v fc29 | grep -v fc30 | 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)
@@ -79,7 +89,7 @@ then	echo "== Création des liens (noarch) =="
 else 	echo "Rien à lier."
 fi
 
-for dep in SRPMS fedora/{24,25,26,27,28,29}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
+for dep in SRPMS fedora/{26,27,28,29,30}/*/{i386,x86_64} enterprise/{6,7,8}/*/{i386,x86_64,armhfp}
 do
 	if [ -d $dep/repodata -a $dep -nt $dep/repodata -a ! -f $dep/.closed ]
 	then	echo "== Actualisation de $dep =="
diff --git a/mkrepo b/mkrepo
index a222a68..ce182cc 100755
--- a/mkrepo
+++ b/mkrepo
@@ -6,7 +6,7 @@ nom=${PWD#/home/rpmbuild/site/rpms/}
 if [ "$nom" = "SRPMS" ]
 then
   dis=fedora
-  ver=28
+  ver=30
   old=5
 else
   dis=${nom%%/*}
@@ -20,12 +20,22 @@ 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 28 ]
+		if [ "$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)
+
+		elif [ "$dis" == "fedora" -a "$ver" -ge 28 ]
+		then echo "key 2018"
+			rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
+
+		elif [ "$dis" == "enterprise" -a "$ver" -ge 8 ]
 		then echo "key 2018"
 			rpmsign --define '_gpg_path /home/remi/.gnupg2018' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
+
 		elif [ "$dis" == "fedora" -a "$ver" -ge 26 ]
 		then echo "key 2017"
 			rpmsign --define '_gpg_path /home/remi/.gnupg2017' --define "_gpg_name Remi's RPM repository"  --addsign $(cat $TMP)
+
 		else echo "old key"
 			rpmsign --define '_gpg_path /home/remi/.gnupgrpm'  --define "_gpg_name Remi Collet"            --addsign $(cat $TMP)
 		fi