Latest fedora

Author: matteocorti

.github/workflows/publish.yml

@@ -16,14 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          - 'fedora:42'
-          - 'fedora:41'
+          - 'fedora:latest'
         include:
-          - distro: 'fedora:42'
-            pre: >-
-              dnf install -y hostname &&
-              dnf install -y nmap ShellCheck curl sudo perl make bzip2 file openssl rpm-build openssh-clients bc bash-completion
-          - distro: 'fedora:41'
+          - distro: 'fedora:latest'
             pre: >-
               dnf install -y hostname &&
               dnf install -y nmap ShellCheck curl sudo perl make bzip2 file openssl rpm-build openssh-clients bc bash-completion

check_ssl_cert

@@ -2470,7 +2470,6 @@ check_cert_end_date() {
 
         checkend "${1}" 0
 
-#        if ! echo "${1}" | ${OPENSSL} x509 -in /dev/stdin -noout -checkend 0 >/dev/null; then
         if ! checkend "${1}" 0 ; then
 
             if compare "${ELEM_DAYS_VALID}" ">=" 0 && compare "${ELEM_DAYS_VALID}" "<" 1; then

utils/prepare_rpm.sh

@@ -19,100 +19,29 @@ echo "dist: ${DIST}"
 
 WEBROOT=/var/www/rpm
 case ${DIST} in
-fc30)
-    RPMDIR="${WEBROOT}/fedora/30/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/30/SRPMS"
-    DIST='fedora'
-    RELEASE='30'
-    ;;
-fc31)
-    RPMDIR="${WEBROOT}/fedora/31/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/31/SRPMS"
-    DIST='fedora'
-    RELEASE='31'
-    ;;
-fc32)
-    RPMDIR="${WEBROOT}/fedora/32/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/32/SRPMS"
-    DIST='fedora'
-    RELEASE='32'
-    ;;
-fc33)
-    RPMDIR="${WEBROOT}/fedora/33/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/33/SRPMS"
-    DIST='fedora'
-    RELEASE='33'
-    ;;
-fc34)
-    RPMDIR="${WEBROOT}/fedora/34/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/34/SRPMS"
-    DIST='fedora'
-    RELEASE='34'
-    ;;
-fc35)
-    RPMDIR="${WEBROOT}/fedora/35/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/35/SRPMS"
-    DIST='fedora'
-    RELEASE='35'
-    ;;
-fc36)
-    RPMDIR="${WEBROOT}/fedora/36/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/36/SRPMS"
-    DIST='fedora'
-    RELEASE='36'
-    ;;
-fc37)
-    RPMDIR="${WEBROOT}/fedora/37/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/37/SRPMS"
-    DIST='fedora'
-    RELEASE='37'
-    ;;
-fc38)
-    RPMDIR="${WEBROOT}/fedora/38/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/38/SRPMS"
-    DIST='fedora'
-    RELEASE='38'
-    ;;
-fc39)
-    RPMDIR="${WEBROOT}/fedora/39/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/39/SRPMS"
-    DIST='fedora'
-    RELEASE='39'
-    ;;
-fc40)
-    RPMDIR="${WEBROOT}/fedora/40/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/40/SRPMS"
-    DIST='fedora'
-    RELEASE='40'
-    ;;
-fc41)
-    RPMDIR="${WEBROOT}/fedora/41/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/41/SRPMS"
-    DIST='fedora'
-    RELEASE='41'
-    ;;
-fc42)
-    RPMDIR="${WEBROOT}/fedora/42/${ARCH}"
-    SRPMDIR="${WEBROOT}/fedora/42/SRPMS"
-    DIST='fedora'
-    RELEASE='42'
-    ;;
-el7)
-    RPMDIR="${WEBROOT}/epel/7/${ARCH}"
-    SRPMDIR="${WEBROOT}/epel/7/SRPMS"
-    DIST='epel'
-    RELEASE='7'
-    ;;
-el8)
-    RPMDIR="${WEBROOT}/epel/8/${ARCH}"
-    SRPMDIR="${WEBROOT}/epel/8/SRPMS"
-    DIST='epel'
-    RELEASE='8'
-    ;;
-*)
-    echo "Unknown distribution ${DIST}" 1>&2
-    exit 1
-    ;;
+    fc[0-9]*)
+        # strip the 'fc' prefix
+        RELEASE=$( echo "${DIST}" | sed 's/^fc//' )
+        DIST=fedora
+        RPMDIR="${WEBROOT}/${DIST}/${RELEASE}/${ARCH}"
+        SRPMDIR="${WEBROOT}/${DIST}/${RELEASE}/SRPMS"
+        ;;
+    el7)
+        RPMDIR="${WEBROOT}/epel/7/${ARCH}"
+        SRPMDIR="${WEBROOT}/epel/7/SRPMS"
+        DIST='epel'
+        RELEASE='7'
+        ;;
+    el8)
+        RPMDIR="${WEBROOT}/epel/8/${ARCH}"
+        SRPMDIR="${WEBROOT}/epel/8/SRPMS"
+        DIST='epel'
+        RELEASE='8'
+        ;;
+    *)
+        echo "Unknown distribution ${DIST}" 1>&2
+        exit 1
+        ;;
 esac
 
 echo "RPMDIR:  ${RPMDIR}"